From 230c71d9ee02f09255aed9fdeec941f548f36124 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 2 Jun 2011 20:56:23 -0600 Subject: [PATCH] mesa: add some minor fixes for geometry shaders --- src/mesa/main/shaderapi.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index cbfbac80296..b58e30de9c4 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -925,6 +925,8 @@ print_shader_info(const struct gl_shader_program *shProg) printf(" vert prog %u\n", shProg->VertexProgram->Base.Id); if (shProg->FragmentProgram) printf(" frag prog %u\n", shProg->FragmentProgram->Base.Id); + if (shProg->GeometryProgram) + printf(" geom prog %u\n", shProg->GeometryProgram->Base.Id); } @@ -1075,6 +1077,7 @@ validate_shader_program(const struct gl_shader_program *shProg, char *errMsg) { const struct gl_vertex_program *vp = shProg->VertexProgram; + const struct gl_geometry_program *gp = shProg->GeometryProgram; const struct gl_fragment_program *fp = shProg->FragmentProgram; if (!shProg->LinkStatus) { @@ -1104,6 +1107,9 @@ validate_shader_program(const struct gl_shader_program *shProg, if (vp && !validate_samplers(&vp->Base, errMsg)) { return GL_FALSE; } + if (gp && !validate_samplers(&gp->Base, errMsg)) { + return GL_FALSE; + } if (fp && !validate_samplers(&fp->Base, errMsg)) { return GL_FALSE; } -- 2.30.2