Józef Kucia : wined3d: Simplify shader_calculate_clip_or_cull_distance_mask().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 87f823ad9196a8f26d1ac4272630e73aaae5cd17
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=87f823ad9196a8f26d1ac4272...

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Thu Feb  8 15:22:47 2018 +0100

wined3d: Simplify shader_calculate_clip_or_cull_distance_mask().

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/wined3d/shader.c | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index c775df0..424025c 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -958,27 +958,19 @@ static HRESULT shader_record_shader_phase(struct wined3d_shader *shader,
 }
 
 static HRESULT shader_calculate_clip_or_cull_distance_mask(
-        const struct wined3d_shader_signature_element *e, DWORD *mask)
+        const struct wined3d_shader_signature_element *e, unsigned int *mask)
 {
-    unsigned int i;
-
-    *mask = 0;
-
-    /* Cull and clip distances are packed in 4 component registers. 0 and 1 are
+    /* Clip and cull distances are packed in 4 component registers. 0 and 1 are
      * the only allowed semantic indices.
      */
     if (e->semantic_idx >= MAX_CLIP_DISTANCES / 4)
     {
+        *mask = 0;
         WARN("Invalid clip/cull distance index %u.\n", e->semantic_idx);
         return WINED3DERR_INVALIDCALL;
     }
 
-    for (i = 0; i < 4; ++i)
-    {
-        if (e->mask & (WINED3DSP_WRITEMASK_0 << i))
-            *mask |= 1u << (4 * e->semantic_idx + i);
-    }
-
+    *mask = (e->mask & WINED3DSP_WRITEMASK_ALL) << (4 * e->semantic_idx);
     return WINED3D_OK;
 }
 
@@ -1786,7 +1778,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st
         for (i = 0; i < output_signature->element_count; ++i)
         {
             const struct wined3d_shader_signature_element *e = &output_signature->elements[i];
-            DWORD mask;
+            unsigned int mask;
 
             reg_maps->output_registers |= 1u << e->register_idx;
             if (e->sysval_semantic == WINED3D_SV_CLIP_DISTANCE)