diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2016-08-19 13:44:01 +0100 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2016-08-26 15:03:14 -0700 |
| commit | aa228eb1a69b2b367583878f440423229d4d1ac3 (patch) | |
| tree | 76da9cf87476857b23f75eedcd469dc77141fc0f /src/mesa/main/shaderapi.c | |
| parent | 0115f356eec22b30a78847ac47caebae4c436b68 (diff) | |
| download | external_mesa3d-aa228eb1a69b2b367583878f440423229d4d1ac3.zip external_mesa3d-aa228eb1a69b2b367583878f440423229d4d1ac3.tar.gz external_mesa3d-aa228eb1a69b2b367583878f440423229d4d1ac3.tar.bz2 | |
mesa: Remove redundant _mesa_has_shader_subroutine
The checks in _mesa_has_shader_subroutine are slightly different than
_mesa_has_ARB_shader_subroutine, but they're not different in a way
that matters. The only way to have ctx->Version >= 40 is if
ctx->Extensions.ARB_shader_subroutine is set.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Diffstat (limited to 'src/mesa/main/shaderapi.c')
| -rw-r--r-- | src/mesa/main/shaderapi.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index d969955..4ebc39f 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -2344,7 +2344,7 @@ _mesa_GetSubroutineUniformLocation(GLuint program, GLenum shadertype, GLenum resource_type; gl_shader_stage stage; - if (!_mesa_has_shader_subroutine(ctx)) { + if (!_mesa_has_ARB_shader_subroutine(ctx)) { _mesa_error(ctx, GL_INVALID_OPERATION, "%s", api_name); return -1; } @@ -2379,7 +2379,7 @@ _mesa_GetSubroutineIndex(GLuint program, GLenum shadertype, GLenum resource_type; gl_shader_stage stage; - if (!_mesa_has_shader_subroutine(ctx)) { + if (!_mesa_has_ARB_shader_subroutine(ctx)) { _mesa_error(ctx, GL_INVALID_OPERATION, "%s", api_name); return -1; } @@ -2423,7 +2423,7 @@ _mesa_GetActiveSubroutineUniformiv(GLuint program, GLenum shadertype, GLenum resource_type; int count, i, j; - if (!_mesa_has_shader_subroutine(ctx)) { + if (!_mesa_has_ARB_shader_subroutine(ctx)) { _mesa_error(ctx, GL_INVALID_OPERATION, "%s", api_name); return; } @@ -2509,7 +2509,7 @@ _mesa_GetActiveSubroutineUniformName(GLuint program, GLenum shadertype, GLenum resource_type; gl_shader_stage stage; - if (!_mesa_has_shader_subroutine(ctx)) { + if (!_mesa_has_ARB_shader_subroutine(ctx)) { _mesa_error(ctx, GL_INVALID_OPERATION, "%s", api_name); return; } @@ -2548,7 +2548,7 @@ _mesa_GetActiveSubroutineName(GLuint program, GLenum shadertype, GLenum resource_type; gl_shader_stage stage; - if (!_mesa_has_shader_subroutine(ctx)) { + if (!_mesa_has_ARB_shader_subroutine(ctx)) { _mesa_error(ctx, GL_INVALID_OPERATION, "%s", api_name); return; } @@ -2584,7 +2584,7 @@ _mesa_UniformSubroutinesuiv(GLenum shadertype, GLsizei count, gl_shader_stage stage; int i; - if (!_mesa_has_shader_subroutine(ctx)) { + if (!_mesa_has_ARB_shader_subroutine(ctx)) { _mesa_error(ctx, GL_INVALID_OPERATION, "%s", api_name); return; } @@ -2667,7 +2667,7 @@ _mesa_GetUniformSubroutineuiv(GLenum shadertype, GLint location, struct gl_linked_shader *sh; gl_shader_stage stage; - if (!_mesa_has_shader_subroutine(ctx)) { + if (!_mesa_has_ARB_shader_subroutine(ctx)) { _mesa_error(ctx, GL_INVALID_OPERATION, "%s", api_name); return; } @@ -2709,7 +2709,7 @@ _mesa_GetProgramStageiv(GLuint program, GLenum shadertype, struct gl_linked_shader *sh; gl_shader_stage stage; - if (!_mesa_has_shader_subroutine(ctx)) { + if (!_mesa_has_ARB_shader_subroutine(ctx)) { _mesa_error(ctx, GL_INVALID_OPERATION, "%s", api_name); return; } |