[PATCH v3 2/9] wined3d: Handle all invalid values in compute_texture_matrix().

[Elizabeth Figura]

From: Elizabeth Figura

Use an identity matrix for any count other than 2, 3, or 4.
---
 dlls/wined3d/utils.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 075fe4977ca..dadd1683fc6 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -5682,20 +5682,15 @@ void get_modelview_matrix(const struct wined3d_stateblock_state *state, unsigned
 static void compute_texture_matrix(const struct wined3d_matrix *matrix, uint32_t flags, BOOL calculated_coords,
         enum wined3d_format_id format_id, struct wined3d_matrix *out_matrix)
 {
+    unsigned int count = (flags & ~WINED3D_TTFF_PROJECTED);
     struct wined3d_matrix mat;

-    if (flags == WINED3D_TTFF_DISABLE || flags == WINED3D_TTFF_COUNT1)
+    if (count < 2 || count > 4)
     {
         get_identity_matrix(out_matrix);
         return;
     }

-    if (flags == (WINED3D_TTFF_COUNT1 | WINED3D_TTFF_PROJECTED))
-    {
-        ERR("Invalid texture transform flags: WINED3D_TTFF_COUNT1 | WINED3D_TTFF_PROJECTED.\n");
-        return;
-    }
-
     mat = *matrix;

/* When less than 4 components are provided for an attribute, the remaining