summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Russel <[email protected]>2006-06-19 21:32:43 +0000
committerKenneth Russel <[email protected]>2006-06-19 21:32:43 +0000
commite9d953d7d1ac59e35e75237132cd5649b4bde072 (patch)
tree8577fe8f8debc0e3e1d313d83564f30af76c96a1
parenta0be832ec24145cb724a3a7a6cec72edcb4e95f9 (diff)
Cleanup of fboTextureTarget variable based on Chris Campbell's feedback
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@817 232f8b59-042b-4e1e-8c03-345bb8c30851
-rw-r--r--src/classes/javax/media/opengl/GLJPanel.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/classes/javax/media/opengl/GLJPanel.java b/src/classes/javax/media/opengl/GLJPanel.java
index f98df3c5f..be0b86121 100644
--- a/src/classes/javax/media/opengl/GLJPanel.java
+++ b/src/classes/javax/media/opengl/GLJPanel.java
@@ -182,9 +182,6 @@ public class GLJPanel extends JPanel implements GLAutoDrawable {
// incomplete in our context.
private boolean checkedGLVendor;
private boolean vendorIsATI;
- // The texture target for Java2D's OpenGL pipeline when using FBOs
- // -- either GL_TEXTURE_2D or GL_TEXTURE_RECTANGLE_ARB
- private int fboTextureTarget;
// These are always set to (0, 0) except when the Java2D / OpenGL
// pipeline is active
@@ -311,6 +308,7 @@ public class GLJPanel extends JPanel implements GLAutoDrawable {
// Set up needed state in JOGL context from Java2D context
gl.glEnable(GL.GL_SCISSOR_TEST);
Rectangle r = Java2D.getOGLScissorBox(g);
+
if (r == null) {
if (DEBUG && VERBOSE) {
System.err.println("Java2D.getOGLScissorBox() returned null");
@@ -348,7 +346,9 @@ public class GLJPanel extends JPanel implements GLAutoDrawable {
System.err.println("GLJPanel: Binding to framebuffer object " + frameBuffer[0]);
}
- fboTextureTarget = Java2D.getOGLTextureType(g);
+ // The texture target for Java2D's OpenGL pipeline when using FBOs
+ // -- either GL_TEXTURE_2D or GL_TEXTURE_RECTANGLE_ARB
+ int fboTextureTarget = Java2D.getOGLTextureType(g);
if (!checkedForFBObjectWorkarounds) {
checkedForFBObjectWorkarounds = true;