Module: wine Branch: master Commit: e2f4aaa65abc44b173d865fa12fb032b6fe7a246 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f4aaa65abc44b173d865fa12...
Author: Józef Kucia jkucia@codeweavers.com Date: Thu Mar 31 10:54:39 2016 +0200
wined3d: Improve wined3d_sysval_semantic enum values naming.
Signed-off-by: Józef Kucia jkucia@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 8 ++++---- include/wine/wined3d.h | 34 +++++++++++++++++----------------- 3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5af7ae8..6bb0a2a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1898,7 +1898,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont for (i = 0; i < shader->input_signature.element_count; ++i) { const struct wined3d_shader_signature_element *e = &shader->input_signature.elements[i]; - if (e->sysval_semantic == WINED3D_SV_INSTANCEID) + if (e->sysval_semantic == WINED3D_SV_INSTANCE_ID) shader_addline(buffer, "vec4 %s_in%u = vec4(intBitsToFloat(gl_InstanceID), 0.0, 0.0, 0.0);\n", prefix, e->register_idx); else diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b64b726..6347fa0 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -223,10 +223,10 @@ static const struct sysval_semantic_names[] = { {WINED3D_SV_POSITION, "SV_Position"}, - {WINED3D_SV_INSTANCEID, "SV_InstanceID"}, - {WINED3D_SV_PRIMITIVEID, "SV_PrimitiveID"}, - {WINED3D_SV_ISFRONTFACE, "SV_IsFrontFace"}, - {WINED3D_SV_SAMPLEINDEX, "SV_SampleIndex"}, + {WINED3D_SV_INSTANCE_ID, "SV_InstanceID"}, + {WINED3D_SV_PRIMITIVE_ID, "SV_PrimitiveID"}, + {WINED3D_SV_IS_FRONT_FACE, "SV_IsFrontFace"}, + {WINED3D_SV_SAMPLE_INDEX, "SV_SampleIndex"}, {WINED3D_SV_QUAD_U0_TESS_FACTOR, "finalQuadUeq0EdgeTessFactor"}, {WINED3D_SV_QUAD_V0_TESS_FACTOR, "finalQuadVeq0EdgeTessFactor"}, {WINED3D_SV_QUAD_U1_TESS_FACTOR, "finalQuadUeq1EdgeTessFactor"}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7fbfe9d..9bdd16d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -747,23 +747,23 @@ enum wined3d_decl_usage
enum wined3d_sysval_semantic { - WINED3D_SV_POSITION = 1, - WINED3D_SV_PRIMITIVEID = 7, - WINED3D_SV_INSTANCEID = 8, - WINED3D_SV_ISFRONTFACE = 9, - WINED3D_SV_SAMPLEINDEX = 10, - WINED3D_SV_QUAD_U0_TESS_FACTOR = 11, - WINED3D_SV_QUAD_V0_TESS_FACTOR = 12, - WINED3D_SV_QUAD_U1_TESS_FACTOR = 13, - WINED3D_SV_QUAD_V1_TESS_FACTOR = 14, - WINED3D_SV_QUAD_U_INNER_TESS_FACTOR = 15, - WINED3D_SV_QUAD_V_INNER_TESS_FACTOR = 16, - WINED3D_SV_TRIANGLE_U_TESS_FACTOR = 17, - WINED3D_SV_TRIANGLE_V_TESS_FACTOR = 18, - WINED3D_SV_TRIANGLE_W_TESS_FACTOR = 19, - WINED3D_SV_TRIANGLE_INNER_TESS_FACTOR = 20, - WINED3D_SV_LINE_DETAIL_TESS_FACTOR = 21, - WINED3D_SV_LINE_DENSITY_TESS_FACTOR = 22, + WINED3D_SV_POSITION = 1, + WINED3D_SV_PRIMITIVE_ID = 7, + WINED3D_SV_INSTANCE_ID = 8, + WINED3D_SV_IS_FRONT_FACE = 9, + WINED3D_SV_SAMPLE_INDEX = 10, + WINED3D_SV_QUAD_U0_TESS_FACTOR = 11, + WINED3D_SV_QUAD_V0_TESS_FACTOR = 12, + WINED3D_SV_QUAD_U1_TESS_FACTOR = 13, + WINED3D_SV_QUAD_V1_TESS_FACTOR = 14, + WINED3D_SV_QUAD_U_INNER_TESS_FACTOR = 15, + WINED3D_SV_QUAD_V_INNER_TESS_FACTOR = 16, + WINED3D_SV_TRIANGLE_U_TESS_FACTOR = 17, + WINED3D_SV_TRIANGLE_V_TESS_FACTOR = 18, + WINED3D_SV_TRIANGLE_W_TESS_FACTOR = 19, + WINED3D_SV_TRIANGLE_INNER_TESS_FACTOR = 20, + WINED3D_SV_LINE_DETAIL_TESS_FACTOR = 21, + WINED3D_SV_LINE_DENSITY_TESS_FACTOR = 22, };
enum wined3d_scanline_ordering