diff options
| author | Jason Ekstrand <[email protected]> | 2016-01-25 15:50:31 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-01-25 15:50:31 -0800 |
| commit | e462d4d81529ecf438cb75f8a74f5662adfd69ce (patch) | |
| tree | ee186cac161c3e54826d1ffa0fba7d848d3d2822 /src/glsl/nir/shader_enums.c | |
| parent | 6bbf3814dc937371c2918ea56b18d4c32000b951 (diff) | |
| parent | 874ede498334c9ec39383be9b24c2c368dcb349e (diff) | |
Merge remote-tracking branch 'mattst88/nir-lower-pack-unpack' into vulkan
Diffstat (limited to 'src/glsl/nir/shader_enums.c')
| -rw-r--r-- | src/glsl/nir/shader_enums.c | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/src/glsl/nir/shader_enums.c b/src/glsl/nir/shader_enums.c index 1410a504484..41da4a7b9ea 100644 --- a/src/glsl/nir/shader_enums.c +++ b/src/glsl/nir/shader_enums.c @@ -33,7 +33,8 @@ #define ENUM(x) [x] = #x #define NAME(val) ((((val) < ARRAY_SIZE(names)) && names[(val)]) ? names[(val)] : "UNKNOWN") -const char * gl_shader_stage_name(gl_shader_stage stage) +const char * +gl_shader_stage_name(gl_shader_stage stage) { static const char *names[] = { ENUM(MESA_SHADER_VERTEX), @@ -51,15 +52,16 @@ const char * gl_shader_stage_name(gl_shader_stage stage) * Translate a gl_shader_stage to a short shader stage name for debug * printouts and error messages. */ -const char * _mesa_shader_stage_to_string(unsigned stage) +const char * +_mesa_shader_stage_to_string(unsigned stage) { switch (stage) { case MESA_SHADER_VERTEX: return "vertex"; case MESA_SHADER_FRAGMENT: return "fragment"; case MESA_SHADER_GEOMETRY: return "geometry"; case MESA_SHADER_COMPUTE: return "compute"; - case MESA_SHADER_TESS_CTRL: return "tess ctrl"; - case MESA_SHADER_TESS_EVAL: return "tess eval"; + case MESA_SHADER_TESS_CTRL: return "tessellation control"; + case MESA_SHADER_TESS_EVAL: return "tessellation evaluation"; } unreachable("Unknown shader stage."); @@ -69,7 +71,8 @@ const char * _mesa_shader_stage_to_string(unsigned stage) * Translate a gl_shader_stage to a shader stage abbreviation (VS, GS, FS) * for debug printouts and error messages. */ -const char * _mesa_shader_stage_to_abbrev(unsigned stage) +const char * +_mesa_shader_stage_to_abbrev(unsigned stage) { switch (stage) { case MESA_SHADER_VERTEX: return "VS"; @@ -83,7 +86,8 @@ const char * _mesa_shader_stage_to_abbrev(unsigned stage) unreachable("Unknown shader stage."); } -const char * gl_vert_attrib_name(gl_vert_attrib attrib) +const char * +gl_vert_attrib_name(gl_vert_attrib attrib) { static const char *names[] = { ENUM(VERT_ATTRIB_POS), @@ -124,7 +128,8 @@ const char * gl_vert_attrib_name(gl_vert_attrib attrib) return NAME(attrib); } -const char * gl_varying_slot_name(gl_varying_slot slot) +const char * +gl_varying_slot_name(gl_varying_slot slot) { static const char *names[] = { ENUM(VARYING_SLOT_POS), @@ -190,7 +195,8 @@ const char * gl_varying_slot_name(gl_varying_slot slot) return NAME(slot); } -const char * gl_system_value_name(gl_system_value sysval) +const char * +gl_system_value_name(gl_system_value sysval) { static const char *names[] = { ENUM(SYSTEM_VALUE_VERTEX_ID), @@ -218,7 +224,8 @@ const char * gl_system_value_name(gl_system_value sysval) return NAME(sysval); } -const char * glsl_interp_qualifier_name(enum glsl_interp_qualifier qual) +const char * +glsl_interp_qualifier_name(enum glsl_interp_qualifier qual) { static const char *names[] = { ENUM(INTERP_QUALIFIER_NONE), @@ -230,7 +237,8 @@ const char * glsl_interp_qualifier_name(enum glsl_interp_qualifier qual) return NAME(qual); } -const char * gl_frag_result_name(gl_frag_result result) +const char * +gl_frag_result_name(gl_frag_result result) { static const char *names[] = { ENUM(FRAG_RESULT_DEPTH), |