Mesa (master): mesa: add some minor fixes for geometry shaders
Brian Paul
brianp at kemper.freedesktop.org
Fri Jun 3 04:07:13 UTC 2011
Module: Mesa
Branch: master
Commit: 230c71d9ee02f09255aed9fdeec941f548f36124
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=230c71d9ee02f09255aed9fdeec941f548f36124
Author: Brian Paul <brianp at vmware.com>
Date: Thu Jun 2 20:56:23 2011 -0600
mesa: add some minor fixes for geometry shaders
---
src/mesa/main/shaderapi.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index cbfbac8..b58e30d 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;
}
More information about the mesa-commit
mailing list