Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
4c727ed0
Commit
4c727ed0
authored
Nov 07, 2011
by
Henri Verbeet
Committed by
Alexandre Julliard
Nov 08, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Get rid of the SAVEDSTATES typedef.
parent
1e1c442a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
9 deletions
+7
-9
stateblock.c
dlls/wined3d/stateblock.c
+3
-3
wined3d_private.h
dlls/wined3d/wined3d_private.h
+4
-6
No files found.
dlls/wined3d/stateblock.c
View file @
4c727ed0
...
...
@@ -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 */
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
;
...
...
@@ -274,7 +274,7 @@ static void stateblock_savedstates_set_all(SAVEDSTATES *states, DWORD 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
;
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
);
}
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
;
WORD
sampler_mask
=
0
;
...
...
dlls/wined3d/wined3d_private.h
View file @
4c727ed0
...
...
@@ -2205,10 +2205,8 @@ struct wined3d_vertex_declaration
BOOL
half_float_conv_needed
;
};
/* Internal state Block for Begin/End/Capture/Create/Apply info */
/* 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
{
struct
wined3d_saved_states
{
DWORD
transform
[(
HIGHEST_TRANSFORMSTATE
>>
5
)
+
1
];
WORD
streamSource
;
/* MAX_STREAMS, 16 */
WORD
streamFreq
;
/* MAX_STREAMS, 16 */
...
...
@@ -2232,7 +2230,7 @@ typedef struct SAVEDSTATES {
DWORD
vertexShader
:
1
;
DWORD
scissorRect
:
1
;
DWORD
padding
:
4
;
}
SAVEDSTATES
;
};
struct
StageState
{
DWORD
stage
;
...
...
@@ -2298,7 +2296,7 @@ struct wined3d_stateblock
WINED3DSTATEBLOCKTYPE
blockType
;
/* Array indicating whether things have been set or changed */
SAVEDSTATES
changed
;
struct
wined3d_saved_states
changed
;
struct
wined3d_state
state
;
/* Contained state management */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment