Module: Mesa Branch: master Commit: 1fe274b3d7a8e70dc605e6076d29e00add292508 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1fe274b3d7a8e70dc605e6076d29e00add292508
Author: Paul Berry <stereotype...@gmail.com> Date: Wed Jan 8 11:40:23 2014 -0800 glsl/cs: Prohibit mixing of compute and non-compute shaders. Fixes piglit test: spec/ARB_compute_shader/linker/mix_compute_and_non_compute Reviewed-by: Jordan Justen <jordan.l.jus...@intel.com> --- src/glsl/linker.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index 6a07e4a..bcd7394 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -2109,6 +2109,13 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog) goto done; } + /* Compute shaders have additional restrictions. */ + if (num_shaders[MESA_SHADER_COMPUTE] > 0 && + num_shaders[MESA_SHADER_COMPUTE] != prog->NumShaders) { + linker_error(prog, "Compute shaders may not be linked with any other " + "type of shader\n"); + } + for (unsigned int i = 0; i < MESA_SHADER_STAGES; i++) { if (prog->_LinkedShaders[i] != NULL) ctx->Driver.DeleteShader(ctx, prog->_LinkedShaders[i]); _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit