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
e1cd2453
Commit
e1cd2453
authored
Jan 18, 2012
by
Henri Verbeet
Committed by
Alexandre Julliard
Jan 19, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Get rid of the mostly unused blockType field in struct wined3d_stateblock.
parent
ddeff981
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
6 deletions
+1
-6
stateblock.c
dlls/wined3d/stateblock.c
+1
-5
wined3d_private.h
dlls/wined3d/wined3d_private.h
+0
-1
No files found.
dlls/wined3d/stateblock.c
View file @
e1cd2453
...
@@ -924,8 +924,7 @@ HRESULT CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblo
...
@@ -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)
...
@@ -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,
...
@@ -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
++
)
{
{
...
...
dlls/wined3d/wined3d_private.h
View file @
e1cd2453
...
@@ -2310,7 +2310,6 @@ struct wined3d_stateblock
...
@@ -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
;
...
...
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