Henri Verbeet : wined3d: Merge some bitfields in struct SAVEDSTATES.
Alexandre Julliard
julliard at winehq.org
Wed Oct 14 09:01:59 CDT 2009
Module: wine
Branch: master
Commit: bac64865206a23eaa9aeb40b4a095beb917ae5de
URL: http://source.winehq.org/git/wine.git/?a=commit;h=bac64865206a23eaa9aeb40b4a095beb917ae5de
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Oct 14 10:55:19 2009 +0200
wined3d: Merge some bitfields in struct SAVEDSTATES.
---
dlls/wined3d/wined3d_private.h | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 69467e0..c9097cf 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2079,7 +2079,6 @@ typedef struct SAVEDSTATES {
DWORD renderState[(WINEHIGHEST_RENDER_STATE >> 5) + 1];
DWORD textureState[MAX_TEXTURES]; /* WINED3D_HIGHEST_TEXTURE_STATE + 1, 18 */
WORD samplerState[MAX_COMBINED_SAMPLERS]; /* WINED3D_HIGHEST_SAMPLER_STATE + 1, 14 */
- DWORD textures; /* MAX_COMBINED_SAMPLERS, 20 */
DWORD clipplane; /* WINED3DMAXUSERCLIPPLANES, 32 */
WORD pixelShaderConstantsB; /* MAX_CONST_B, 16 */
WORD pixelShaderConstantsI; /* MAX_CONST_I, 16 */
@@ -2087,15 +2086,16 @@ typedef struct SAVEDSTATES {
WORD vertexShaderConstantsB; /* MAX_CONST_B, 16 */
WORD vertexShaderConstantsI; /* MAX_CONST_I, 16 */
BOOL *vertexShaderConstantsF;
- WORD primitive_type : 1;
- WORD indices : 1;
- WORD material : 1;
- WORD viewport : 1;
- WORD vertexDecl : 1;
- WORD pixelShader : 1;
- WORD vertexShader : 1;
- WORD scissorRect : 1;
- WORD padding : 1;
+ DWORD textures : 20; /* MAX_COMBINED_SAMPLERS, 20 */
+ DWORD primitive_type : 1;
+ DWORD indices : 1;
+ DWORD material : 1;
+ DWORD viewport : 1;
+ DWORD vertexDecl : 1;
+ DWORD pixelShader : 1;
+ DWORD vertexShader : 1;
+ DWORD scissorRect : 1;
+ DWORD padding : 4;
} SAVEDSTATES;
struct StageState {
More information about the wine-cvs
mailing list