From: Henri Verbeet Subject: [PATCH 3/5] wined3d: Set the initial primitive type to WINED3D_PT_UNDEFINED. Message-Id: <1411030589-11210-3-git-send-email-hverbeet@codeweavers.com> Date: Thu, 18 Sep 2014 10:56:27 +0200 --- 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; -- 1.7.10.4