diff options
| author | Kenneth Russel <[email protected]> | 2007-10-12 06:56:02 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2007-10-12 06:56:02 +0000 |
| commit | 16d8f63f7363218dbf8ca3265297567857ccebb1 (patch) | |
| tree | e91449723eeec1ba592512182d8b693f5f92ea9e | |
| parent | 06b62d99bd880da02be0f4317ac1567fb045428c (diff) | |
Pre-emptively added clearing out of the GL_ARRAY_BUFFER binding after
doing glPopClientAttrib since it isn't clear according to the OpenGL
specification whether this binding is part of the client-side state.
Bumped build number to 1.1.1-rc6.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@1396 232f8b59-042b-4e1e-8c03-345bb8c30851
| -rw-r--r-- | make/build.xml | 2 | ||||
| -rwxr-xr-x | src/classes/com/sun/opengl/util/j2d/TextRenderer.java | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/make/build.xml b/make/build.xml index 81f6b74f3..1aa7ff656 100644 --- a/make/build.xml +++ b/make/build.xml @@ -51,7 +51,7 @@ <project name="JOGL" basedir="." default="all"> <!-- This is the version of JOGL you are building --> - <property name="base_version" value="1.1.1-rc5"/> + <property name="base_version" value="1.1.1-rc6"/> <!-- Uncomment this property definition to cause a full release build to be done --> <!-- without needing to specify the RI target on the command line --> diff --git a/src/classes/com/sun/opengl/util/j2d/TextRenderer.java b/src/classes/com/sun/opengl/util/j2d/TextRenderer.java index b20a6c2b1..bb497a4dd 100755 --- a/src/classes/com/sun/opengl/util/j2d/TextRenderer.java +++ b/src/classes/com/sun/opengl/util/j2d/TextRenderer.java @@ -854,6 +854,9 @@ public class TextRenderer GL gl = GLU.getCurrentGL(); // Pop client attrib bits used by the pipelined quad renderer gl.glPopClientAttrib(); + // It's unclear whether this changes the buffer bindings, so + // preemptively zero out the GL_ARRAY_BUFFER binding + gl.glBindBuffer(GL.GL_ARRAY_BUFFER, 0); if (ortho) { getBackingStore().endOrthoRendering(); } else { @@ -1014,6 +1017,9 @@ public class TextRenderer GL gl = GLU.getCurrentGL(); // Pop client attrib bits used by the pipelined quad renderer gl.glPopClientAttrib(); + // It's unclear whether this changes the buffer bindings, so + // preemptively zero out the GL_ARRAY_BUFFER binding + gl.glBindBuffer(GL.GL_ARRAY_BUFFER, 0); if (isOrthoMode) { ((TextureRenderer) oldBackingStore).endOrthoRendering(); } else { |