diff options
| author | Ian Romanick <[email protected]> | 2012-07-24 20:17:18 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2012-08-24 09:06:31 -0700 |
| commit | 86f29cf7d0817f1b6c9a9665c044ce36822b23b4 (patch) | |
| tree | ba30f1315335077e57fe7a0861636acfa6348220 | |
| parent | b042f7a1ff905a7136557f35f368166526fab9ed (diff) | |
mesa/es: Validate glCreateShader targets in Mesa code rather than the ES wrapper
v2: Add proper core-profile filtering.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/mesa/main/APIspec.xml | 5 | ||||
| -rw-r--r-- | src/mesa/main/shaderapi.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml index 7efca4d1b3e..904a6d81c3b 100644 --- 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 0049e87e1d2..d6acade3dab 100644 --- 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; |