[PATCH 3/4] wined3d: Remove the redundant per_vertex_point_size from vs_compile_args.

[Elizabeth Figura]

From: Elizabeth Figura

---
 dlls/wined3d/glsl_shader.c     | 6 ++----
 dlls/wined3d/shader.c          | 1 -
 dlls/wined3d/wined3d_private.h | 3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index d5696c7d390..d7fbb2ccaae 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -8151,7 +8151,7 @@ static void shader_glsl_generate_vs_epilogue(const struct wined3d_gl_info *gl_in
                 shader_addline(buffer, "gl_ClipDistance[%u] = dot(gl_Position, clip_planes[%u]);\n", i, i);
     }

-    if (args->point_size && !args->per_vertex_point_size)
+    if (args->point_size && !shader->reg_maps.point_size)
     {
         if (reg_maps->shader_version.major >= 4)
             shader_addline(buffer, "gl_PointSize = 1.0;\n");
@@ -8200,7 +8200,7 @@ static GLuint shader_glsl_generate_vertex_shader(const struct wined3d_context_gl
     for (i = 0; i < shader->input_signature.element_count; ++i)
         shader_glsl_declare_generic_vertex_attribute(buffer, gl_info, &shader->input_signature.elements[i]);

-    if (args->point_size && !args->per_vertex_point_size && reg_maps->shader_version.major < 4)
+    if (args->point_size && !shader->reg_maps.point_size && reg_maps->shader_version.major < 4)
     {
         shader_addline(buffer, "uniform struct\n{\n");
         shader_addline(buffer, "    float size;\n");
@@ -8753,8 +8753,6 @@ static BOOL vs_args_equal(const struct vs_compile_args *stored, const struct vs_
         return FALSE;
     if (stored->point_size != new->point_size)
         return FALSE;
-    if (stored->per_vertex_point_size != new->per_vertex_point_size)
-        return FALSE;
     if (stored->flatshading != new->flatshading)
         return FALSE;
     if (stored->next_shader_type != new->next_shader_type)
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index c40dc69e8ec..4ac9979dbd4 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -2731,7 +2731,6 @@ void find_vs_compile_args(const struct wined3d_state *state, const struct wined3
     args->clip_enabled = state->render_states[WINED3D_RS_CLIPPING]
             && state->render_states[WINED3D_RS_CLIPPLANEENABLE];
     args->point_size = state->primitive_type == WINED3D_PT_POINTLIST;
-    args->per_vertex_point_size = shader->reg_maps.point_size;
     args->next_shader_type = hull_shader ? WINED3D_SHADER_TYPE_HULL
             : geometry_shader ? WINED3D_SHADER_TYPE_GEOMETRY : WINED3D_SHADER_TYPE_PIXEL;
     if (shader->reg_maps.shader_version.major >= 4)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index beff7c216c4..7f482ebc203 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1504,10 +1504,9 @@ struct vs_compile_args
     BYTE fog_src;
     BYTE clip_enabled : 1;
     BYTE point_size : 1;
-    BYTE per_vertex_point_size : 1;
     BYTE flatshading : 1;
     BYTE next_shader_type : 3;
-    BYTE padding : 1;
+    BYTE padding : 2;
 };

struct ds_compile_args