diff options
Diffstat (limited to 'mesalib/src/mesa/main/api_exec.c')
| -rw-r--r-- | mesalib/src/mesa/main/api_exec.c | 300 |
1 files changed, 196 insertions, 104 deletions
diff --git a/mesalib/src/mesa/main/api_exec.c b/mesalib/src/mesa/main/api_exec.c index 6b1499f4f..c44818945 100644 --- a/mesalib/src/mesa/main/api_exec.c +++ b/mesalib/src/mesa/main/api_exec.c @@ -106,7 +106,7 @@ #include "main/dispatch.h" -#if FEATURE_GL +#if FEATURE_GL || FEATURE_ES2 /** @@ -133,7 +133,7 @@ _mesa_create_exec_table(struct gl_context *ctx) #endif /* load the dispatch slots we understand */ - if (ctx->API != API_OPENGL_CORE) { + if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { SET_AlphaFunc(exec, _mesa_AlphaFunc); } @@ -145,14 +145,16 @@ _mesa_create_exec_table(struct gl_context *ctx) SET_CullFace(exec, _mesa_CullFace); SET_Disable(exec, _mesa_Disable); #if FEATURE_draw_read_buffer - SET_DrawBuffer(exec, _mesa_DrawBuffer); + if (ctx->API == API_OPENGL || ctx->API == API_OPENGL_CORE) + SET_DrawBuffer(exec, _mesa_DrawBuffer); + SET_ReadBuffer(exec, _mesa_ReadBuffer); #endif SET_Enable(exec, _mesa_Enable); SET_Finish(exec, _mesa_Finish); SET_Flush(exec, _mesa_Flush); SET_FrontFace(exec, _mesa_FrontFace); - if (ctx->API != API_OPENGL_CORE) { + if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { SET_Frustum(exec, _mesa_Frustum); } SET_GetError(exec, _mesa_GetError); @@ -162,37 +164,39 @@ _mesa_create_exec_table(struct gl_context *ctx) SET_LineStipple(exec, _mesa_LineStipple); } SET_LineWidth(exec, _mesa_LineWidth); - if (ctx->API != API_OPENGL_CORE) { + if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { SET_LoadIdentity(exec, _mesa_LoadIdentity); SET_LoadMatrixf(exec, _mesa_LoadMatrixf); } - SET_LogicOp(exec, _mesa_LogicOp); - if (ctx->API != API_OPENGL_CORE) { + if (ctx->API != API_OPENGLES2) { + SET_LogicOp(exec, _mesa_LogicOp); + } + if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { SET_MatrixMode(exec, _mesa_MatrixMode); SET_MultMatrixf(exec, _mesa_MultMatrixf); SET_Ortho(exec, _mesa_Ortho); } SET_PixelStorei(exec, _mesa_PixelStorei); - if (ctx->API != API_OPENGL_CORE) { + if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { SET_PopMatrix(exec, _mesa_PopMatrix); SET_PushMatrix(exec, _mesa_PushMatrix); SET_Rotatef(exec, _mesa_Rotatef); SET_Scalef(exec, _mesa_Scalef); } SET_Scissor(exec, _mesa_Scissor); - if (ctx->API != API_OPENGL_CORE) { + if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { SET_ShadeModel(exec, _mesa_ShadeModel); } SET_StencilFunc(exec, _mesa_StencilFunc); SET_StencilMask(exec, _mesa_StencilMask); SET_StencilOp(exec, _mesa_StencilOp); - if (ctx->API != API_OPENGL_CORE) { + if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { SET_TexEnvfv(exec, _mesa_TexEnvfv); SET_TexEnvi(exec, _mesa_TexEnvi); } SET_TexImage2D(exec, _mesa_TexImage2D); SET_TexParameteri(exec, _mesa_TexParameteri); - if (ctx->API != API_OPENGL_CORE) { + if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { SET_Translatef(exec, _mesa_Translatef); } SET_Viewport(exec, _mesa_Viewport); @@ -212,7 +216,9 @@ _mesa_create_exec_table(struct gl_context *ctx) SET_DepthMask(exec, _mesa_DepthMask); SET_DepthRange(exec, _mesa_DepthRange); - _mesa_init_drawpix_dispatch(exec); + if (ctx->API != API_OPENGLES2 && ctx->API != API_OPENGL_CORE) { + _mesa_init_drawpix_dispatch(exec); + } if (ctx->API == API_OPENGL) { _mesa_init_feedback_dispatch(exec); } @@ -228,7 +234,7 @@ _mesa_create_exec_table(struct gl_context *ctx) SET_GetBooleanv(exec, _mesa_GetBooleanv); SET_GetDoublev(exec, _mesa_GetDoublev); SET_GetIntegerv(exec, _mesa_GetIntegerv); - if (ctx->API != API_OPENGL_CORE) { + if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { SET_GetLightfv(exec, _mesa_GetLightfv); SET_GetLightiv(exec, _mesa_GetLightiv); SET_GetMaterialfv(exec, _mesa_GetMaterialfv); @@ -237,17 +243,21 @@ _mesa_create_exec_table(struct gl_context *ctx) SET_GetTexEnvfv(exec, _mesa_GetTexEnvfv); SET_GetTexEnviv(exec, _mesa_GetTexEnviv); } - SET_GetTexLevelParameterfv(exec, _mesa_GetTexLevelParameterfv); - SET_GetTexLevelParameteriv(exec, _mesa_GetTexLevelParameteriv); + if (ctx->API != API_OPENGLES2) { + SET_GetTexLevelParameterfv(exec, _mesa_GetTexLevelParameterfv); + SET_GetTexLevelParameteriv(exec, _mesa_GetTexLevelParameteriv); + } SET_GetTexParameterfv(exec, _mesa_GetTexParameterfv); SET_GetTexParameteriv(exec, _mesa_GetTexParameteriv); - SET_GetTexImage(exec, _mesa_GetTexImage); + if (ctx->API != API_OPENGLES2) { + SET_GetTexImage(exec, _mesa_GetTexImage); + } SET_Hint(exec, _mesa_Hint); if (ctx->API == API_OPENGL) { SET_IndexMask(exec, _mesa_IndexMask); } SET_IsEnabled(exec, _mesa_IsEnabled); - if (ctx->API != API_OPENGL_CORE) { + if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { SET_LightModelf(exec, _mesa_LightModelf); SET_LightModelfv(exec, _mesa_LightModelfv); SET_LightModeli(exec, _mesa_LightModeli); @@ -265,19 +275,25 @@ _mesa_create_exec_table(struct gl_context *ctx) _mesa_init_pixel_dispatch(exec); } - SET_PixelStoref(exec, _mesa_PixelStoref); + if (ctx->API != API_OPENGLES2) { + SET_PixelStoref(exec, _mesa_PixelStoref); + } + SET_PointSize(exec, _mesa_PointSize); - SET_PolygonMode(exec, _mesa_PolygonMode); + + if (ctx->API != API_OPENGLES2) { + SET_PolygonMode(exec, _mesa_PolygonMode); + } + SET_PolygonOffset(exec, _mesa_PolygonOffset); if (ctx->API == API_OPENGL) { SET_PolygonStipple(exec, _mesa_PolygonStipple); - _mesa_init_attrib_dispatch(exec); _mesa_init_rastpos_dispatch(exec); } SET_ReadPixels(exec, _mesa_ReadPixels); - if (ctx->API != API_OPENGL_CORE) { + if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { SET_Rotated(exec, _mesa_Rotated); SET_Scaled(exec, _mesa_Scaled); SET_SecondaryColorPointerEXT(exec, _mesa_SecondaryColorPointerEXT); @@ -285,11 +301,13 @@ _mesa_create_exec_table(struct gl_context *ctx) SET_TexEnviv(exec, _mesa_TexEnviv); } - if (ctx->API != API_OPENGL_CORE) { + if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { _mesa_init_texgen_dispatch(exec); } - SET_TexImage1D(exec, _mesa_TexImage1D); + if (ctx->API != API_OPENGLES2) { + SET_TexImage1D(exec, _mesa_TexImage1D); + } SET_TexParameterf(exec, _mesa_TexParameterf); SET_TexParameterfv(exec, _mesa_TexParameterfv); SET_TexParameteriv(exec, _mesa_TexParameteriv); @@ -306,11 +324,17 @@ _mesa_create_exec_table(struct gl_context *ctx) SET_AreTexturesResident(exec, _mesa_AreTexturesResident); SET_ColorPointer(exec, _mesa_ColorPointer); } - SET_CopyTexImage1D(exec, _mesa_CopyTexImage1D); + if (ctx->API != API_OPENGLES2) { + SET_CopyTexImage1D(exec, _mesa_CopyTexImage1D); + SET_CopyTexSubImage1D(exec, _mesa_CopyTexSubImage1D); + SET_TexSubImage1D(exec, _mesa_TexSubImage1D); + } + SET_CopyTexImage2D(exec, _mesa_CopyTexImage2D); - SET_CopyTexSubImage1D(exec, _mesa_CopyTexSubImage1D); SET_CopyTexSubImage2D(exec, _mesa_CopyTexSubImage2D); - if (ctx->API != API_OPENGL_CORE) { + SET_TexSubImage2D(exec, _mesa_TexSubImage2D); + + if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { SET_DisableClientState(exec, _mesa_DisableClientState); SET_EdgeFlagPointer(exec, _mesa_EdgeFlagPointer); SET_EnableClientState(exec, _mesa_EnableClientState); @@ -319,13 +343,11 @@ _mesa_create_exec_table(struct gl_context *ctx) SET_InterleavedArrays(exec, _mesa_InterleavedArrays); } SET_IsTexture(exec, _mesa_IsTexture); - if (ctx->API != API_OPENGL_CORE) { + if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { SET_NormalPointer(exec, _mesa_NormalPointer); SET_PrioritizeTextures(exec, _mesa_PrioritizeTextures); SET_TexCoordPointer(exec, _mesa_TexCoordPointer); } - SET_TexSubImage1D(exec, _mesa_TexSubImage1D); - SET_TexSubImage2D(exec, _mesa_TexSubImage2D); if (ctx->API != API_OPENGL_CORE) { SET_VertexPointer(exec, _mesa_VertexPointer); } @@ -392,7 +414,7 @@ _mesa_create_exec_table(struct gl_context *ctx) /* 14. SGI_color_table */ #if 0 - if (ctx->API != API_OPENGL_CORE) { + if (ctx->API == API_OPENGL) { SET_ColorTableSGI(exec, _mesa_ColorTable); SET_ColorSubTableSGI(exec, _mesa_ColorSubTable); SET_GetColorTableSGI(exec, _mesa_GetColorTable); @@ -456,8 +478,10 @@ _mesa_create_exec_table(struct gl_context *ctx) /* 200. GL_IBM_multimode_draw_arrays */ #if _HAVE_FULL_GL - SET_MultiModeDrawArraysIBM(exec, _mesa_MultiModeDrawArraysIBM); - SET_MultiModeDrawElementsIBM(exec, _mesa_MultiModeDrawElementsIBM); + if (ctx->API != API_OPENGLES2) { + SET_MultiModeDrawArraysIBM(exec, _mesa_MultiModeDrawArraysIBM); + SET_MultiModeDrawElementsIBM(exec, _mesa_MultiModeDrawElementsIBM); + } #endif /* 233. GL_NV_vertex_program */ @@ -477,7 +501,6 @@ _mesa_create_exec_table(struct gl_context *ctx) SET_GetVertexAttribdvNV(exec, _mesa_GetVertexAttribdvNV); SET_GetVertexAttribfvNV(exec, _mesa_GetVertexAttribfvNV); SET_GetVertexAttribivNV(exec, _mesa_GetVertexAttribivNV); - SET_GetVertexAttribPointervNV(exec, _mesa_GetVertexAttribPointervNV); SET_IsProgramNV(exec, _mesa_IsProgramARB); SET_LoadProgramNV(exec, _mesa_LoadProgramNV); SET_ProgramEnvParameter4dARB(exec, _mesa_ProgramEnvParameter4dARB); /* alias to ProgramParameter4dNV */ @@ -491,13 +514,14 @@ _mesa_create_exec_table(struct gl_context *ctx) /* glVertexAttrib*NV functions handled in api_loopback.c */ } #endif + SET_GetVertexAttribPointervNV(exec, _mesa_GetVertexAttribPointervNV); /* 273. GL_APPLE_vertex_array_object */ if (ctx->API == API_OPENGL) { SET_BindVertexArrayAPPLE(exec, _mesa_BindVertexArrayAPPLE); SET_GenVertexArraysAPPLE(exec, _mesa_GenVertexArraysAPPLE); } - /* Reused by ARB_vertex_array_object */ + /* Reused by ARB_vertex_array_object / OES_vertex_array_object */ SET_DeleteVertexArraysAPPLE(exec, _mesa_DeleteVertexArraysAPPLE); SET_IsVertexArrayAPPLE(exec, _mesa_IsVertexArrayAPPLE); @@ -533,22 +557,32 @@ _mesa_create_exec_table(struct gl_context *ctx) #endif /* 285. GL_NV_primitive_restart */ - SET_PrimitiveRestartIndexNV(exec, _mesa_PrimitiveRestartIndex); + if (ctx->API != API_OPENGLES2) { + SET_PrimitiveRestartIndexNV(exec, _mesa_PrimitiveRestartIndex); + } /* ???. GL_EXT_depth_bounds_test */ - SET_DepthBoundsEXT(exec, _mesa_DepthBoundsEXT); + if (ctx->API != API_OPENGLES2) { + SET_DepthBoundsEXT(exec, _mesa_DepthBoundsEXT); + } /* 352. GL_EXT_transform_feedback */ /* ARB 93. GL_ARB_transform_feedback2 */ - _mesa_init_transform_feedback_dispatch(exec); + if (ctx->API != API_OPENGLES2) { + _mesa_init_transform_feedback_dispatch(exec); + } /* 364. GL_EXT_provoking_vertex */ - SET_ProvokingVertexEXT(exec, _mesa_ProvokingVertexEXT); + if (ctx->API != API_OPENGLES2) { + SET_ProvokingVertexEXT(exec, _mesa_ProvokingVertexEXT); + } /* ARB 1. GL_ARB_multitexture */ #if _HAVE_FULL_GL SET_ActiveTextureARB(exec, _mesa_ActiveTextureARB); - SET_ClientActiveTextureARB(exec, _mesa_ClientActiveTextureARB); + if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { + SET_ClientActiveTextureARB(exec, _mesa_ClientActiveTextureARB); + } #endif /* ARB 3. GL_ARB_transpose_matrix */ @@ -568,16 +602,21 @@ _mesa_create_exec_table(struct gl_context *ctx) /* ARB 12. GL_ARB_texture_compression */ #if _HAVE_FULL_GL + if (ctx->API != API_OPENGLES2) { + SET_CompressedTexImage1DARB(exec, _mesa_CompressedTexImage1DARB); + SET_CompressedTexSubImage1DARB(exec, _mesa_CompressedTexSubImage1DARB); + SET_GetCompressedTexImageARB(exec, _mesa_GetCompressedTexImageARB); + } + SET_CompressedTexImage3DARB(exec, _mesa_CompressedTexImage3DARB); SET_CompressedTexImage2DARB(exec, _mesa_CompressedTexImage2DARB); - SET_CompressedTexImage1DARB(exec, _mesa_CompressedTexImage1DARB); SET_CompressedTexSubImage3DARB(exec, _mesa_CompressedTexSubImage3DARB); SET_CompressedTexSubImage2DARB(exec, _mesa_CompressedTexSubImage2DARB); - SET_CompressedTexSubImage1DARB(exec, _mesa_CompressedTexSubImage1DARB); - SET_GetCompressedTexImageARB(exec, _mesa_GetCompressedTexImageARB); /* ARB 104. GL_ARB_robustness */ - SET_GetnCompressedTexImageARB(exec, _mesa_GetnCompressedTexImageARB); + if (ctx->API != API_OPENGLES2) { + SET_GetnCompressedTexImageARB(exec, _mesa_GetnCompressedTexImageARB); + } #endif /* ARB 14. GL_ARB_point_parameters */ @@ -625,12 +664,15 @@ _mesa_create_exec_table(struct gl_context *ctx) SET_VertexAttribPointerARB(exec, _mesa_VertexAttribPointerARB); SET_EnableVertexAttribArrayARB(exec, _mesa_EnableVertexAttribArrayARB); SET_DisableVertexAttribArrayARB(exec, _mesa_DisableVertexAttribArrayARB); - SET_ProgramStringARB(exec, _mesa_ProgramStringARB); - /* glBindProgramARB aliases glBindProgramNV */ - /* glDeleteProgramsARB aliases glDeleteProgramsNV */ - /* glGenProgramsARB aliases glGenProgramsNV */ - /* glIsProgramARB aliases glIsProgramNV */ - SET_GetVertexAttribdvARB(exec, _mesa_GetVertexAttribdvARB); + if (ctx->API != API_OPENGLES2) { + SET_ProgramStringARB(exec, _mesa_ProgramStringARB); + /* glBindProgramARB aliases glBindProgramNV */ + /* glDeleteProgramsARB aliases glDeleteProgramsNV */ + /* glGenProgramsARB aliases glGenProgramsNV */ + /* glIsProgramARB aliases glIsProgramNV */ + SET_GetVertexAttribdvARB(exec, _mesa_GetVertexAttribdvARB); + } + SET_GetVertexAttribfvARB(exec, _mesa_GetVertexAttribfvARB); SET_GetVertexAttribivARB(exec, _mesa_GetVertexAttribivARB); /* glGetVertexAttribPointervARB aliases glGetVertexAttribPointervNV */ @@ -656,7 +698,9 @@ _mesa_create_exec_table(struct gl_context *ctx) _mesa_init_bufferobj_dispatch(ctx, exec); /* ARB 29. GL_ARB_occlusion_query */ - _mesa_init_queryobj_dispatch(exec); + if (ctx->API != API_OPENGLES2) { + _mesa_init_queryobj_dispatch(exec); + } /* ARB 37. GL_ARB_draw_buffers */ #if FEATURE_draw_read_buffer @@ -664,16 +708,22 @@ _mesa_create_exec_table(struct gl_context *ctx) #endif /* ARB 66. GL_ARB_sync */ - _mesa_init_sync_dispatch(exec); + if (ctx->API != API_OPENGLES2) { + _mesa_init_sync_dispatch(exec); + } /* ARB 104. GL_ARB_debug_output */ - _mesa_init_errors_dispatch(exec); + if (ctx->API != API_OPENGLES2) { + _mesa_init_errors_dispatch(exec); + } /* ARB 105. GL_ARB_robustness */ - SET_GetGraphicsResetStatusARB(exec, _mesa_GetGraphicsResetStatusARB); - SET_GetnPolygonStippleARB(exec, _mesa_GetnPolygonStippleARB); - SET_GetnTexImageARB(exec, _mesa_GetnTexImageARB); - SET_ReadnPixelsARB(exec, _mesa_ReadnPixelsARB); + if (ctx->API != API_OPENGLES2) { + SET_GetGraphicsResetStatusARB(exec, _mesa_GetGraphicsResetStatusARB); + SET_GetnPolygonStippleARB(exec, _mesa_GetnPolygonStippleARB); + SET_GetnTexImageARB(exec, _mesa_GetnTexImageARB); + SET_ReadnPixelsARB(exec, _mesa_ReadnPixelsARB); + } /* GL_ATI_fragment_shader */ if (ctx->API == API_OPENGL) { @@ -700,7 +750,9 @@ _mesa_create_exec_table(struct gl_context *ctx) SET_DeleteFramebuffersEXT(exec, _mesa_DeleteFramebuffersEXT); SET_GenFramebuffersEXT(exec, _mesa_GenFramebuffersEXT); SET_CheckFramebufferStatusEXT(exec, _mesa_CheckFramebufferStatusEXT); - SET_FramebufferTexture1DEXT(exec, _mesa_FramebufferTexture1DEXT); + if (ctx->API != API_OPENGLES2) { + SET_FramebufferTexture1DEXT(exec, _mesa_FramebufferTexture1DEXT); + } SET_FramebufferTexture2DEXT(exec, _mesa_FramebufferTexture2DEXT); SET_FramebufferTexture3DEXT(exec, _mesa_FramebufferTexture3DEXT); SET_FramebufferRenderbufferEXT(exec, _mesa_FramebufferRenderbufferEXT); @@ -709,7 +761,9 @@ _mesa_create_exec_table(struct gl_context *ctx) #endif #if FEATURE_EXT_framebuffer_blit - SET_BlitFramebufferEXT(exec, _mesa_BlitFramebufferEXT); + if (ctx->API != API_OPENGLES2) { + SET_BlitFramebufferEXT(exec, _mesa_BlitFramebufferEXT); + } #endif /* GL_EXT_gpu_program_parameters */ @@ -722,7 +776,9 @@ _mesa_create_exec_table(struct gl_context *ctx) /* GL_MESA_texture_array / GL_EXT_texture_array */ #if FEATURE_EXT_framebuffer_object - SET_FramebufferTextureLayerEXT(exec, _mesa_FramebufferTextureLayerEXT); + if (ctx->API != API_OPENGLES2) { + SET_FramebufferTextureLayerEXT(exec, _mesa_FramebufferTextureLayerEXT); + } #endif /* GL_ATI_separate_stencil */ @@ -734,32 +790,42 @@ _mesa_create_exec_table(struct gl_context *ctx) /* The ARB_fbo functions are the union of * GL_EXT_fbo, GL_EXT_framebuffer_blit, GL_EXT_texture_array */ - SET_RenderbufferStorageMultisample(exec, _mesa_RenderbufferStorageMultisample); + if (ctx->API != API_OPENGLES2) { + SET_RenderbufferStorageMultisample(exec, _mesa_RenderbufferStorageMultisample); + } #endif #if FEATURE_ARB_map_buffer_range - SET_MapBufferRange(exec, _mesa_MapBufferRange); - SET_FlushMappedBufferRange(exec, _mesa_FlushMappedBufferRange); + if (ctx->API != API_OPENGLES2) { + SET_MapBufferRange(exec, _mesa_MapBufferRange); + SET_FlushMappedBufferRange(exec, _mesa_FlushMappedBufferRange); + } #endif /* GL_ARB_copy_buffer */ - SET_CopyBufferSubData(exec, _mesa_CopyBufferSubData); + if (ctx->API != API_OPENGLES2) { + SET_CopyBufferSubData(exec, _mesa_CopyBufferSubData); + } - /* GL_ARB_vertex_array_object */ + /* GL_ARB_vertex_array_object / GL_OES_vertex_array_object */ SET_BindVertexArray(exec, _mesa_BindVertexArray); SET_GenVertexArrays(exec, _mesa_GenVertexArrays); /* GL_EXT_draw_buffers2 */ - SET_ColorMaskIndexedEXT(exec, _mesa_ColorMaskIndexed); - SET_GetBooleanIndexedvEXT(exec, _mesa_GetBooleanIndexedv); - SET_GetIntegerIndexedvEXT(exec, _mesa_GetIntegerIndexedv); - SET_EnableIndexedEXT(exec, _mesa_EnableIndexed); - SET_DisableIndexedEXT(exec, _mesa_DisableIndexed); - SET_IsEnabledIndexedEXT(exec, _mesa_IsEnabledIndexed); + if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { + SET_ColorMaskIndexedEXT(exec, _mesa_ColorMaskIndexed); + SET_GetBooleanIndexedvEXT(exec, _mesa_GetBooleanIndexedv); + SET_GetIntegerIndexedvEXT(exec, _mesa_GetIntegerIndexedv); + SET_EnableIndexedEXT(exec, _mesa_EnableIndexed); + SET_DisableIndexedEXT(exec, _mesa_DisableIndexed); + SET_IsEnabledIndexedEXT(exec, _mesa_IsEnabledIndexed); + } /* GL_NV_conditional_render */ - SET_BeginConditionalRenderNV(exec, _mesa_BeginConditionalRender); - SET_EndConditionalRenderNV(exec, _mesa_EndConditionalRender); + if (ctx->API != API_OPENGLES2) { + SET_BeginConditionalRenderNV(exec, _mesa_BeginConditionalRender); + SET_EndConditionalRenderNV(exec, _mesa_EndConditionalRender); + } #if FEATURE_OES_EGL_image SET_EGLImageTargetTexture2DOES(exec, _mesa_EGLImageTargetTexture2DOES); @@ -767,64 +833,90 @@ _mesa_create_exec_table(struct gl_context *ctx) #endif #if FEATURE_APPLE_object_purgeable - SET_ObjectPurgeableAPPLE(exec, _mesa_ObjectPurgeableAPPLE); - SET_ObjectUnpurgeableAPPLE(exec, _mesa_ObjectUnpurgeableAPPLE); - SET_GetObjectParameterivAPPLE(exec, _mesa_GetObjectParameterivAPPLE); + if (ctx->API != API_OPENGLES2) { + SET_ObjectPurgeableAPPLE(exec, _mesa_ObjectPurgeableAPPLE); + SET_ObjectUnpurgeableAPPLE(exec, _mesa_ObjectUnpurgeableAPPLE); + SET_GetObjectParameterivAPPLE(exec, _mesa_GetObjectParameterivAPPLE); + } #endif #if FEATURE_ARB_geometry_shader4 - SET_FramebufferTextureARB(exec, _mesa_FramebufferTextureARB); - SET_FramebufferTextureFaceARB(exec, _mesa_FramebufferTextureFaceARB); + if (ctx->API != API_OPENGLES2) { + SET_FramebufferTextureARB(exec, _mesa_FramebufferTextureARB); + SET_FramebufferTextureFaceARB(exec, _mesa_FramebufferTextureFaceARB); + } #endif - SET_ClampColorARB(exec, _mesa_ClampColorARB); + if (ctx->API != API_OPENGLES2) { + SET_ClampColorARB(exec, _mesa_ClampColorARB); + } /* GL_EXT_texture_integer */ - SET_ClearColorIiEXT(exec, _mesa_ClearColorIiEXT); - SET_ClearColorIuiEXT(exec, _mesa_ClearColorIuiEXT); - SET_GetTexParameterIivEXT(exec, _mesa_GetTexParameterIiv); - SET_GetTexParameterIuivEXT(exec, _mesa_GetTexParameterIuiv); - SET_TexParameterIivEXT(exec, _mesa_TexParameterIiv); - SET_TexParameterIuivEXT(exec, _mesa_TexParameterIuiv); + if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { + SET_ClearColorIiEXT(exec, _mesa_ClearColorIiEXT); + SET_ClearColorIuiEXT(exec, _mesa_ClearColorIuiEXT); + } + if (ctx->API != API_OPENGLES2) { + SET_GetTexParameterIivEXT(exec, _mesa_GetTexParameterIiv); + SET_GetTexParameterIuivEXT(exec, _mesa_GetTexParameterIuiv); + SET_TexParameterIivEXT(exec, _mesa_TexParameterIiv); + SET_TexParameterIuivEXT(exec, _mesa_TexParameterIuiv); + } /* GL_EXT_gpu_shader4 / OpenGL 3.0 */ - SET_GetVertexAttribIivEXT(exec, _mesa_GetVertexAttribIiv); - SET_GetVertexAttribIuivEXT(exec, _mesa_GetVertexAttribIuiv); - SET_VertexAttribIPointerEXT(exec, _mesa_VertexAttribIPointer); + if (ctx->API != API_OPENGLES2) { + SET_GetVertexAttribIivEXT(exec, _mesa_GetVertexAttribIiv); + SET_GetVertexAttribIuivEXT(exec, _mesa_GetVertexAttribIuiv); + SET_VertexAttribIPointerEXT(exec, _mesa_VertexAttribIPointer); + } /* GL 3.0 (functions not covered by other extensions) */ - SET_ClearBufferiv(exec, _mesa_ClearBufferiv); - SET_ClearBufferuiv(exec, _mesa_ClearBufferuiv); - SET_ClearBufferfv(exec, _mesa_ClearBufferfv); - SET_ClearBufferfi(exec, _mesa_ClearBufferfi); - SET_GetStringi(exec, _mesa_GetStringi); - SET_ClampColor(exec, _mesa_ClampColorARB); + if (ctx->API != API_OPENGLES2) { + SET_ClearBufferiv(exec, _mesa_ClearBufferiv); + SET_ClearBufferuiv(exec, _mesa_ClearBufferuiv); + SET_ClearBufferfv(exec, _mesa_ClearBufferfv); + SET_ClearBufferfi(exec, _mesa_ClearBufferfi); + SET_GetStringi(exec, _mesa_GetStringi); + SET_ClampColor(exec, _mesa_ClampColorARB); + } /* GL_ARB_instanced_arrays */ - SET_VertexAttribDivisorARB(exec, _mesa_VertexAttribDivisor); + if (ctx->API != API_OPENGLES2) { + SET_VertexAttribDivisorARB(exec, _mesa_VertexAttribDivisor); + } /* GL_ARB_draw_buffer_blend */ - SET_BlendFunciARB(exec, _mesa_BlendFunci); - SET_BlendFuncSeparateiARB(exec, _mesa_BlendFuncSeparatei); - SET_BlendEquationiARB(exec, _mesa_BlendEquationi); - SET_BlendEquationSeparateiARB(exec, _mesa_BlendEquationSeparatei); + if (ctx->API != API_OPENGLES2) { + SET_BlendFunciARB(exec, _mesa_BlendFunci); + SET_BlendFuncSeparateiARB(exec, _mesa_BlendFuncSeparatei); + SET_BlendEquationiARB(exec, _mesa_BlendEquationi); + SET_BlendEquationSeparateiARB(exec, _mesa_BlendEquationSeparatei); + } /* GL_NV_texture_barrier */ - SET_TextureBarrierNV(exec, _mesa_TextureBarrierNV); + if (ctx->API != API_OPENGLES2) { + SET_TextureBarrierNV(exec, _mesa_TextureBarrierNV); + } /* GL_ARB_texture_buffer_object */ - SET_TexBufferARB(exec, _mesa_TexBuffer); + if (ctx->API != API_OPENGLES2) { + SET_TexBufferARB(exec, _mesa_TexBuffer); + } /* GL_ARB_texture_storage */ - SET_TexStorage1D(exec, _mesa_TexStorage1D); + if (ctx->API != API_OPENGLES2) { + SET_TexStorage1D(exec, _mesa_TexStorage1D); + SET_TextureStorage1DEXT(exec, _mesa_TextureStorage1DEXT); + } SET_TexStorage2D(exec, _mesa_TexStorage2D); SET_TexStorage3D(exec, _mesa_TexStorage3D); - SET_TextureStorage1DEXT(exec, _mesa_TextureStorage1DEXT); SET_TextureStorage2DEXT(exec, _mesa_TextureStorage2DEXT); SET_TextureStorage3DEXT(exec, _mesa_TextureStorage3DEXT); #if FEATURE_ARB_sampler_objects - _mesa_init_sampler_object_dispatch(exec); + if (ctx->API != API_OPENGLES2) { + _mesa_init_sampler_object_dispatch(exec); + } #endif if (_mesa_is_desktop_gl(ctx)) { @@ -840,4 +932,4 @@ _mesa_create_exec_table(struct gl_context *ctx) return exec; } -#endif /* FEATURE_GL */ +#endif /* FEATURE_GL || FEATURE_ES2 */ |