From 3920d42f71e60227e0e5b4adc69ef7d98a93d7a8 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Tue, 30 Dec 2008 14:56:49 +0100 Subject: [PATCH] wined3d: Convert some BOOLs to bitfields in struct SAVEDSTATES. --- dlls/wined3d/wined3d_private.h | 43 +++++++++++++++++----------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ab2c68f93be..82931ead982 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1760,27 +1760,28 @@ extern const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl; /* 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 { - BOOL indices; - BOOL material; - BOOL streamSource[MAX_STREAMS]; - BOOL streamFreq[MAX_STREAMS]; - BOOL textures[MAX_COMBINED_SAMPLERS]; - BOOL transform[HIGHEST_TRANSFORMSTATE + 1]; - BOOL viewport; - BOOL renderState[WINEHIGHEST_RENDER_STATE + 1]; - BOOL textureState[MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; - BOOL samplerState[MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; - BOOL clipplane[MAX_CLIPPLANES]; - BOOL vertexDecl; - BOOL pixelShader; - WORD pixelShaderConstantsB; - WORD pixelShaderConstantsI; - BOOL *pixelShaderConstantsF; - BOOL vertexShader; - WORD vertexShaderConstantsB; - WORD vertexShaderConstantsI; - BOOL *vertexShaderConstantsF; - BOOL scissorRect; + BOOL streamSource[MAX_STREAMS]; + BOOL streamFreq[MAX_STREAMS]; + BOOL textures[MAX_COMBINED_SAMPLERS]; + BOOL transform[HIGHEST_TRANSFORMSTATE + 1]; + BOOL renderState[WINEHIGHEST_RENDER_STATE + 1]; + BOOL textureState[MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; + BOOL samplerState[MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; + BOOL clipplane[MAX_CLIPPLANES]; + WORD pixelShaderConstantsB; /* MAX_CONST_B, 16 */ + WORD pixelShaderConstantsI; /* MAX_CONST_I, 16 */ + BOOL *pixelShaderConstantsF; + WORD vertexShaderConstantsB; /* MAX_CONST_B, 16 */ + WORD vertexShaderConstantsI; /* MAX_CONST_I, 16 */ + BOOL *vertexShaderConstantsF; + BYTE indices : 1; + BYTE material : 1; + BYTE viewport : 1; + BYTE vertexDecl : 1; + BYTE pixelShader : 1; + BYTE vertexShader : 1; + BYTE scissorRect : 1; + BYTE padding : 1; } SAVEDSTATES; struct StageState {