diff options
author | Paul Berry <[email protected]> | 2014-01-06 20:06:05 -0800 |
---|---|---|
committer | Paul Berry <[email protected]> | 2014-02-05 09:00:34 -0800 |
commit | c61ec8d8e34e9bf30b3c4c84afa08f0a5b66b932 (patch) | |
tree | f660a11f655b3f456e40e0374c7048f105718197 /src/mesa/program | |
parent | 28e526d5580739e8b4098cd08c644b9157fdc94c (diff) |
mesa/cs: Add a MESA_SHADER_COMPUTE stage and update switch statements.
This patch adds MESA_SHADER_COMPUTE to the gl_shader_stage enum.
Also, where it is trivial to do so, it adds a compute shader case to
switch statements that switch based on the type of shader. This
avoids "unhandled switch case" compiler warnings.
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/mesa/program')
-rw-r--r-- | src/mesa/program/prog_print.c | 3 | ||||
-rw-r--r-- | src/mesa/program/program.h | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/mesa/program/prog_print.c b/src/mesa/program/prog_print.c index 02ba01eca7b..4a5c1c1fb11 100644 --- a/src/mesa/program/prog_print.c +++ b/src/mesa/program/prog_print.c @@ -1021,6 +1021,9 @@ _mesa_write_shader_to_file(const struct gl_shader *shader) case MESA_SHADER_GEOMETRY: type = "geom"; break; + case MESA_SHADER_COMPUTE: + type = "comp"; + break; } _mesa_snprintf(filename, sizeof(filename), "shader_%u.%s", shader->Name, type); diff --git a/src/mesa/program/program.h b/src/mesa/program/program.h index 71b0a4af26d..4351e05331a 100644 --- a/src/mesa/program/program.h +++ b/src/mesa/program/program.h @@ -202,6 +202,8 @@ _mesa_program_enum_to_shader_stage(GLenum v) return MESA_SHADER_FRAGMENT; case GL_GEOMETRY_PROGRAM_NV: return MESA_SHADER_GEOMETRY; + case GL_COMPUTE_PROGRAM_NV: + return MESA_SHADER_COMPUTE; default: ASSERT(0); return ~0; @@ -219,6 +221,8 @@ _mesa_shader_stage_to_program(unsigned stage) return GL_FRAGMENT_PROGRAM_ARB; case MESA_SHADER_GEOMETRY: return GL_GEOMETRY_PROGRAM_NV; + case MESA_SHADER_COMPUTE: + return GL_COMPUTE_PROGRAM_NV; } assert(!"Unexpected shader stage in _mesa_shader_stage_to_program"); |