Mesa (master): linker: Allow geometry shader without vertex shader for separable programs
Ian Romanick
idr at kemper.freedesktop.org
Fri May 2 14:31:43 UTC 2014
Module: Mesa
Branch: master
Commit: c557eb77225433fa9415a94fc9db3ce36374df64
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c557eb77225433fa9415a94fc9db3ce36374df64
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Thu Jan 23 18:26:29 2014 -0800
linker: Allow geometry shader without vertex shader for separable programs
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
---
src/glsl/linker.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index de7e3cd..fbc0358 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -2300,7 +2300,8 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog)
/* Geometry shaders have to be linked with vertex shaders.
*/
if (num_shaders[MESA_SHADER_GEOMETRY] > 0 &&
- num_shaders[MESA_SHADER_VERTEX] == 0) {
+ num_shaders[MESA_SHADER_VERTEX] == 0 &&
+ !prog->SeparateShader) {
linker_error(prog, "Geometry shader must be linked with "
"vertex shader\n");
goto done;
More information about the mesa-commit
mailing list