From: Chia-I Wu <olv@lunarg.com>
Date: Mon, 31 May 2010 02:36:51 +0000 (+0800)
Subject: mesa: Fix/add feature test to shader.c.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c08449b78ee95c90f95983fbd6b964ac6d09a748;p=mesa.git

mesa: Fix/add feature test to shader.c.

Those macros used by _mesa_init_shader_dispatch are not available when
FEATURE_GL is not defined.
---

diff --git a/src/mesa/main/shaders.c b/src/mesa/main/shaders.c
index 761b3e85a74..65f1ee3efbd 100644
--- a/src/mesa/main/shaders.c
+++ b/src/mesa/main/shaders.c
@@ -811,7 +811,7 @@ _mesa_ValidateProgramARB(GLhandleARB program)
    ctx->Driver.ValidateProgram(ctx, program);
 }
 
-#ifdef FEATURE_ES2
+#if FEATURE_ES2
 
 void GLAPIENTRY
 _mesa_GetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype,
@@ -847,6 +847,7 @@ _mesa_ShaderBinary(GLint n, const GLuint* shaders, GLenum binaryformat,
 void
 _mesa_init_shader_dispatch(struct _glapi_table *exec)
 {
+#if FEATURE_GL
    /* GL_ARB_vertex/fragment_shader */
    SET_DeleteObjectARB(exec, _mesa_DeleteObjectARB);
    SET_GetHandleARB(exec, _mesa_GetHandleARB);
@@ -927,4 +928,5 @@ _mesa_init_shader_dispatch(struct _glapi_table *exec)
    (void) _mesa_Uniform2uiv;
    (void) _mesa_Uniform3uiv;
    (void) _mesa_Uniform4uiv;
+#endif /* FEATURE_GL */
 }