Mesa (master): mesa: rename has_core_gs -> has_gs in get_programiv
Marek Olšák
mareko at kemper.freedesktop.org
Fri Feb 23 19:50:35 UTC 2018
Module: Mesa
Branch: master
Commit: d169438d8ea8cd3a29d739eb284648a7723961cb
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d169438d8ea8cd3a29d739eb284648a7723961cb
Author: Marek Olšák <marek.olsak at amd.com>
Date: Wed Feb 14 23:21:14 2018 +0100
mesa: rename has_core_gs -> has_gs in get_programiv
This is also true for GLES.
Tested-by: Dieter Nützel <Dieter at nuetzel-hh.de>
Reviewed-by: Brian Paul <brianp at vmware.com>
---
src/mesa/main/shaderapi.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index d8a3031a38..59089a12b0 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -668,7 +668,7 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname,
/* True if geometry shaders (of the form that was adopted into GLSL 1.50
* and GL 3.2) are available in this context
*/
- const bool has_core_gs = _mesa_has_geometry_shaders(ctx);
+ const bool has_gs = _mesa_has_geometry_shaders(ctx);
const bool has_tess = _mesa_has_tessellation(ctx);
/* Are uniform buffer objects available in this context?
@@ -769,7 +769,7 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname,
*params = shProg->TransformFeedback.BufferMode;
return;
case GL_GEOMETRY_VERTICES_OUT:
- if (!has_core_gs)
+ if (!has_gs)
break;
if (check_gs_query(ctx, shProg)) {
*params = shProg->_LinkedShaders[MESA_SHADER_GEOMETRY]->
@@ -777,7 +777,7 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname,
}
return;
case GL_GEOMETRY_SHADER_INVOCATIONS:
- if (!has_core_gs || !ctx->Extensions.ARB_gpu_shader5)
+ if (!has_gs || !ctx->Extensions.ARB_gpu_shader5)
break;
if (check_gs_query(ctx, shProg)) {
*params = shProg->_LinkedShaders[MESA_SHADER_GEOMETRY]->
@@ -785,7 +785,7 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname,
}
return;
case GL_GEOMETRY_INPUT_TYPE:
- if (!has_core_gs)
+ if (!has_gs)
break;
if (check_gs_query(ctx, shProg)) {
*params = shProg->_LinkedShaders[MESA_SHADER_GEOMETRY]->
@@ -793,7 +793,7 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname,
}
return;
case GL_GEOMETRY_OUTPUT_TYPE:
- if (!has_core_gs)
+ if (!has_gs)
break;
if (check_gs_query(ctx, shProg)) {
*params = shProg->_LinkedShaders[MESA_SHADER_GEOMETRY]->
More information about the mesa-commit
mailing list