diff options
author | Paul Berry <[email protected]> | 2014-01-09 15:30:10 -0800 |
---|---|---|
committer | Paul Berry <[email protected]> | 2014-01-21 20:24:54 -0800 |
commit | 020919b2ae76192f0f35c0901be0e1069a87b7f2 (patch) | |
tree | f592aca2b25ba328b6f921fb7747dc6142560637 /src | |
parent | 6ab2a6148a539a9e308ad4e017e5ed6b9658aa4f (diff) |
main: Allow ctx == NULL in _mesa_validate_shader_target().
This will allow this function to be used in circumstances where there
is no context available, such as when building built-in GLSL
functions.
Reviewed-by: Chris Forbes <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src')
-rw-r--r-- | src/mesa/main/shaderapi.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 716e65968f3..2ab0a0cfde2 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -174,13 +174,20 @@ _mesa_copy_string(GLchar *dst, GLsizei maxLength, bool _mesa_validate_shader_target(const struct gl_context *ctx, GLenum type) { + /* Note: when building built-in GLSL functions, this function may be + * invoked with ctx == NULL. In that case, we can only validate that it's + * a shader target we recognize, not that it's supported in the current + * context. But that's fine--we don't need any further validation than + * that when building built-in GLSL functions. + */ + switch (type) { case GL_FRAGMENT_SHADER: - return ctx->Extensions.ARB_fragment_shader; + return ctx == NULL || ctx->Extensions.ARB_fragment_shader; case GL_VERTEX_SHADER: - return ctx->Extensions.ARB_vertex_shader; + return ctx == NULL || ctx->Extensions.ARB_vertex_shader; case GL_GEOMETRY_SHADER_ARB: - return _mesa_has_geometry_shaders(ctx); + return ctx == NULL || _mesa_has_geometry_shaders(ctx); default: return false; } |