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
3e7c800e
Commit
3e7c800e
authored
Jan 06, 2013
by
Henri Verbeet
Committed by
Alexandre Julliard
Jan 07, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Get rid of the user_stream field from wined3d_state.
All remaining uses are equivalent to "device->up_strided". (Which should of course eventually go away as well.)
parent
5b42297a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
5 deletions
+2
-5
context.c
dlls/wined3d/context.c
+1
-1
device.c
dlls/wined3d/device.c
+0
-2
drawprim.c
dlls/wined3d/drawprim.c
+1
-1
wined3d_private.h
dlls/wined3d/wined3d_private.h
+0
-1
No files found.
dlls/wined3d/context.c
View file @
3e7c800e
...
...
@@ -2298,7 +2298,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de
device_preload_textures
(
device
);
if
(
isStateDirty
(
context
,
STATE_VDECL
)
||
isStateDirty
(
context
,
STATE_STREAMSRC
))
device_update_stream_info
(
device
,
context
->
gl_info
);
if
(
state
->
index_buffer
&&
!
state
->
user_stream
)
if
(
state
->
index_buffer
&&
!
device
->
up_strided
)
{
if
(
device
->
strided_streams
.
all_vbo
)
wined3d_buffer_preload
(
state
->
index_buffer
);
...
...
dlls/wined3d/device.c
View file @
3e7c800e
...
...
@@ -4162,12 +4162,10 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive_strided(struct wined3d_devic
prev_idx_format
=
device
->
stateBlock
->
state
.
index_format
;
device
->
stateBlock
->
state
.
index_format
=
index_data_format_id
;
device
->
stateBlock
->
state
.
user_stream
=
TRUE
;
device
->
stateBlock
->
state
.
base_vertex_index
=
0
;
device
->
up_strided
=
strided_data
;
draw_primitive
(
device
,
0
,
index_count
,
0
,
0
,
TRUE
,
index_data
);
device
->
up_strided
=
NULL
;
device
->
stateBlock
->
state
.
user_stream
=
FALSE
;
device
->
stateBlock
->
state
.
index_format
=
prev_idx_format
;
device_invalidate_state
(
device
,
STATE_VDECL
);
...
...
dlls/wined3d/drawprim.c
View file @
3e7c800e
...
...
@@ -676,7 +676,7 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co
if
(
indexed
)
{
if
(
!
state
->
user_stream
)
if
(
!
device
->
up_strided
)
{
struct
wined3d_buffer
*
index_buffer
=
state
->
index_buffer
;
if
(
!
index_buffer
->
buffer_object
||
!
stream_info
->
all_vbo
)
...
...
dlls/wined3d/wined3d_private.h
View file @
3e7c800e
...
...
@@ -2296,7 +2296,6 @@ struct wined3d_state
struct
wined3d_vertex_declaration
*
vertex_declaration
;
struct
wined3d_stream_output
stream_output
[
MAX_STREAM_OUT
];
struct
wined3d_stream_state
streams
[
MAX_STREAMS
+
1
/* tesselated pseudo-stream */
];
BOOL
user_stream
;
struct
wined3d_buffer
*
index_buffer
;
enum
wined3d_format_id
index_format
;
INT
base_vertex_index
;
...
...
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