From fea2af3c32e6bf2d6bd8b55b35bf87c6a6b2ce22 Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Thu, 16 Feb 2012 14:21:11 -0800 Subject: j3dcore: disable support for GL_SGIX_texture_lod_bias - ensure the Canvas3D feature flag TEXTURE_LOD_OFFSET never gets set which will avoid this path entirely. Signed-off-by: Harvey Harrison --- src/classes/jogl/javax/media/j3d/JoglPipeline.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/classes/jogl') diff --git a/src/classes/jogl/javax/media/j3d/JoglPipeline.java b/src/classes/jogl/javax/media/j3d/JoglPipeline.java index 5bcb335..86a37a7 100644 --- a/src/classes/jogl/javax/media/j3d/JoglPipeline.java +++ b/src/classes/jogl/javax/media/j3d/JoglPipeline.java @@ -5008,12 +5008,13 @@ class JoglPipeline extends Pipeline { int target, float lodOffsetS, float lodOffsetT, float lodOffsetR) { - GL gl = context(ctx).getGL(); +// FIXME: GL_SGIX_texture_lod_bias +// GL gl = context(ctx).getGL(); // checking of the availability of the extension is already done // in the shared code - gl.glTexParameterf(target, GL.GL_TEXTURE_LOD_BIAS_S_SGIX, lodOffsetS); - gl.glTexParameterf(target, GL.GL_TEXTURE_LOD_BIAS_T_SGIX, lodOffsetT); - gl.glTexParameterf(target, GL.GL_TEXTURE_LOD_BIAS_R_SGIX, lodOffsetR); +// gl.glTexParameterf(target, GL.GL_TEXTURE_LOD_BIAS_S_SGIX, lodOffsetS); +// gl.glTexParameterf(target, GL.GL_TEXTURE_LOD_BIAS_T_SGIX, lodOffsetT); +// gl.glTexParameterf(target, GL.GL_TEXTURE_LOD_BIAS_R_SGIX, lodOffsetR); } private void updateTextureAnisotropicFilter(Context ctx, int target, float degree) { @@ -7566,9 +7567,10 @@ class JoglPipeline extends Pipeline { cv.anisotropicDegreeMax = tmp[0]; } - if (gl.isExtensionAvailable("GL_SGIX_texture_lod_bias")) { - cv.textureExtendedFeatures |= Canvas3D.TEXTURE_LOD_OFFSET; - } +// FIXME: GL_SGIX_texture_lod_bias +// if (gl.isExtensionAvailable("GL_SGIX_texture_lod_bias")) { +// cv.textureExtendedFeatures |= Canvas3D.TEXTURE_LOD_OFFSET; +// } if (!VirtualUniverse.mc.enforcePowerOfTwo && gl.isExtensionAvailable("GL_ARB_texture_non_power_of_two")) { -- cgit v1.2.3