Henri Verbeet : wined3d: Set the initial primitive type to WINED3D_PT_UNDEFINED.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2f67b139189096e02ab73608b4418269089f771b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2f67b139189096e02ab73608b4...

Author: Henri Verbeet 
Date:   Thu Sep 18 10:56:27 2014 +0200

wined3d: Set the initial primitive type to WINED3D_PT_UNDEFINED.

---

dlls/wined3d/device.c     | 4 +++-
 dlls/wined3d/stateblock.c | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index cbdf509..44fa206 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -90,7 +90,8 @@ GLenum gl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type)

default:
             FIXME("Unhandled primitive type %s\n", debug_d3dprimitivetype(primitive_type));
-            return GL_NONE;
+        case WINED3D_PT_UNDEFINED:
+            return ~0u;
     }
 }

@@ -130,6 +131,7 @@ static enum wined3d_primitive_type d3d_primitive_type_from_gl(GLenum primitive_t

default:
             FIXME("Unhandled primitive type %s\n", debug_d3dprimitivetype(primitive_type));
+        case ~0u:
             return WINED3D_PT_UNDEFINED;
     }
 }
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index e98ee2a..7e8c782 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -1121,6 +1121,8 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d

TRACE("state %p, gl_info %p.\n", state, gl_info);

+    state->gl_primitive_type = ~0u;
+
     /* Set some of the defaults for lights, transforms etc */
     state->transforms[WINED3D_TS_PROJECTION] = identity;
     state->transforms[WINED3D_TS_VIEW] = identity;