diff options
18 files changed, 47 insertions, 46 deletions
diff --git a/src/demos/com/jogamp/opengl/demos/graph/GPURegionGLListener00.java b/src/demos/com/jogamp/opengl/demos/graph/GPURegionGLListener00.java index b3d2c84d7..799406e10 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/GPURegionGLListener00.java +++ b/src/demos/com/jogamp/opengl/demos/graph/GPURegionGLListener00.java @@ -52,7 +52,7 @@ public class GPURegionGLListener00 extends GPURendererListenerBase01 { public GPURegionGLListener00 (final int renderModes, final int aaQuality, final int sampleCount, final boolean debug, final boolean trace) { super(RegionRenderer.create(RegionRenderer.defaultBlendEnable, RegionRenderer.defaultBlendDisable), renderModes, debug, trace); - this.getRenderer().setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); + this.getRenderer().setHintBits(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); setMatrix(-20, 00, -50, 0f); getRenderer().setAAQuality(aaQuality); getRenderer().setSampleCount(sampleCount); diff --git a/src/demos/com/jogamp/opengl/demos/graph/GPURegionGLListener01.java b/src/demos/com/jogamp/opengl/demos/graph/GPURegionGLListener01.java index 989b0050e..dc3e1edcd 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/GPURegionGLListener01.java +++ b/src/demos/com/jogamp/opengl/demos/graph/GPURegionGLListener01.java @@ -61,7 +61,7 @@ public class GPURegionGLListener01 extends GPURendererListenerBase01 { public GPURegionGLListener01 (final int shape_ctor_mode, final int renderModes, final int aaQuality, final int sampleCount, final boolean debug, final boolean trace) { super(RegionRenderer.create(RegionRenderer.defaultBlendEnable, RegionRenderer.defaultBlendDisable), renderModes, debug, trace); this.shape_ctor_mode = shape_ctor_mode; - this.getRenderer().setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); + this.getRenderer().setHintBits(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); setMatrix(-20, 00, -50, 0f); getRenderer().setAAQuality(aaQuality); getRenderer().setSampleCount(sampleCount); diff --git a/src/demos/com/jogamp/opengl/demos/graph/GPURegionGLListener10.java b/src/demos/com/jogamp/opengl/demos/graph/GPURegionGLListener10.java index 99a81cb31..5109e231b 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/GPURegionGLListener10.java +++ b/src/demos/com/jogamp/opengl/demos/graph/GPURegionGLListener10.java @@ -54,7 +54,7 @@ public class GPURegionGLListener10 extends GPURendererListenerBase01 { public GPURegionGLListener10 (final int renderModes, final int aaQuality, final int sampleCount, final boolean debug, final boolean trace) { super(RegionRenderer.create(RegionRenderer.defaultBlendEnable, RegionRenderer.defaultBlendDisable), renderModes, debug, trace); - this.getRenderer().setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); + this.getRenderer().setHintBits(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); setMatrix(-20, 00, -50, 0f); getRenderer().setAAQuality(aaQuality); getRenderer().setSampleCount(sampleCount); diff --git a/src/demos/com/jogamp/opengl/demos/graph/GPUTextRendererListenerBase01.java b/src/demos/com/jogamp/opengl/demos/graph/GPUTextRendererListenerBase01.java index 133c66817..21e96b4b6 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/GPUTextRendererListenerBase01.java +++ b/src/demos/com/jogamp/opengl/demos/graph/GPUTextRendererListenerBase01.java @@ -151,7 +151,7 @@ public abstract class GPUTextRendererListenerBase01 extends GPURendererListenerB // NOTE_ALPHA_BLENDING: We use alpha-blending super(RegionRenderer.create(blending ? RegionRenderer.defaultBlendEnable : null, blending ? RegionRenderer.defaultBlendDisable : null), renderModes, debug, trace); - this.getRenderer().setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); + this.getRenderer().setHintBits(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); this.textRegionUtil = new TextRegionUtil(renderModes); this.regionFPS = GLRegion.create(glp, renderModes, null, 0, 0); this.regionHead = GLRegion.create(glp, renderModes, null, 0, 0); @@ -332,7 +332,7 @@ public abstract class GPUTextRendererListenerBase01 extends GPURendererListenerB fontSizeHead, pixelSizeHead, mmSizeHead, fontSizeCenter, pixelSizeCenter, mmSizeCenter, modeS, pass2Samples, - renderer.isHintMaskSet(RenderState.BITHINT_BLENDING_ENABLED), + renderer.hintBitsSet(RenderState.BITHINT_BLENDING_ENABLED), drawable.getChosenGLCapabilities().getAlphaBits()); // bottom, half line up diff --git a/src/demos/com/jogamp/opengl/demos/graph/TextRendererGLELBase.java b/src/demos/com/jogamp/opengl/demos/graph/TextRendererGLELBase.java index d220114ab..b66bdf069 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/TextRendererGLELBase.java +++ b/src/demos/com/jogamp/opengl/demos/graph/TextRendererGLELBase.java @@ -133,7 +133,7 @@ public abstract class TextRendererGLELBase implements GLEventListener { renderer = RegionRenderer.create(sharedPMVMatrix, enableCallback, disableCallback); renderer.setAAQuality(Region.DEFAULT_AA_QUALITY); renderer.setSampleCount(pass2SampleCount); - renderer.setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); + renderer.setHintBits(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); this.textRenderUtil = new TextRegionUtil(renderModes); final GL2ES2 gl = drawable.getGL().getGL2ES2(); renderer.init(gl); diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo20.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo20.java index 27dca8358..fe47db823 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo20.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo20.java @@ -305,7 +305,7 @@ public class UISceneDemo20 implements GLEventListener { } scene = new Scene(options.graphAASamples); scene.setPMVMatrixSetup(new Scene.DefaultPMVMatrixSetup(-1f)); - scene.getRenderer().setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); + scene.getRenderer().setHintBits(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); // scene.setSampleCount(3); // easy on embedded devices w/ just 3 samples (default is 4)? scene.addShape(buttonsLeft); scene.addShape(buttonsRight); diff --git a/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java b/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java index 87e1c4385..38f4d0dbf 100644 --- a/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java +++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java @@ -104,14 +104,14 @@ public final class RegionRenderer { public static final GLCallback defaultBlendEnable = new GLCallback() { @Override public void run(final GL gl, final RegionRenderer renderer) { - if( renderer.isHintMaskSet(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED) ) { + if( renderer.hintBitsSet(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED) ) { gl.glDepthMask(false); // gl.glDisable(GL.GL_DEPTH_TEST); // gl.glDepthFunc(GL.GL_ALWAYS); } gl.glEnable(GL.GL_BLEND); gl.glBlendEquation(GL.GL_FUNC_ADD); // default - renderer.setHintMask(RenderState.BITHINT_BLENDING_ENABLED); + renderer.setHintBits(RenderState.BITHINT_BLENDING_ENABLED); } }; @@ -128,9 +128,9 @@ public final class RegionRenderer { public static final GLCallback defaultBlendDisable = new GLCallback() { @Override public void run(final GL gl, final RegionRenderer renderer) { - renderer.clearHintMask(RenderState.BITHINT_BLENDING_ENABLED); + renderer.clearHintBits(RenderState.BITHINT_BLENDING_ENABLED); gl.glDisable(GL.GL_BLEND); - if( renderer.isHintMaskSet(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED) ) { + if( renderer.hintBitsSet(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED) ) { // gl.glEnable(GL.GL_DEPTH_TEST); // gl.glDepthFunc(GL.GL_LESS); gl.glDepthMask(true); @@ -336,11 +336,11 @@ public final class RegionRenderer { /** Returns the optional Mv-premultiplied clipping {@link Frustum} or null if unused. */ public final Frustum getClipFrustum() { return rs.getClipFrustum(); } - public final boolean isHintMaskSet(final int mask) { return rs.isHintMaskSet(mask); } + public final boolean hintBitsSet(final int mask) { return rs.hintBitsSet(mask); } - public final void setHintMask(final int mask) { rs.setHintMask(mask); } + public final void setHintBits(final int mask) { rs.setHintBits(mask); } - public final void clearHintMask(final int mask) { rs.clearHintMask(mask); } + public final void clearHintBits(final int mask) { rs.clearHintBits(mask); } /** * Enabling or disabling the {@link #getRenderState() RenderState}'s diff --git a/src/jogl/classes/com/jogamp/graph/curve/opengl/RenderState.java b/src/jogl/classes/com/jogamp/graph/curve/opengl/RenderState.java index d6be9e07b..4913d8174 100644 --- a/src/jogl/classes/com/jogamp/graph/curve/opengl/RenderState.java +++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/RenderState.java @@ -54,10 +54,10 @@ public class RenderState { private static final String thisKey = "jogamp.graph.curve.RenderState" ; /** - * Bitfield hint, {@link #isHintMaskSet(int) if set} + * Bitfield hint, {@link #hintBitsSet(int) if set} * stating <i>enabled</i> {@link GL#GL_BLEND}, otherwise <i>disabled</i>. * <p> - * Shall be set via {@link #setHintMask(int)} and cleared via {@link #clearHintMask(int)}. + * Shall be set via {@link #setHintBits(int)} and cleared via {@link #clearHintBits(int)}. * </p> * <p> * If set, {@link GLRegion#draw(GL2ES2, RegionRenderer) GLRegion's draw-method} @@ -73,10 +73,10 @@ public class RenderState { public static final int BITHINT_BLENDING_ENABLED = 1 << 0 ; /** - * Bitfield hint, {@link #isHintMaskSet(int) if set} + * Bitfield hint, {@link #hintBitsSet(int) if set} * stating globally <i>enabled</i> {@link GL#GL_DEPTH_TEST}, otherwise <i>disabled</i>. * <p> - * Shall be set via {@link #setHintMask(int)} and cleared via {@link #clearHintMask(int)}. + * Shall be set via {@link #setHintBits(int)} and cleared via {@link #clearHintBits(int)}. * </p> * <p> * {@link GLRegion#draw(GL2ES2, RegionRenderer) GLRegion's draw-method} @@ -105,7 +105,7 @@ public class RenderState { /** Optional clipping {@link Frustum}, which shall be pre-multiplied with the Mv-matrix. Null if unused. */ private final Frustum clipFrustum; private boolean useClipFrustum; - private int hintBitfield; + private int hintBits; private ShaderProgram sp; private static synchronized int getNextID() { @@ -209,7 +209,7 @@ public class RenderState { this.clipFrustum = new Frustum(); this.useClipFrustum = false; - this.hintBitfield = 0; + this.hintBits = 0; this.sp = null; } @@ -296,6 +296,17 @@ public class RenderState { /** Returns the optional Mv-premultiplied clipping {@link Frustum} or null if unused. */ public final Frustum getClipFrustum() { return useClipFrustum ? this.clipFrustum : null; } + public final int getHintBits() { return this.hintBits; } + public final boolean hintBitsSet(final int mask) { + return mask == ( hintBits & mask ); + } + public final void setHintBits(final int mask) { + hintBits |= mask; + } + public final void clearHintBits(final int mask) { + hintBits &= ~mask; + } + /** * * @param gl @@ -362,17 +373,6 @@ public class RenderState { } } - - public final boolean isHintMaskSet(final int mask) { - return mask == ( hintBitfield & mask ); - } - public final void setHintMask(final int mask) { - hintBitfield |= mask; - } - public final void clearHintMask(final int mask) { - hintBitfield &= ~mask; - } - /** * Only nullifies {@link ShaderProgram} reference owned by {@link RegionRenderer}. */ diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PMSAAES2.java b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PMSAAES2.java index 4644ff883..8f0d0de73 100644 --- a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PMSAAES2.java +++ b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PMSAAES2.java @@ -379,7 +379,7 @@ public final class VBORegion2PMSAAES2 extends GLRegion { private void renderFBO(final GL2ES2 gl, final RenderState rs, final int width, final int height) { gl.glViewport(0, 0, width, height); - if( rs.isHintMaskSet(RenderState.BITHINT_BLENDING_ENABLED | RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED) ) { + if( rs.hintBitsSet(RenderState.BITHINT_BLENDING_ENABLED | RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED) ) { // BITHINT_GLOBAL_DEPTH_TEST_ENABLED path added by commit 45395696c252c215a8a22d05e5da7e98c662d07e (2014-04-10), // but not in VBORegion2PVBAA.renderVBO(..) -> investigate if required for working MSAA: // - "VBORegion2PMSAAES2 enables/disables GL_DEPTH_TEST, otherwise MSAA is corrupt" @@ -388,7 +388,7 @@ public final class VBORegion2PMSAAES2 extends GLRegion { gl.glBlendFunc(GL.GL_ONE, GL.GL_ONE_MINUS_SRC_ALPHA); gl.glEnable(GL.GL_DEPTH_TEST); - } else if( rs.isHintMaskSet(RenderState.BITHINT_BLENDING_ENABLED) ) { + } else if( rs.hintBitsSet(RenderState.BITHINT_BLENDING_ENABLED) ) { // RGB is already multiplied w/ alpha via renderRegion2FBO(..) gl.glBlendFunc(GL.GL_ONE, GL.GL_ONE_MINUS_SRC_ALPHA); } @@ -424,7 +424,7 @@ public final class VBORegion2PMSAAES2 extends GLRegion { if( 0 >= targetFboWidth || 0 >= targetFboHeight ) { throw new IllegalArgumentException("targetFBOSize "+targetFboWidth+"x"+targetFboHeight+" must be greater than 0"); } - final boolean blendingEnabled = rs.isHintMaskSet(RenderState.BITHINT_BLENDING_ENABLED); + final boolean blendingEnabled = rs.hintBitsSet(RenderState.BITHINT_BLENDING_ENABLED); final int targetFboSamples = rs.getSampleCount() > 1 ? rs.getSampleCount() : 0; final boolean fboSampleTypeMatch; { @@ -490,7 +490,7 @@ public final class VBORegion2PMSAAES2 extends GLRegion { // Multiply RGB w/ Alpha, preserve alpha for renderFBO(..) gl.glBlendFuncSeparate(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA, GL.GL_ONE, GL.GL_ONE_MINUS_SRC_ALPHA); - if( rs.isHintMaskSet(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED) ) { + if( rs.hintBitsSet(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED) ) { gl.glDisable(GL.GL_DEPTH_TEST); } } else { diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PVBAAES2.java b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PVBAAES2.java index 333150899..c03e4d50d 100644 --- a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PVBAAES2.java +++ b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PVBAAES2.java @@ -426,7 +426,7 @@ public final class VBORegion2PVBAAES2 extends GLRegion { // but not here -> investigate if required for working MSAA: // - "VBORegion2PMSAAES2 enables/disables GL_DEPTH_TEST, otherwise MSAA is corrupt" // - if( rs.isHintMaskSet(RenderState.BITHINT_BLENDING_ENABLED) ) { + if( rs.hintBitsSet(RenderState.BITHINT_BLENDING_ENABLED) ) { // RGB is already multiplied w/ alpha via renderRegion2FBO(..) gl.glBlendFunc(GL.GL_ONE, GL.GL_ONE_MINUS_SRC_ALPHA); } @@ -463,7 +463,7 @@ public final class VBORegion2PVBAAES2 extends GLRegion { if( 0 >= targetFboWidth || 0 >= targetFboHeight ) { throw new IllegalArgumentException("targetFBOSize "+targetFboWidth+"x"+targetFboHeight+" must be greater than 0"); } - final boolean blendingEnabled = rs.isHintMaskSet(RenderState.BITHINT_BLENDING_ENABLED); + final boolean blendingEnabled = rs.hintBitsSet(RenderState.BITHINT_BLENDING_ENABLED); if(null == fbo) { fboWidth = targetFboWidth; diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java index 478931531..7fcd61292 100644 --- a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java +++ b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java @@ -187,7 +187,8 @@ public final class VBORegionSPES2 extends GLRegion { vpc_ileave.enableBuffer(gl, true); indicesBuffer.bindBuffer(gl, true); // keeps VBO binding - if( renderer.getRenderState().isHintMaskSet(RenderState.BITHINT_BLENDING_ENABLED) ) { + final RenderState rs = renderer.getRenderState(); + if( rs.hintBitsSet(RenderState.BITHINT_BLENDING_ENABLED) ) { gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA); } diff --git a/src/test/com/jogamp/opengl/test/junit/graph/GPURegionGLListener01.java b/src/test/com/jogamp/opengl/test/junit/graph/GPURegionGLListener01.java index 40ae9244e..9a7b25814 100644 --- a/src/test/com/jogamp/opengl/test/junit/graph/GPURegionGLListener01.java +++ b/src/test/com/jogamp/opengl/test/junit/graph/GPURegionGLListener01.java @@ -59,7 +59,7 @@ public class GPURegionGLListener01 extends GPURendererListenerBase01 { public GPURegionGLListener01 (final int shape_ctor_mode, final int renderModes, final int aaQuality, final int sampleCount, final boolean debug, final boolean trace) { super(RegionRenderer.create(RegionRenderer.defaultBlendEnable, RegionRenderer.defaultBlendDisable), renderModes, debug, trace); this.shape_ctor_mode = shape_ctor_mode; - this.getRenderer().setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); + this.getRenderer().setHintBits(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); setMatrix(-20, 00, -50, 0f); getRenderer().setAAQuality(aaQuality); getRenderer().setSampleCount(sampleCount); diff --git a/src/test/com/jogamp/opengl/test/junit/graph/GPURegionGLListener10.java b/src/test/com/jogamp/opengl/test/junit/graph/GPURegionGLListener10.java index de2d59c1e..0a147d577 100644 --- a/src/test/com/jogamp/opengl/test/junit/graph/GPURegionGLListener10.java +++ b/src/test/com/jogamp/opengl/test/junit/graph/GPURegionGLListener10.java @@ -52,7 +52,7 @@ public class GPURegionGLListener10 extends GPURendererListenerBase01 { public GPURegionGLListener10 (final int renderModes, final int aaQuality, final int sampleCount, final boolean debug, final boolean trace) { super(RegionRenderer.create(RegionRenderer.defaultBlendEnable, RegionRenderer.defaultBlendDisable), renderModes, debug, trace); - this.getRenderer().setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); + this.getRenderer().setHintBits(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); setMatrix(-20, 00, -50, 0f); getRenderer().setAAQuality(aaQuality); getRenderer().setSampleCount(sampleCount); diff --git a/src/test/com/jogamp/opengl/test/junit/graph/GPUTextRendererListenerBase01.java b/src/test/com/jogamp/opengl/test/junit/graph/GPUTextRendererListenerBase01.java index b7740d628..8c5abbc2f 100644 --- a/src/test/com/jogamp/opengl/test/junit/graph/GPUTextRendererListenerBase01.java +++ b/src/test/com/jogamp/opengl/test/junit/graph/GPUTextRendererListenerBase01.java @@ -152,7 +152,7 @@ public abstract class GPUTextRendererListenerBase01 extends GPURendererListenerB // NOTE_ALPHA_BLENDING: We use alpha-blending super(RegionRenderer.create(blending ? RegionRenderer.defaultBlendEnable : null, blending ? RegionRenderer.defaultBlendDisable : null), renderModes, debug, trace); - this.getRenderer().setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); + this.getRenderer().setHintBits(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); this.textRegionUtil = new TextRegionUtil(renderModes); this.regionFPS = GLRegion.create(glp, renderModes, null, 0, 0); this.regionHead = GLRegion.create(glp, renderModes, null, 0, 0); @@ -333,7 +333,7 @@ public abstract class GPUTextRendererListenerBase01 extends GPURendererListenerB fontSizeHead, pixelSizeHead, mmSizeHead, fontSizeCenter, pixelSizeCenter, mmSizeCenter, modeS, pass2Samples, - renderer.isHintMaskSet(RenderState.BITHINT_BLENDING_ENABLED), + renderer.hintBitsSet(RenderState.BITHINT_BLENDING_ENABLED), drawable.getChosenGLCapabilities().getAlphaBits()); // bottom, half line up diff --git a/src/test/com/jogamp/opengl/test/junit/graph/PerfTextRendererNEWT00.java b/src/test/com/jogamp/opengl/test/junit/graph/PerfTextRendererNEWT00.java index 4ab99fbda..cb2be8118 100644 --- a/src/test/com/jogamp/opengl/test/junit/graph/PerfTextRendererNEWT00.java +++ b/src/test/com/jogamp/opengl/test/junit/graph/PerfTextRendererNEWT00.java @@ -241,7 +241,7 @@ public class PerfTextRendererNEWT00 { final GLReadBufferUtil screenshot = new GLReadBufferUtil(false, false); final RegionRenderer renderer = RegionRenderer.create(RegionRenderer.defaultBlendEnable, RegionRenderer.defaultBlendDisable); - renderer.setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); + renderer.setHintBits(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); renderer.setAAQuality(Region.DEFAULT_AA_QUALITY); renderer.setSampleCount(sampleCount); diff --git a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT01.java b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT01.java index d7afc3f2a..701c17c5f 100644 --- a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT01.java +++ b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT01.java @@ -178,7 +178,7 @@ public class TestTextRendererNEWT01 extends UITestCase { System.err.println("Chosen: "+winctx.window.getChosenCapabilities()); final RegionRenderer renderer = RegionRenderer.create(RegionRenderer.defaultBlendEnable, RegionRenderer.defaultBlendDisable); - renderer.setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); + renderer.setHintBits(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); final TextRegionUtil textRenderUtil = new TextRegionUtil(renderModes); // init diff --git a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWTBugXXXX.java b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWTBugXXXX.java index a024a33eb..3f821369a 100644 --- a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWTBugXXXX.java +++ b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWTBugXXXX.java @@ -136,7 +136,7 @@ public class TestTextRendererNEWTBugXXXX extends UITestCase { System.err.println("Chosen: "+winctx.window.getChosenCapabilities()); final RegionRenderer renderer = RegionRenderer.create(RegionRenderer.defaultBlendEnable, RegionRenderer.defaultBlendDisable); - renderer.setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); + renderer.setHintBits(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); final TextRegionUtil textRenderUtil = new TextRegionUtil(renderModes); // init diff --git a/src/test/com/jogamp/opengl/test/junit/graph/TextRendererGLELBase.java b/src/test/com/jogamp/opengl/test/junit/graph/TextRendererGLELBase.java index 6b5e09877..d6546249b 100644 --- a/src/test/com/jogamp/opengl/test/junit/graph/TextRendererGLELBase.java +++ b/src/test/com/jogamp/opengl/test/junit/graph/TextRendererGLELBase.java @@ -127,7 +127,7 @@ public abstract class TextRendererGLELBase implements GLEventListener { public void init(final GLAutoDrawable drawable) { exclusivePMVMatrix = null == sharedPMVMatrix; this.renderer = RegionRenderer.create(sharedPMVMatrix, enableCallback, disableCallback); - this.getRenderer().setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); + this.getRenderer().setHintBits(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED); this.textRenderUtil = new TextRegionUtil(renderModes); final GL2ES2 gl = drawable.getGL().getGL2ES2(); renderer.init(gl); |