From d15b941d707bc286d0c33a1ead9464028e9a6c37 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sun, 31 Jul 2011 20:37:39 +0200 Subject: GLProfile usage getMinDesktop() -> getMinimum(); WGL/X11 GLCaps: make attributes final --- src/jogl/classes/jogamp/opengl/windows/wgl/WGLGLCapabilities.java | 4 ++-- .../jogamp/opengl/windows/wgl/WindowsWGLDrawableFactory.java | 2 +- src/jogl/classes/jogamp/opengl/x11/glx/X11GLCapabilities.java | 6 +++--- src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/jogl/classes/jogamp/opengl') diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WGLGLCapabilities.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WGLGLCapabilities.java index 4b3cd0120..adfddddcd 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WGLGLCapabilities.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WGLGLCapabilities.java @@ -38,8 +38,8 @@ import javax.media.opengl.GLException; import javax.media.opengl.GLProfile; public class WGLGLCapabilities extends GLCapabilities { - PIXELFORMATDESCRIPTOR pfd; - int pfdID; + final PIXELFORMATDESCRIPTOR pfd; + final int pfdID; int arb_pixelformat; // -1 PFD, 0 NOP, 1 ARB /** Comparing pfd id only */ diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawableFactory.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawableFactory.java index 8b159ac8e..cef0f0122 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawableFactory.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawableFactory.java @@ -273,7 +273,7 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl { if (null == absScreen) { throw new GLException("Couldn't create shared screen for device: "+sharedDevice+", idx 0"); } - GLProfile glp = GLProfile.getMinDesktop(sharedDevice); + GLProfile glp = GLProfile.getMinimum(sharedDevice); if (null == glp) { throw new GLException("Couldn't get default GLProfile for device: "+sharedDevice); } diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLCapabilities.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLCapabilities.java index 5455976da..0f496b4a2 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLCapabilities.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLCapabilities.java @@ -35,9 +35,9 @@ import javax.media.opengl.GLProfile; import java.util.Comparator; public class X11GLCapabilities extends GLCapabilities { - XVisualInfo xVisualInfo; // maybe null if !onscreen - long fbcfg; - int fbcfgid; + final XVisualInfo xVisualInfo; // maybe null if !onscreen + final long fbcfg; + final int fbcfgid; /** Comparing xvisual id only */ public static class XVisualIDComparator implements Comparator { diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java index 48f9dd875..872503b36 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java @@ -181,7 +181,7 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl { if (null == sharedScreen) { throw new GLException("Couldn't create shared screen for device: "+sharedDevice+", idx 0"); } - GLProfile glp = GLProfile.getMinDesktop(sharedDevice); + GLProfile glp = GLProfile.getMinimum(sharedDevice); if (null == glp) { throw new GLException("Couldn't get default GLProfile for device: "+sharedDevice); } -- cgit v1.2.3