Commit e2f4aaa6 authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard

wined3d: Improve wined3d_sysval_semantic enum values naming.

parent 17c07a94
...@@ -1898,7 +1898,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont ...@@ -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) for (i = 0; i < shader->input_signature.element_count; ++i)
{ {
const struct wined3d_shader_signature_element *e = &shader->input_signature.elements[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", shader_addline(buffer, "vec4 %s_in%u = vec4(intBitsToFloat(gl_InstanceID), 0.0, 0.0, 0.0);\n",
prefix, e->register_idx); prefix, e->register_idx);
else else
......
...@@ -223,10 +223,10 @@ static const struct ...@@ -223,10 +223,10 @@ static const struct
sysval_semantic_names[] = sysval_semantic_names[] =
{ {
{WINED3D_SV_POSITION, "SV_Position"}, {WINED3D_SV_POSITION, "SV_Position"},
{WINED3D_SV_INSTANCEID, "SV_InstanceID"}, {WINED3D_SV_INSTANCE_ID, "SV_InstanceID"},
{WINED3D_SV_PRIMITIVEID, "SV_PrimitiveID"}, {WINED3D_SV_PRIMITIVE_ID, "SV_PrimitiveID"},
{WINED3D_SV_ISFRONTFACE, "SV_IsFrontFace"}, {WINED3D_SV_IS_FRONT_FACE, "SV_IsFrontFace"},
{WINED3D_SV_SAMPLEINDEX, "SV_SampleIndex"}, {WINED3D_SV_SAMPLE_INDEX, "SV_SampleIndex"},
{WINED3D_SV_QUAD_U0_TESS_FACTOR, "finalQuadUeq0EdgeTessFactor"}, {WINED3D_SV_QUAD_U0_TESS_FACTOR, "finalQuadUeq0EdgeTessFactor"},
{WINED3D_SV_QUAD_V0_TESS_FACTOR, "finalQuadVeq0EdgeTessFactor"}, {WINED3D_SV_QUAD_V0_TESS_FACTOR, "finalQuadVeq0EdgeTessFactor"},
{WINED3D_SV_QUAD_U1_TESS_FACTOR, "finalQuadUeq1EdgeTessFactor"}, {WINED3D_SV_QUAD_U1_TESS_FACTOR, "finalQuadUeq1EdgeTessFactor"},
......
...@@ -747,23 +747,23 @@ enum wined3d_decl_usage ...@@ -747,23 +747,23 @@ enum wined3d_decl_usage
enum wined3d_sysval_semantic enum wined3d_sysval_semantic
{ {
WINED3D_SV_POSITION = 1, WINED3D_SV_POSITION = 1,
WINED3D_SV_PRIMITIVEID = 7, WINED3D_SV_PRIMITIVE_ID = 7,
WINED3D_SV_INSTANCEID = 8, WINED3D_SV_INSTANCE_ID = 8,
WINED3D_SV_ISFRONTFACE = 9, WINED3D_SV_IS_FRONT_FACE = 9,
WINED3D_SV_SAMPLEINDEX = 10, WINED3D_SV_SAMPLE_INDEX = 10,
WINED3D_SV_QUAD_U0_TESS_FACTOR = 11, WINED3D_SV_QUAD_U0_TESS_FACTOR = 11,
WINED3D_SV_QUAD_V0_TESS_FACTOR = 12, WINED3D_SV_QUAD_V0_TESS_FACTOR = 12,
WINED3D_SV_QUAD_U1_TESS_FACTOR = 13, WINED3D_SV_QUAD_U1_TESS_FACTOR = 13,
WINED3D_SV_QUAD_V1_TESS_FACTOR = 14, WINED3D_SV_QUAD_V1_TESS_FACTOR = 14,
WINED3D_SV_QUAD_U_INNER_TESS_FACTOR = 15, WINED3D_SV_QUAD_U_INNER_TESS_FACTOR = 15,
WINED3D_SV_QUAD_V_INNER_TESS_FACTOR = 16, WINED3D_SV_QUAD_V_INNER_TESS_FACTOR = 16,
WINED3D_SV_TRIANGLE_U_TESS_FACTOR = 17, WINED3D_SV_TRIANGLE_U_TESS_FACTOR = 17,
WINED3D_SV_TRIANGLE_V_TESS_FACTOR = 18, WINED3D_SV_TRIANGLE_V_TESS_FACTOR = 18,
WINED3D_SV_TRIANGLE_W_TESS_FACTOR = 19, WINED3D_SV_TRIANGLE_W_TESS_FACTOR = 19,
WINED3D_SV_TRIANGLE_INNER_TESS_FACTOR = 20, WINED3D_SV_TRIANGLE_INNER_TESS_FACTOR = 20,
WINED3D_SV_LINE_DETAIL_TESS_FACTOR = 21, WINED3D_SV_LINE_DETAIL_TESS_FACTOR = 21,
WINED3D_SV_LINE_DENSITY_TESS_FACTOR = 22, WINED3D_SV_LINE_DENSITY_TESS_FACTOR = 22,
}; };
enum wined3d_scanline_ordering enum wined3d_scanline_ordering
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment