Commit f02a5f45 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Replace the "updateStateBlock" wined3d_device field with a "update_state" field.

parent 8f09d347
......@@ -1075,11 +1075,11 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock)
{
GLenum gl_primitive_type, prev;
if (device->isRecordingState)
device->updateStateBlock->changed.primitive_type = TRUE;
if (device->recording)
device->recording->changed.primitive_type = TRUE;
gl_primitive_type = stateblock->state.gl_primitive_type;
prev = device->updateStateBlock->state.gl_primitive_type;
device->updateStateBlock->state.gl_primitive_type = gl_primitive_type;
prev = device->update_state->gl_primitive_type;
device->update_state->gl_primitive_type = gl_primitive_type;
if (gl_primitive_type != prev && (gl_primitive_type == GL_POINTS || prev == GL_POINTS))
device_invalidate_state(device, STATE_POINT_SIZE_ENABLE);
}
......
......@@ -1816,7 +1816,6 @@ struct wined3d_device
UINT instance_count;
WORD vertexBlendUsed : 1; /* To avoid needless setting of the blend matrices */
WORD isRecordingState : 1;
WORD isInDraw : 1;
WORD bCursorVisible : 1;
WORD d3d_initialized : 1;
......@@ -1824,7 +1823,7 @@ struct wined3d_device
WORD softwareVertexProcessing : 1; /* process vertex shaders using software or hardware */
WORD useDrawStridedSlow : 1;
WORD filter_messages : 1;
WORD padding : 7;
WORD padding : 8;
BYTE fixed_function_usage_map; /* MAX_TEXTURES, 8 */
......@@ -1834,7 +1833,8 @@ struct wined3d_device
/* State block related */
struct wined3d_stateblock *stateBlock;
struct wined3d_stateblock *updateStateBlock;
struct wined3d_state *update_state;
struct wined3d_stateblock *recording;
/* Internal use fields */
struct wined3d_device_creation_parameters create_parms;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment