diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/gl-common.cfg | 1 | ||||
| -rw-r--r-- | make/gl-desktop-tracker.cfg | 13 | ||||
| -rw-r--r-- | make/gl-gl2.cfg | 7 | ||||
| -rwxr-xr-x | make/gl-if-gl.cfg | 1 | ||||
| -rw-r--r-- | make/gl-ignore-gl2_es-enums.cfg | 2 | ||||
| -rw-r--r-- | make/gl-ignore-gl2_es1-enums.cfg | 28 | ||||
| -rw-r--r-- | make/gl-ignore-gl2_es12-special.cfg | 4 | ||||
| -rw-r--r-- | make/gl-ignore-gl2_es2-enums.cfg | 2 |
8 files changed, 13 insertions, 45 deletions
diff --git a/make/gl-common.cfg b/make/gl-common.cfg index 2d30216f1..6b91c2404 100644 --- a/make/gl-common.cfg +++ b/make/gl-common.cfg @@ -18,7 +18,6 @@ Import com.sun.opengl.impl.* ##################################################################### # Mostly desktop OpenGL stuff below # -Ignore GL_INVALID_FRAMEBUFFER_OPERATION.* # Don't output #defines of GL version identifier strings as constants, # because we don't need them java-side. diff --git a/make/gl-desktop-tracker.cfg b/make/gl-desktop-tracker.cfg index e169cbaed..4b9a7edb7 100644 --- a/make/gl-desktop-tracker.cfg +++ b/make/gl-desktop-tracker.cfg @@ -3,7 +3,6 @@ # Note that this is only necessary when the Java 2D / JOGL bridge is active, # so will never be needed for the embedded OpenGL variants JavaEpilogue glGenBuffers if (tracker != null) tracker.addBuffers({0}, {1}); -JavaEpilogue glGenBuffersARB if (tracker != null) tracker.addBuffersARB({0}, {1}); JavaEpilogue glGenFencesAPPLE if (tracker != null) tracker.addFencesAPPLE({0}, {1}); JavaEpilogue glGenFencesNV if (tracker != null) tracker.addFencesNV({0}, {1}); JavaEpilogue glGenFragmentShadersATI if (tracker != null) tracker.addFragmentShadersATI(_res, {0}); @@ -11,20 +10,15 @@ JavaEpilogue glGenFramebuffersEXT if (tracker != null) tracker.addFramebuf JavaEpilogue glGenLists if (tracker != null) tracker.addLists(_res, {0}); JavaEpilogue glGenOcclusionQueriesNV if (tracker != null) tracker.addOcclusionQueriesNV({0}, {1}); JavaEpilogue glCreateProgram if (tracker != null) tracker.addProgramObject(_res); -JavaEpilogue glCreateProgramObjectARB if (tracker != null) tracker.addProgramObjectARB(_res); -JavaEpilogue glGenProgramsARB if (tracker != null) tracker.addProgramsARB({0}, {1}); -JavaEpilogue glGenProgramsNV if (tracker != null) tracker.addProgramsNV({0}, {1}); +JavaEpilogue glGenPrograms if (tracker != null) tracker.addPrograms({0}, {1}); JavaEpilogue glGenQueries if (tracker != null) tracker.addQueries({0}, {1}); -JavaEpilogue glGenQueriesARB if (tracker != null) tracker.addQueriesARB({0}, {1}); JavaEpilogue glGenRenderbuffersEXT if (tracker != null) tracker.addRenderbuffersEXT({0}, {1}); JavaEpilogue glCreateShader if (tracker != null) tracker.addShaderObject(_res); -JavaEpilogue glCreateShaderObjectARB if (tracker != null) tracker.addShaderObjectARB(_res); JavaEpilogue glGenTextures if (tracker != null) tracker.addTextures({0}, {1}); JavaEpilogue glGenVertexArraysAPPLE if (tracker != null) tracker.addVertexArraysAPPLE({0}, {1}); JavaEpilogue glGenVertexShadersEXT if (tracker != null) tracker.addVertexShadersEXT(_res, {0}); JavaEpilogue glDeleteBuffers if (tracker != null) tracker.removeBuffers({0}, {1}); -JavaEpilogue glDeleteBuffersARB if (tracker != null) tracker.removeBuffersARB({0}, {1}); JavaEpilogue glDeleteFencesAPPLE if (tracker != null) tracker.removeFencesAPPLE({0}, {1}); JavaEpilogue glDeleteFencesNV if (tracker != null) tracker.removeFencesNV({0}, {1}); JavaEpilogue glDeleteFragmentShaderATI if (tracker != null) tracker.removeFragmentShaderATI({0}); @@ -32,11 +26,10 @@ JavaEpilogue glDeleteFramebuffersEXT if (tracker != null) tracker.removeFrame JavaEpilogue glDeleteLists if (tracker != null) tracker.removeLists({0}, {1}); JavaEpilogue glDeleteOcclusionQueriesNV if (tracker != null) tracker.removeOcclusionQueriesNV({0}, {1}); JavaEpilogue glDeleteProgram if (tracker != null) tracker.removeProgramObject({0}); -JavaEpilogue glDeleteObjectARB if (tracker != null) tracker.removeProgramOrShaderObjectARB({0}); -JavaEpilogue glDeleteProgramsARB if (tracker != null) tracker.removeProgramsARB({0}, {1}); +JavaEpilogue glDeleteObject if (tracker != null) tracker.removeProgramOrShaderObject({0}); +JavaEpilogue glDeletePrograms if (tracker != null) tracker.removePrograms({0}, {1}); JavaEpilogue glDeleteProgramsNV if (tracker != null) tracker.removeProgramsNV({0}, {1}); JavaEpilogue glDeleteQueries if (tracker != null) tracker.removeQueries({0}, {1}); -JavaEpilogue glDeleteQueriesARB if (tracker != null) tracker.removeQueriesARB({0}, {1}); JavaEpilogue glDeleteRenderbuffersEXT if (tracker != null) tracker.removeRenderbuffersEXT({0}, {1}); JavaEpilogue glDeleteShader if (tracker != null) tracker.removeShaderObject({0}); JavaEpilogue glDeleteTextures if (tracker != null) tracker.removeTextures({0}, {1}); diff --git a/make/gl-gl2.cfg b/make/gl-gl2.cfg index 7e797abee..7df686dd5 100644 --- a/make/gl-gl2.cfg +++ b/make/gl-gl2.cfg @@ -37,9 +37,16 @@ DropUniqVendorExtensions SGIX DropUniqVendorExtensions SUN DropUniqVendorExtensions WIN +Ignore GL_STENCIL_INDEX1_EXT +Ignore GL_STENCIL_INDEX4_EXT +Ignore GL_STENCIL_INDEX8_EXT +Ignore GL_STENCIL_INDEX16_EXT + # Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums TagNativeBinding true +CustomJavaCode GL2 public static final int GL_STENCIL_INDEX16 = 0x8D49; + CustomJavaCode GL2 public void glFrustumf(float left, float right, float bottom, float top, float zNear, float zFar); CustomJavaCode GL2Impl public void glFrustumf(float left, float right, float bottom, float top, float zNear, float zFar) { CustomJavaCode GL2Impl glFrustum((double)left, (double)right, (double)bottom, (double)top, (double)zNear, (double)zFar); } diff --git a/make/gl-if-gl.cfg b/make/gl-if-gl.cfg index 8f04cf4a4..91231fde9 100755 --- a/make/gl-if-gl.cfg +++ b/make/gl-if-gl.cfg @@ -21,7 +21,6 @@ Ignore glEGL.* CustomJavaCode GL public String toString(); CustomJavaCode GL public GLContext getContext(); -CustomJavaCode GL public static final int GL_INVALID_FRAMEBUFFER_OPERATION = 0x0506; CustomJavaCode GL public void glClearDepth( double depth ); CustomJavaCode GL public void glDepthRange(double zNear, double zFar); diff --git a/make/gl-ignore-gl2_es-enums.cfg b/make/gl-ignore-gl2_es-enums.cfg index 35560aa18..5bb6b1920 100644 --- a/make/gl-ignore-gl2_es-enums.cfg +++ b/make/gl-ignore-gl2_es-enums.cfg @@ -198,6 +198,7 @@ Ignore GL_TEXTURE_CUBE_MAP_NEGATIVE_Y.* Ignore GL_TEXTURE_CUBE_MAP_POSITIVE_Z.* Ignore GL_TEXTURE_CUBE_MAP_NEGATIVE_Z.* Ignore GL_MAX_CUBE_MAP_TEXTURE_SIZE.* +Ignore GL_STENCIL_INDEX8.* Ignore GL_FRAMEBUFFER.* Ignore GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME.* Ignore GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE.* @@ -210,6 +211,7 @@ Ignore GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS.* Ignore GL_FRAMEBUFFER_INCOMPLETE_FORMATS.* Ignore GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT.* Ignore GL_FRAMEBUFFER_UNSUPPORTED.* +Ignore GL_INVALID_FRAMEBUFFER_OPERATION.* Ignore GL_COLOR_ATTACHMENT0.* Ignore GL_DEPTH_ATTACHMENT.* Ignore GL_STENCIL_ATTACHMENT.* diff --git a/make/gl-ignore-gl2_es1-enums.cfg b/make/gl-ignore-gl2_es1-enums.cfg index 26ab03282..a248ecb89 100644 --- a/make/gl-ignore-gl2_es1-enums.cfg +++ b/make/gl-ignore-gl2_es1-enums.cfg @@ -362,33 +362,6 @@ Ignore ^GL_FUNC_SUBTRACT_OES Ignore ^GL_FUNC_REVERSE_SUBTRACT_OES Ignore ^GL_ETC1_RGB8_OES Ignore ^GL_TEXTURE_CROP_RECT_OES -Ignore ^GL_FRAMEBUFFER_OES -Ignore ^GL_RENDERBUFFER_OES -Ignore ^GL_RENDERBUFFER_WIDTH_OES -Ignore ^GL_RENDERBUFFER_HEIGHT_OES -Ignore ^GL_RENDERBUFFER_INTERNAL_FORMAT_OES -Ignore ^GL_RENDERBUFFER_RED_SIZE_OES -Ignore ^GL_RENDERBUFFER_GREEN_SIZE_OES -Ignore ^GL_RENDERBUFFER_BLUE_SIZE_OES -Ignore ^GL_RENDERBUFFER_ALPHA_SIZE_OES -Ignore ^GL_RENDERBUFFER_DEPTH_SIZE_OES -Ignore ^GL_RENDERBUFFER_STENCIL_SIZE_OES -Ignore ^GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES -Ignore ^GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES -Ignore ^GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_OES -Ignore ^GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_OES -Ignore ^GL_COLOR_ATTACHMENT0_OES -Ignore ^GL_DEPTH_ATTACHMENT_OES -Ignore ^GL_STENCIL_ATTACHMENT_OES -Ignore ^GL_FRAMEBUFFER_COMPLETE_OES -Ignore ^GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES -Ignore ^GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES -Ignore ^GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES -Ignore ^GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES -Ignore ^GL_FRAMEBUFFER_UNSUPPORTED_OES -Ignore ^GL_FRAMEBUFFER_BINDING_OES -Ignore ^GL_RENDERBUFFER_BINDING_OES -Ignore ^GL_INVALID_FRAMEBUFFER_OPERATION_OES Ignore ^GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES Ignore ^GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES Ignore ^GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES @@ -434,7 +407,6 @@ Ignore ^GL_RGB8_OES Ignore ^GL_RGBA8_OES Ignore ^GL_STENCIL_INDEX1_OES Ignore ^GL_STENCIL_INDEX4_OES -Ignore ^GL_STENCIL_INDEX8_OES Ignore ^GL_HALF_FLOAT_OES Ignore ^GL_3DC_X_AMD Ignore ^GL_3DC_XY_AMD diff --git a/make/gl-ignore-gl2_es12-special.cfg b/make/gl-ignore-gl2_es12-special.cfg index 0b4311440..199b91756 100644 --- a/make/gl-ignore-gl2_es12-special.cfg +++ b/make/gl-ignore-gl2_es12-special.cfg @@ -125,8 +125,6 @@ Ignore GL_INTERPOLATE Ignore GL_INT_VEC2 Ignore GL_INT_VEC3 Ignore GL_INT_VEC4 -Ignore GL_INVALID_FRAMEBUFFER_OPERATION -Ignore GL_INVALID_FRAMEBUFFER_OPERATION_OES Ignore GL_LIGHT0 Ignore GL_LIGHT1 Ignore GL_LIGHT2 @@ -306,8 +304,6 @@ Ignore GL_STENCIL_BACK_WRITEMASK Ignore GL_STENCIL_INDEX Ignore GL_STENCIL_INDEX1_OES Ignore GL_STENCIL_INDEX4_OES -Ignore GL_STENCIL_INDEX8 -Ignore GL_STENCIL_INDEX8_OES Ignore GL_STREAM_DRAW Ignore GL_SUBTRACT Ignore GL_TEXTURE_2D_ARRAY_EXT diff --git a/make/gl-ignore-gl2_es2-enums.cfg b/make/gl-ignore-gl2_es2-enums.cfg index 8f85c5fd7..01ee6b62b 100644 --- a/make/gl-ignore-gl2_es2-enums.cfg +++ b/make/gl-ignore-gl2_es2-enums.cfg @@ -3,6 +3,7 @@ Ignore ^GL_DEPTH_BUFFER_BIT Ignore ^GL_STENCIL_BUFFER_BIT Ignore ^GL_COLOR_BUFFER_BIT Ignore ^GL_FALSE +Ignore ^GL_FIXED Ignore ^GL_TRUE Ignore ^GL_POINTS Ignore ^GL_LINES @@ -269,7 +270,6 @@ Ignore ^GL_LOW_INT Ignore ^GL_MEDIUM_INT Ignore ^GL_HIGH_INT Ignore ^GL_STENCIL_INDEX -Ignore ^GL_STENCIL_INDEX8 Ignore ^GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE Ignore ^GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME Ignore ^GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL |