From: Kenneth Graunke Date: Fri, 1 Jan 2016 00:28:08 +0000 (-0800) Subject: glsl: Don't abbreviate tessellation shader stage names. X-Git-Tag: android-x86-6.0-r1~4331 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4fc018576b577ed9ab3b713ba21727479a0e8b23;p=android-x86%2Fexternal-mesa.git glsl: Don't abbreviate tessellation shader stage names. I have a patch that writes shaders as .shader_test files, and it uses this function to create the headers (i.e. [vertex shader]). [tess ctrl shader] isn't a valid shader_runner header - it's spelled out as [tessellation control shader]. There's no real reason to abbreviate it, so spell it out. v2: Rebase on Rob's patches to move the code. Signed-off-by: Kenneth Graunke Reviewed-by: Iago Toral Quiroga --- diff --git a/src/glsl/nir/shader_enums.c b/src/glsl/nir/shader_enums.c index 16b20db3603..942d152b129 100644 --- a/src/glsl/nir/shader_enums.c +++ b/src/glsl/nir/shader_enums.c @@ -60,8 +60,8 @@ _mesa_shader_stage_to_string(unsigned stage) 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.");