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

wined3d: Get rid of the SAVEDSTATES typedef.

This commit is contained in:
Henri Verbeet 2011-11-07 21:20:01 +01:00 committed by Alexandre Julliard
parent 1e1c442aca
commit 4c727ed0a1
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/wined3d/stateblock.c
View File

@ -241,7 +241,7 @@ static inline void stateblock_set_bits(DWORD *map, UINT map_size)
} }
/* Set all members of a stateblock savedstate to the given value */ /* Set all members of a stateblock savedstate to the given value */
static void stateblock_savedstates_set_all(SAVEDSTATES *states, DWORD vs_consts, DWORD ps_consts) static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, DWORD vs_consts, DWORD ps_consts)
{ {
unsigned int i; unsigned int i;
@ -274,7 +274,7 @@ static void stateblock_savedstates_set_all(SAVEDSTATES *states, DWORD vs_consts,
memset(states->vertexShaderConstantsF, TRUE, sizeof(BOOL) * vs_consts); memset(states->vertexShaderConstantsF, TRUE, sizeof(BOOL) * vs_consts);
} }
static void stateblock_savedstates_set_pixel(SAVEDSTATES *states, const DWORD num_constants) static void stateblock_savedstates_set_pixel(struct wined3d_saved_states *states, const DWORD num_constants)
{ {
DWORD texture_mask = 0; DWORD texture_mask = 0;
WORD sampler_mask = 0; WORD sampler_mask = 0;
@ -300,7 +300,7 @@ static void stateblock_savedstates_set_pixel(SAVEDSTATES *states, const DWORD nu
memset(states->pixelShaderConstantsF, TRUE, sizeof(BOOL) * num_constants); memset(states->pixelShaderConstantsF, TRUE, sizeof(BOOL) * num_constants);
} }
static void stateblock_savedstates_set_vertex(SAVEDSTATES *states, const DWORD num_constants) static void stateblock_savedstates_set_vertex(struct wined3d_saved_states *states, const DWORD num_constants)
{ {
DWORD texture_mask = 0; DWORD texture_mask = 0;
WORD sampler_mask = 0; WORD sampler_mask = 0;

10
dlls/wined3d/wined3d_private.h
View File

@ -2205,10 +2205,8 @@ struct wined3d_vertex_declaration
BOOL half_float_conv_needed; BOOL half_float_conv_needed;
}; };
/* Internal state Block for Begin/End/Capture/Create/Apply info */ struct wined3d_saved_states
/* Note: Very long winded but gl Lists are not flexible enough */ {
/* to resolve everything we need, so doing it manually for now */
typedef struct SAVEDSTATES {
DWORD transform[(HIGHEST_TRANSFORMSTATE >> 5) + 1]; DWORD transform[(HIGHEST_TRANSFORMSTATE >> 5) + 1];
WORD streamSource; /* MAX_STREAMS, 16 */ WORD streamSource; /* MAX_STREAMS, 16 */
WORD streamFreq; /* MAX_STREAMS, 16 */ WORD streamFreq; /* MAX_STREAMS, 16 */
@ -2232,7 +2230,7 @@ typedef struct SAVEDSTATES {
DWORD vertexShader : 1; DWORD vertexShader : 1;
DWORD scissorRect : 1; DWORD scissorRect : 1;
DWORD padding : 4; DWORD padding : 4;
} SAVEDSTATES; };
struct StageState { struct StageState {
DWORD stage; DWORD stage;
@ -2298,7 +2296,7 @@ struct wined3d_stateblock
WINED3DSTATEBLOCKTYPE blockType; WINED3DSTATEBLOCKTYPE blockType;
/* Array indicating whether things have been set or changed */ /* Array indicating whether things have been set or changed */
SAVEDSTATES changed; struct wined3d_saved_states changed;
struct wined3d_state state; struct wined3d_state state;
/* Contained state management */ /* Contained state management */