Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
f02a5f45
Commit
f02a5f45
authored
Aug 26, 2013
by
Henri Verbeet
Committed by
Alexandre Julliard
Aug 26, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Replace the "updateStateBlock" wined3d_device field with a "update_state" field.
parent
8f09d347
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
device.c
dlls/wined3d/device.c
+0
-0
stateblock.c
dlls/wined3d/stateblock.c
+4
-4
wined3d_private.h
dlls/wined3d/wined3d_private.h
+3
-3
No files found.
dlls/wined3d/device.c
View file @
f02a5f45
This diff is collapsed.
Click to expand it.
dlls/wined3d/stateblock.c
View file @
f02a5f45
...
...
@@ -1075,11 +1075,11 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock)
{
GLenum
gl_primitive_type
,
prev
;
if
(
device
->
isRecordingState
)
device
->
updateStateBlock
->
changed
.
primitive_type
=
TRUE
;
if
(
device
->
recording
)
device
->
recording
->
changed
.
primitive_type
=
TRUE
;
gl_primitive_type
=
stateblock
->
state
.
gl_primitive_type
;
prev
=
device
->
update
StateBlock
->
state
.
gl_primitive_type
;
device
->
update
StateBlock
->
state
.
gl_primitive_type
=
gl_primitive_type
;
prev
=
device
->
update
_state
->
gl_primitive_type
;
device
->
update
_state
->
gl_primitive_type
=
gl_primitive_type
;
if
(
gl_primitive_type
!=
prev
&&
(
gl_primitive_type
==
GL_POINTS
||
prev
==
GL_POINTS
))
device_invalidate_state
(
device
,
STATE_POINT_SIZE_ENABLE
);
}
...
...
dlls/wined3d/wined3d_private.h
View file @
f02a5f45
...
...
@@ -1816,7 +1816,6 @@ struct wined3d_device
UINT
instance_count
;
WORD
vertexBlendUsed
:
1
;
/* To avoid needless setting of the blend matrices */
WORD
isRecordingState
:
1
;
WORD
isInDraw
:
1
;
WORD
bCursorVisible
:
1
;
WORD
d3d_initialized
:
1
;
...
...
@@ -1824,7 +1823,7 @@ struct wined3d_device
WORD
softwareVertexProcessing
:
1
;
/* process vertex shaders using software or hardware */
WORD
useDrawStridedSlow
:
1
;
WORD
filter_messages
:
1
;
WORD
padding
:
7
;
WORD
padding
:
8
;
BYTE
fixed_function_usage_map
;
/* MAX_TEXTURES, 8 */
...
...
@@ -1834,7 +1833,8 @@ struct wined3d_device
/* State block related */
struct
wined3d_stateblock
*
stateBlock
;
struct
wined3d_stateblock
*
updateStateBlock
;
struct
wined3d_state
*
update_state
;
struct
wined3d_stateblock
*
recording
;
/* Internal use fields */
struct
wined3d_device_creation_parameters
create_parms
;
...
...
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