mesa/es: Validate glCreateShader targets in Mesa code rather than the ES wrapper

v2: Add proper core-profile filtering.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index 7efca4d1b3e4d124ad8226f3d481c3a76cca98ba..904a6d81c3b94bf1191e25d572b6bac7459a9602 100644 (file)
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -2016,11 +2016,6 @@
                <return type="GLuint"/>
                <param name="type" type="GLenum"/>
        </proto>
-
-       <desc name="type">
-               <value name="GL_VERTEX_SHADER"/>
-               <value name="GL_FRAGMENT_SHADER"/>
-       </desc>
 </template>
 
 <template name="ShaderSource">

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 0049e87e1d29bb313e9b19249ce9198acdc3836a..d6acade3dab7fa414343787af0fc000829dbda8d 100644 (file)
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -177,7 +177,7 @@ validate_shader_target(const struct gl_context *ctx, GLenum type)
 #endif
 #if FEATURE_ARB_geometry_shader4
    case GL_GEOMETRY_SHADER_ARB:
-      return ctx->Extensions.ARB_geometry_shader4;
+      return _mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_geometry_shader4;
 #endif
    default:
       return false;