Mesa (master): mesa: move GLbitfield any_valid_stages declaration before code

Brian Paul brianp at kemper.freedesktop.org
Tue Mar 25 19:33:12 UTC 2014


Module: Mesa
Branch: master
Commit: 64278b36d6252888e6a62ef25979557c6784fbd2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=64278b36d6252888e6a62ef25979557c6784fbd2

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Mar 25 13:32:59 2014 -0600

mesa: move GLbitfield any_valid_stages declaration before code

To fix MSVC build.

---

 src/mesa/main/pipelineobj.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c
index 49fb641..f55251e 100644
--- a/src/mesa/main/pipelineobj.c
+++ b/src/mesa/main/pipelineobj.c
@@ -227,6 +227,7 @@ _mesa_UseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program)
 
    struct gl_pipeline_object *pipe = lookup_pipeline_object(ctx, pipeline);
    struct gl_shader_program *shProg = NULL;
+   GLbitfield any_valid_stages;
 
    if (!pipe) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glUseProgramStages(pipeline)");
@@ -247,7 +248,7 @@ _mesa_UseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program)
     * GL_TESS_CONTROL_SHADER_BIT
     * GL_TESS_EVALUATION_SHADER_BIT
     */
-   GLbitfield any_valid_stages = GL_VERTEX_SHADER_BIT | GL_FRAGMENT_SHADER_BIT;
+   any_valid_stages = GL_VERTEX_SHADER_BIT | GL_FRAGMENT_SHADER_BIT;
    if (_mesa_has_geometry_shaders(ctx))
       any_valid_stages |= GL_GEOMETRY_SHADER_BIT;
 




More information about the mesa-commit mailing list