diff options
| author | Paul Berry <stereotype441@gmail.com> | 2013-12-17 09:46:08 -0800 |
|---|---|---|
| committer | Paul Berry <stereotype441@gmail.com> | 2013-12-30 11:21:21 -0800 |
| commit | d343e3d98c9ef639663efc371b1729dcc7788777 (patch) | |
| tree | e240a2f2795779aaae95c843a7ae35c75349e2fb /src/glsl/link_atomics.cpp | |
| parent | 89c35c59a4421db863ba70b28a546b294f7b1ba9 (diff) | |
| download | external_mesa3d-d343e3d98c9ef639663efc371b1729dcc7788777.zip external_mesa3d-d343e3d98c9ef639663efc371b1729dcc7788777.tar.gz external_mesa3d-d343e3d98c9ef639663efc371b1729dcc7788777.tar.bz2 | |
glsl: Get rid of hardcoded arrays of shader target names.
We already have a function for converting a shader type index to a
string: _mesa_shader_type_to_string().
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/glsl/link_atomics.cpp')
| -rw-r--r-- | src/glsl/link_atomics.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/glsl/link_atomics.cpp b/src/glsl/link_atomics.cpp index 33903ad..6b7682c 100644 --- a/src/glsl/link_atomics.cpp +++ b/src/glsl/link_atomics.cpp @@ -21,6 +21,7 @@ * DEALINGS IN THE SOFTWARE. */ +#include "glsl_parser_extras.h" #include "ir.h" #include "ir_uniform.h" #include "linker.h" @@ -214,9 +215,6 @@ link_check_atomic_counter_resources(struct gl_context *ctx, struct gl_shader_program *prog) { STATIC_ASSERT(MESA_SHADER_TYPES == 3); - static const char *shader_names[MESA_SHADER_TYPES] = { - "vertex", "geometry", "fragment" - }; const unsigned max_atomic_counters[MESA_SHADER_TYPES] = { ctx->Const.VertexProgram.MaxAtomicCounters, ctx->Const.GeometryProgram.MaxAtomicCounters, @@ -260,11 +258,11 @@ link_check_atomic_counter_resources(struct gl_context *ctx, for (unsigned i = 0; i < MESA_SHADER_TYPES; i++) { if (atomic_counters[i] > max_atomic_counters[i]) linker_error(prog, "Too many %s shader atomic counters", - shader_names[i]); + _mesa_shader_type_to_string(i)); if (atomic_buffers[i] > max_atomic_buffers[i]) linker_error(prog, "Too many %s shader atomic counter buffers", - shader_names[i]); + _mesa_shader_type_to_string(i)); } if (total_atomic_counters > ctx->Const.MaxCombinedAtomicCounters) |