From 1e34dc6467d6309ae06dfe5ec317723a5b728789 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 12 Oct 2012 14:57:13 +0200 Subject: ES2Impl fix: Remove code which could imply recursion if !ES2Compatible (although impossible, but looks bad) --- make/config/jogl/gl-gl4bc.cfg | 10 ++++++++++ make/config/jogl/gl2_es2-common.cfg | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/make/config/jogl/gl-gl4bc.cfg b/make/config/jogl/gl-gl4bc.cfg index ae77b2eb8..ce6883106 100644 --- a/make/config/jogl/gl-gl4bc.cfg +++ b/make/config/jogl/gl-gl4bc.cfg @@ -87,6 +87,16 @@ CustomJavaCode GL4bcImpl glFrustum((double)left, (double)right, (double)bottom CustomJavaCode GL4bcImpl public void glOrthof(float left, float right, float bottom, float top, float zNear, float zFar) { CustomJavaCode GL4bcImpl glOrtho((double)left, (double)right, (double)bottom, (double)top, (double)zNear, (double)zFar); } +JavaPrologue glDepthRangef if ( !_context.isGLES2Compatible() ) { +JavaPrologue glDepthRangef glDepthRange( (double)zNear, (double)zFar ); +JavaPrologue glDepthRangef return; +JavaPrologue glDepthRangef } + +JavaPrologue glClearDepthf if ( !_context.isGLES2Compatible() ) { +JavaPrologue glClearDepthf glClearDepth( (double)depth ); +JavaPrologue glClearDepthf return; +JavaPrologue glClearDepthf } + Include gl-headers.cfg Include gl3ext-headers.cfg diff --git a/make/config/jogl/gl2_es2-common.cfg b/make/config/jogl/gl2_es2-common.cfg index d26c76ead..b769f3b29 100644 --- a/make/config/jogl/gl2_es2-common.cfg +++ b/make/config/jogl/gl2_es2-common.cfg @@ -11,13 +11,3 @@ JavaPrologue glGetShaderPrecisionFormat if ( !_context.isGLES2Compatible() ) { JavaPrologue glGetShaderPrecisionFormat throw new GLException("Method \"glGetShaderPrecisionFormat\" not available"); JavaPrologue glGetShaderPrecisionFormat } -JavaPrologue glDepthRangef if ( !_context.isGLES2Compatible() ) { -JavaPrologue glDepthRangef glDepthRange( (double)zNear, (double)zFar ); -JavaPrologue glDepthRangef return; -JavaPrologue glDepthRangef } - -JavaPrologue glClearDepthf if ( !_context.isGLES2Compatible() ) { -JavaPrologue glClearDepthf glClearDepth( (double)depth ); -JavaPrologue glClearDepthf return; -JavaPrologue glClearDepthf } - -- cgit v1.2.3