ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Get rid of the mostly unused blockType field in struct wined3d_stateblock.

This commit is contained in:
Henri Verbeet 2012-01-18 21:46:18 +01:00 committed by Alexandre Julliard
parent ddeff9815c
commit e1cd2453b9
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/wined3d/stateblock.c
View File

@ -924,8 +924,7 @@ HRESULT CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblo
unsigned int i; unsigned int i;
DWORD map; DWORD map;
TRACE("Applying stateblock %p of type %#x to device %p.\n", TRACE("Applying stateblock %p to device %p.\n", stateblock, device);
stateblock, stateblock->blockType, device);
if (stateblock->changed.vertexShader) if (stateblock->changed.vertexShader)
wined3d_device_set_vertex_shader(device, stateblock->state.vertex_shader); wined3d_device_set_vertex_shader(device, stateblock->state.vertex_shader);
@ -1105,8 +1104,6 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock)
TRACE("stateblock %p.\n", stateblock); TRACE("stateblock %p.\n", stateblock);
stateblock->blockType = WINED3D_SBT_INIT;
memset(stateblock->changed.pixelShaderConstantsF, 0, device->d3d_pshader_constantF * sizeof(BOOL)); memset(stateblock->changed.pixelShaderConstantsF, 0, device->d3d_pshader_constantF * sizeof(BOOL));
memset(stateblock->changed.vertexShaderConstantsF, 0, device->d3d_vshader_constantF * sizeof(BOOL)); memset(stateblock->changed.vertexShaderConstantsF, 0, device->d3d_vshader_constantF * sizeof(BOOL));
@ -1344,7 +1341,6 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock,
stateblock->ref = 1; stateblock->ref = 1;
stateblock->device = device; stateblock->device = device;
stateblock->blockType = type;
for (i = 0; i < LIGHTMAP_SIZE; i++) for (i = 0; i < LIGHTMAP_SIZE; i++)
{ {

1
dlls/wined3d/wined3d_private.h
View File

@ -2310,7 +2310,6 @@ struct wined3d_stateblock
{ {
LONG ref; /* Note: Ref counting not required */ LONG ref; /* Note: Ref counting not required */
struct wined3d_device *device; struct wined3d_device *device;
enum wined3d_stateblock_type blockType;
/* Array indicating whether things have been set or changed */ /* Array indicating whether things have been set or changed */
struct wined3d_saved_states changed; struct wined3d_saved_states changed;