From 8bf16f28be688a52f616aa830f95a94c53144cc3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jarkko=20P=C3=B6yry?= Date: Tue, 17 Mar 2015 13:48:45 -0700 Subject: [PATCH] Support GL_EXT_texture_sRGB_R(G)8 extension in glw. Change-Id: Ieaf5422beb8dafe277cca230744540200eff7846 --- framework/egl/egluStaticES20Library.inl | 2 +- framework/egl/egluStaticES30Library.inl | 2 +- framework/opengl/gluCallLogUtil.inl | 2 +- framework/opengl/gluCallLogWrapper.inl | 2 +- framework/opengl/gluCallLogWrapperApi.inl | 2 +- framework/opengl/gluES3PlusWrapperFuncs.inl | 2 +- framework/opengl/gluQueryUtil.inl | 2 +- framework/opengl/gluStrUtil.inl | 4 +++- framework/opengl/gluStrUtilPrototypes.inl | 2 +- framework/opengl/gluTextureUtil.cpp | 8 ++++++++ framework/opengl/wrapper/glwApi.inl | 2 +- framework/opengl/wrapper/glwEnums.inl | 6 ++++-- framework/opengl/wrapper/glwFunctionTypes.inl | 2 +- framework/opengl/wrapper/glwFunctions.inl | 2 +- framework/opengl/wrapper/glwImpl.inl | 2 +- framework/opengl/wrapper/glwInitES20.inl | 2 +- framework/opengl/wrapper/glwInitES20Direct.inl | 2 +- framework/opengl/wrapper/glwInitES30.inl | 2 +- framework/opengl/wrapper/glwInitES30Direct.inl | 2 +- framework/opengl/wrapper/glwInitES31.inl | 2 +- framework/opengl/wrapper/glwInitES31Direct.inl | 2 +- framework/opengl/wrapper/glwInitExtES.inl | 2 +- framework/opengl/wrapper/glwInitExtGL.inl | 2 +- framework/opengl/wrapper/glwInitGL30.inl | 2 +- framework/opengl/wrapper/glwInitGL31.inl | 2 +- framework/opengl/wrapper/glwInitGL32.inl | 2 +- framework/opengl/wrapper/glwInitGL33.inl | 2 +- framework/opengl/wrapper/glwInitGL40.inl | 2 +- framework/opengl/wrapper/glwInitGL41.inl | 2 +- framework/opengl/wrapper/glwInitGL42.inl | 2 +- framework/opengl/wrapper/glwInitGL43.inl | 2 +- framework/opengl/wrapper/glwInitGL44.inl | 2 +- framework/opengl/wrapper/glwInitGL45.inl | 2 +- framework/platform/null/tcuNullRenderContextFuncs.inl | 2 +- framework/platform/null/tcuNullRenderContextInitFuncs.inl | 2 +- scripts/opengl/gen_enums.py | 2 +- scripts/opengl/gen_str_util.py | 4 ++++ scripts/opengl/src_util.py | 6 ++++-- 38 files changed, 56 insertions(+), 38 deletions(-) diff --git a/framework/egl/egluStaticES20Library.inl b/framework/egl/egluStaticES20Library.inl index 1259dc6..ae96920 100644 --- a/framework/egl/egluStaticES20Library.inl +++ b/framework/egl/egluStaticES20Library.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ { "glActiveTexture", (deFunctionPtr)glActiveTexture }, { "glAttachShader", (deFunctionPtr)glAttachShader }, diff --git a/framework/egl/egluStaticES30Library.inl b/framework/egl/egluStaticES30Library.inl index 0c33ffd..cd625bb 100644 --- a/framework/egl/egluStaticES30Library.inl +++ b/framework/egl/egluStaticES30Library.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ { "glActiveTexture", (deFunctionPtr)glActiveTexture }, { "glAttachShader", (deFunctionPtr)glAttachShader }, diff --git a/framework/opengl/gluCallLogUtil.inl b/framework/opengl/gluCallLogUtil.inl index 40e2848..f5e75ca 100644 --- a/framework/opengl/gluCallLogUtil.inl +++ b/framework/opengl/gluCallLogUtil.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ int getTextureParamNumArgs (int pname) diff --git a/framework/opengl/gluCallLogWrapper.inl b/framework/opengl/gluCallLogWrapper.inl index 0367474..c056cab 100644 --- a/framework/opengl/gluCallLogWrapper.inl +++ b/framework/opengl/gluCallLogWrapper.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ void CallLogWrapper::glActiveShaderProgram (glw::GLuint pipeline, glw::GLuint program) diff --git a/framework/opengl/gluCallLogWrapperApi.inl b/framework/opengl/gluCallLogWrapperApi.inl index 3d13744..c18ffaa 100644 --- a/framework/opengl/gluCallLogWrapperApi.inl +++ b/framework/opengl/gluCallLogWrapperApi.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ void glActiveShaderProgram (glw::GLuint pipeline, glw::GLuint program); void glActiveTexture (glw::GLenum texture); diff --git a/framework/opengl/gluES3PlusWrapperFuncs.inl b/framework/opengl/gluES3PlusWrapperFuncs.inl index 853071a..7952be7 100644 --- a/framework/opengl/gluES3PlusWrapperFuncs.inl +++ b/framework/opengl/gluES3PlusWrapperFuncs.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ dst->activeShaderProgram = src.activeShaderProgram; dst->activeTexture = src.activeTexture; diff --git a/framework/opengl/gluQueryUtil.inl b/framework/opengl/gluQueryUtil.inl index 13eb620..fa16aa6 100644 --- a/framework/opengl/gluQueryUtil.inl +++ b/framework/opengl/gluQueryUtil.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ int getBasicQueryNumArgsOut (int pname) diff --git a/framework/opengl/gluStrUtil.inl b/framework/opengl/gluStrUtil.inl index 583b27a..45aa215 100644 --- a/framework/opengl/gluStrUtil.inl +++ b/framework/opengl/gluStrUtil.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ const char* getErrorName (int value) @@ -884,6 +884,8 @@ const char* getPixelFormatName (int value) case GL_DEPTH_COMPONENT32: return "GL_DEPTH_COMPONENT32"; case GL_SRGB: return "GL_SRGB"; case GL_SRGB_ALPHA: return "GL_SRGB_ALPHA"; + case GL_SR8_EXT: return "GL_SR8_EXT"; + case GL_SRG8_EXT: return "GL_SRG8_EXT"; default: return DE_NULL; } } diff --git a/framework/opengl/gluStrUtilPrototypes.inl b/framework/opengl/gluStrUtilPrototypes.inl index 4c888b8..8bab4ca 100644 --- a/framework/opengl/gluStrUtilPrototypes.inl +++ b/framework/opengl/gluStrUtilPrototypes.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ const char* getErrorName (int value); const char* getTypeName (int value); diff --git a/framework/opengl/gluTextureUtil.cpp b/framework/opengl/gluTextureUtil.cpp index 777f7b3..2333487 100644 --- a/framework/opengl/gluTextureUtil.cpp +++ b/framework/opengl/gluTextureUtil.cpp @@ -76,6 +76,8 @@ TransferFormat getTransferFormat (tcu::TextureFormat texFormat) case TextureFormat::RG: format = isInt ? GL_RG_INTEGER : GL_RG; break; case TextureFormat::RGB: format = isInt ? GL_RGB_INTEGER : GL_RGB; break; case TextureFormat::RGBA: format = isInt ? GL_RGBA_INTEGER : GL_RGBA; break; + case TextureFormat::sR: format = GL_RED; break; + case TextureFormat::sRG: format = GL_RG; break; case TextureFormat::sRGB: format = GL_RGB; break; case TextureFormat::sRGBA: format = GL_RGBA; break; case TextureFormat::D: format = GL_DEPTH_COMPONENT; break; @@ -190,6 +192,7 @@ deUint32 getInternalFormat (tcu::TextureFormat texFormat) case FMT_CASE(RG, SIGNED_INT8): return GL_RG8I; case FMT_CASE(RG, UNSIGNED_INT8): return GL_RG8UI; case FMT_CASE(RG, SNORM_INT8): return GL_RG8_SNORM; + case FMT_CASE(sRG, UNORM_INT8): return GL_SRG8_EXT; case FMT_CASE(R, FLOAT): return GL_R32F; case FMT_CASE(R, SIGNED_INT32): return GL_R32I; @@ -203,6 +206,7 @@ deUint32 getInternalFormat (tcu::TextureFormat texFormat) case FMT_CASE(R, SIGNED_INT8): return GL_R8I; case FMT_CASE(R, UNSIGNED_INT8): return GL_R8UI; case FMT_CASE(R, SNORM_INT8): return GL_R8_SNORM; + case FMT_CASE(sR, UNORM_INT8): return GL_SR8_EXT; case FMT_CASE(D, FLOAT): return GL_DEPTH_COMPONENT32F; case FMT_CASE(D, UNSIGNED_INT_24_8): return GL_DEPTH_COMPONENT24; @@ -512,6 +516,7 @@ tcu::TextureFormat mapGLInternalFormat (deUint32 internalFormat) case GL_RG8I: return TextureFormat(TextureFormat::RG, TextureFormat::SIGNED_INT8); case GL_RG8UI: return TextureFormat(TextureFormat::RG, TextureFormat::UNSIGNED_INT8); case GL_RG8_SNORM: return TextureFormat(TextureFormat::RG, TextureFormat::SNORM_INT8); + case GL_SRG8_EXT: return TextureFormat(TextureFormat::sRG, TextureFormat::UNORM_INT8); case GL_R32F: return TextureFormat(TextureFormat::R, TextureFormat::FLOAT); case GL_R32I: return TextureFormat(TextureFormat::R, TextureFormat::SIGNED_INT32); @@ -525,6 +530,7 @@ tcu::TextureFormat mapGLInternalFormat (deUint32 internalFormat) case GL_R8I: return TextureFormat(TextureFormat::R, TextureFormat::SIGNED_INT8); case GL_R8UI: return TextureFormat(TextureFormat::R, TextureFormat::UNSIGNED_INT8); case GL_R8_SNORM: return TextureFormat(TextureFormat::R, TextureFormat::SNORM_INT8); + case GL_SR8_EXT: return TextureFormat(TextureFormat::sR, TextureFormat::UNORM_INT8); case GL_DEPTH_COMPONENT32F: return TextureFormat(TextureFormat::D, TextureFormat::FLOAT); case GL_DEPTH_COMPONENT24: return TextureFormat(TextureFormat::D, TextureFormat::UNSIGNED_INT_24_8); @@ -553,6 +559,8 @@ bool isGLInternalColorFormatFilterable (deUint32 format) case GL_RGBA8: case GL_RGBA8_SNORM: case GL_RGB10_A2: + case GL_SR8_EXT: + case GL_SRG8_EXT: case GL_SRGB8: case GL_SRGB8_ALPHA8: case GL_R16F: diff --git a/framework/opengl/wrapper/glwApi.inl b/framework/opengl/wrapper/glwApi.inl index d10906d..ef33442 100644 --- a/framework/opengl/wrapper/glwApi.inl +++ b/framework/opengl/wrapper/glwApi.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ #define glActiveShaderProgram glwActiveShaderProgram #define glActiveTexture glwActiveTexture diff --git a/framework/opengl/wrapper/glwEnums.inl b/framework/opengl/wrapper/glwEnums.inl index 24a05be..deb27b3 100644 --- a/framework/opengl/wrapper/glwEnums.inl +++ b/framework/opengl/wrapper/glwEnums.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ #define GL_DEPTH_BUFFER_BIT 0x00000100 #define GL_STENCIL_BUFFER_BIT 0x00000400 @@ -578,6 +578,7 @@ #define GL_QUERY 0x82E3 #define GL_QUERY_KHR 0x82E3 #define GL_PROGRAM_PIPELINE 0x82E4 +#define GL_PROGRAM_PIPELINE_KHR 0x82E4 #define GL_MAX_VERTEX_ATTRIB_STRIDE 0x82E5 #define GL_SAMPLER 0x82E6 #define GL_SAMPLER_KHR 0x82E6 @@ -585,7 +586,6 @@ #define GL_MAX_LABEL_LENGTH_KHR 0x82E8 #define GL_NUM_SHADING_LANGUAGE_VERSIONS 0x82E9 #define GL_QUERY_TARGET 0x82EA -#define GL_TEXTURE_BINDING 0x82EB #define GL_MAX_CULL_DISTANCES 0x82F9 #define GL_MAX_COMBINED_CLIP_AND_CULL_DISTANCES 0x82FA #define GL_CONTEXT_RELEASE_BEHAVIOR 0x82FB @@ -1214,6 +1214,8 @@ #define GL_SIGNED_NORMALIZED 0x8F9C #define GL_PRIMITIVE_RESTART 0x8F9D #define GL_PRIMITIVE_RESTART_INDEX 0x8F9E +#define GL_SR8_EXT 0x8FBD +#define GL_SRG8_EXT 0x8FBE #define GL_DOUBLE_VEC2 0x8FFC #define GL_DOUBLE_VEC3 0x8FFD #define GL_DOUBLE_VEC4 0x8FFE diff --git a/framework/opengl/wrapper/glwFunctionTypes.inl b/framework/opengl/wrapper/glwFunctionTypes.inl index 24c90f2..707a13a 100644 --- a/framework/opengl/wrapper/glwFunctionTypes.inl +++ b/framework/opengl/wrapper/glwFunctionTypes.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ typedef GLW_APICALL void (GLW_APIENTRY* glActiveShaderProgramFunc) (GLuint pipeline, GLuint program); typedef GLW_APICALL void (GLW_APIENTRY* glActiveTextureFunc) (GLenum texture); diff --git a/framework/opengl/wrapper/glwFunctions.inl b/framework/opengl/wrapper/glwFunctions.inl index 074bea2..7717c89 100644 --- a/framework/opengl/wrapper/glwFunctions.inl +++ b/framework/opengl/wrapper/glwFunctions.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ glActiveShaderProgramFunc activeShaderProgram; glActiveTextureFunc activeTexture; diff --git a/framework/opengl/wrapper/glwImpl.inl b/framework/opengl/wrapper/glwImpl.inl index b701a3f..52cf3aa 100644 --- a/framework/opengl/wrapper/glwImpl.inl +++ b/framework/opengl/wrapper/glwImpl.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ void glwActiveShaderProgram (GLuint pipeline, GLuint program) diff --git a/framework/opengl/wrapper/glwInitES20.inl b/framework/opengl/wrapper/glwInitES20.inl index d775cc9..f20f0c5 100644 --- a/framework/opengl/wrapper/glwInitES20.inl +++ b/framework/opengl/wrapper/glwInitES20.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); gl->attachShader = (glAttachShaderFunc) loader->get("glAttachShader"); diff --git a/framework/opengl/wrapper/glwInitES20Direct.inl b/framework/opengl/wrapper/glwInitES20Direct.inl index 4cf5cb2..f65603a 100644 --- a/framework/opengl/wrapper/glwInitES20Direct.inl +++ b/framework/opengl/wrapper/glwInitES20Direct.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ gl->activeTexture = &glActiveTexture; gl->attachShader = &glAttachShader; diff --git a/framework/opengl/wrapper/glwInitES30.inl b/framework/opengl/wrapper/glwInitES30.inl index cefaf87..328df68 100644 --- a/framework/opengl/wrapper/glwInitES30.inl +++ b/framework/opengl/wrapper/glwInitES30.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); gl->attachShader = (glAttachShaderFunc) loader->get("glAttachShader"); diff --git a/framework/opengl/wrapper/glwInitES30Direct.inl b/framework/opengl/wrapper/glwInitES30Direct.inl index a4c5398..09a19ae 100644 --- a/framework/opengl/wrapper/glwInitES30Direct.inl +++ b/framework/opengl/wrapper/glwInitES30Direct.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ gl->activeTexture = &glActiveTexture; gl->attachShader = &glAttachShader; diff --git a/framework/opengl/wrapper/glwInitES31.inl b/framework/opengl/wrapper/glwInitES31.inl index 66e7ed5..0a09285 100644 --- a/framework/opengl/wrapper/glwInitES31.inl +++ b/framework/opengl/wrapper/glwInitES31.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ gl->activeShaderProgram = (glActiveShaderProgramFunc) loader->get("glActiveShaderProgram"); gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); diff --git a/framework/opengl/wrapper/glwInitES31Direct.inl b/framework/opengl/wrapper/glwInitES31Direct.inl index 1bcb67b..ada95da 100644 --- a/framework/opengl/wrapper/glwInitES31Direct.inl +++ b/framework/opengl/wrapper/glwInitES31Direct.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ gl->activeShaderProgram = &glActiveShaderProgram; gl->activeTexture = &glActiveTexture; diff --git a/framework/opengl/wrapper/glwInitExtES.inl b/framework/opengl/wrapper/glwInitExtES.inl index 96d48de..61026e5 100644 --- a/framework/opengl/wrapper/glwInitExtES.inl +++ b/framework/opengl/wrapper/glwInitExtES.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ if (de::contains(extSet, "GL_KHR_blend_equation_advanced")) diff --git a/framework/opengl/wrapper/glwInitExtGL.inl b/framework/opengl/wrapper/glwInitExtGL.inl index 7bee310..06e7f7c 100644 --- a/framework/opengl/wrapper/glwInitExtGL.inl +++ b/framework/opengl/wrapper/glwInitExtGL.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ if (de::contains(extSet, "GL_KHR_debug")) diff --git a/framework/opengl/wrapper/glwInitGL30.inl b/framework/opengl/wrapper/glwInitGL30.inl index 84bd9ab..f355789 100644 --- a/framework/opengl/wrapper/glwInitGL30.inl +++ b/framework/opengl/wrapper/glwInitGL30.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); gl->attachShader = (glAttachShaderFunc) loader->get("glAttachShader"); diff --git a/framework/opengl/wrapper/glwInitGL31.inl b/framework/opengl/wrapper/glwInitGL31.inl index 90b1c36..38c5b2e 100644 --- a/framework/opengl/wrapper/glwInitGL31.inl +++ b/framework/opengl/wrapper/glwInitGL31.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); gl->attachShader = (glAttachShaderFunc) loader->get("glAttachShader"); diff --git a/framework/opengl/wrapper/glwInitGL32.inl b/framework/opengl/wrapper/glwInitGL32.inl index 3012862..31e60e8 100644 --- a/framework/opengl/wrapper/glwInitGL32.inl +++ b/framework/opengl/wrapper/glwInitGL32.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); gl->attachShader = (glAttachShaderFunc) loader->get("glAttachShader"); diff --git a/framework/opengl/wrapper/glwInitGL33.inl b/framework/opengl/wrapper/glwInitGL33.inl index bbb27cd..06c3bcf 100644 --- a/framework/opengl/wrapper/glwInitGL33.inl +++ b/framework/opengl/wrapper/glwInitGL33.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); gl->attachShader = (glAttachShaderFunc) loader->get("glAttachShader"); diff --git a/framework/opengl/wrapper/glwInitGL40.inl b/framework/opengl/wrapper/glwInitGL40.inl index ede9dae..3c7328f 100644 --- a/framework/opengl/wrapper/glwInitGL40.inl +++ b/framework/opengl/wrapper/glwInitGL40.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); gl->attachShader = (glAttachShaderFunc) loader->get("glAttachShader"); diff --git a/framework/opengl/wrapper/glwInitGL41.inl b/framework/opengl/wrapper/glwInitGL41.inl index 9763f39..6a62ecd 100644 --- a/framework/opengl/wrapper/glwInitGL41.inl +++ b/framework/opengl/wrapper/glwInitGL41.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ gl->activeShaderProgram = (glActiveShaderProgramFunc) loader->get("glActiveShaderProgram"); gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); diff --git a/framework/opengl/wrapper/glwInitGL42.inl b/framework/opengl/wrapper/glwInitGL42.inl index 4bb80c3..39c310b 100644 --- a/framework/opengl/wrapper/glwInitGL42.inl +++ b/framework/opengl/wrapper/glwInitGL42.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ gl->activeShaderProgram = (glActiveShaderProgramFunc) loader->get("glActiveShaderProgram"); gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); diff --git a/framework/opengl/wrapper/glwInitGL43.inl b/framework/opengl/wrapper/glwInitGL43.inl index 7c4b488..d3a66cb 100644 --- a/framework/opengl/wrapper/glwInitGL43.inl +++ b/framework/opengl/wrapper/glwInitGL43.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ gl->activeShaderProgram = (glActiveShaderProgramFunc) loader->get("glActiveShaderProgram"); gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); diff --git a/framework/opengl/wrapper/glwInitGL44.inl b/framework/opengl/wrapper/glwInitGL44.inl index 3de7735..e896700 100644 --- a/framework/opengl/wrapper/glwInitGL44.inl +++ b/framework/opengl/wrapper/glwInitGL44.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ gl->activeShaderProgram = (glActiveShaderProgramFunc) loader->get("glActiveShaderProgram"); gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); diff --git a/framework/opengl/wrapper/glwInitGL45.inl b/framework/opengl/wrapper/glwInitGL45.inl index de1dbbf..45af5f3 100644 --- a/framework/opengl/wrapper/glwInitGL45.inl +++ b/framework/opengl/wrapper/glwInitGL45.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ gl->activeShaderProgram = (glActiveShaderProgramFunc) loader->get("glActiveShaderProgram"); gl->activeTexture = (glActiveTextureFunc) loader->get("glActiveTexture"); diff --git a/framework/platform/null/tcuNullRenderContextFuncs.inl b/framework/platform/null/tcuNullRenderContextFuncs.inl index 7580966..60c4a71 100644 --- a/framework/platform/null/tcuNullRenderContextFuncs.inl +++ b/framework/platform/null/tcuNullRenderContextFuncs.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ GLW_APICALL void GLW_APIENTRY glActiveShaderProgram (GLuint pipeline, GLuint program) diff --git a/framework/platform/null/tcuNullRenderContextInitFuncs.inl b/framework/platform/null/tcuNullRenderContextInitFuncs.inl index b5cf05b..cba6f59 100644 --- a/framework/platform/null/tcuNullRenderContextInitFuncs.inl +++ b/framework/platform/null/tcuNullRenderContextInitFuncs.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos GL API description (gl.xml) revision 29570. + * Generated from Khronos GL API description (gl.xml) revision 30159. */ gl->activeShaderProgram = glActiveShaderProgram; gl->activeTexture = glActiveTexture; diff --git a/scripts/opengl/gen_enums.py b/scripts/opengl/gen_enums.py index 5e2c359..140c9bf 100644 --- a/scripts/opengl/gen_enums.py +++ b/scripts/opengl/gen_enums.py @@ -35,4 +35,4 @@ def genEnums (iface): if __name__ == "__main__": import logging, sys logging.basicConfig(stream=sys.stderr, level=logging.INFO) - genEnums(getGLInterface()) + genEnums(getHybridInterface()) diff --git a/scripts/opengl/gen_str_util.py b/scripts/opengl/gen_str_util.py index c6b1517..3c1e410 100644 --- a/scripts/opengl/gen_str_util.py +++ b/scripts/opengl/gen_str_util.py @@ -554,6 +554,10 @@ ENUM_GROUPS = [ # EXT_sRGB "SRGB", "SRGB_ALPHA", + + # GL_EXT_texture_sRGB_R8 & RG8 + "SR8_EXT", + "SRG8_EXT", ]), ("CompressedTexFormat", [ diff --git a/scripts/opengl/src_util.py b/scripts/opengl/src_util.py index c36538f..7d960b2 100644 --- a/scripts/opengl/src_util.py +++ b/scripts/opengl/src_util.py @@ -37,8 +37,8 @@ OPENGL_INC_DIR = os.path.join(OPENGL_DIR, "wrapper") GL_SOURCE = khr_util.registry_cache.RegistrySource( "gl.xml", - 29570, - "cc358ff7b5fd27863518b80fe4578e021ef5a3d4e3397f323b44433a9b31f60f") + 30159, + "0af7e185d0db15e9f44a1b6ff6c72102f67509a8590f19a289b983d652008070") EXTENSIONS = [ 'GL_KHR_texture_compression_astc_ldr', @@ -62,6 +62,8 @@ EXTENSIONS = [ 'GL_EXT_draw_buffers_indexed', 'GL_EXT_texture_sRGB_decode', 'GL_EXT_texture_border_clamp', + 'GL_EXT_texture_sRGB_R8', + 'GL_EXT_texture_sRGB_RG8', ] def getGLRegistry (): -- 2.7.4