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
b186455c
Commit
b186455c
authored
Mar 09, 2023
by
Zebediah Figura
Committed by
Alexandre Julliard
Nov 10, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Remove the no longer used "sampler" field of struct wined3d_texture.
parent
17542e9f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
20 deletions
+2
-20
cs.c
dlls/wined3d/cs.c
+2
-19
wined3d_private.h
dlls/wined3d/wined3d_private.h
+0
-1
No files found.
dlls/wined3d/cs.c
View file @
b186455c
...
...
@@ -1498,8 +1498,7 @@ static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data)
if
(
op
->
texture
)
{
if
(
InterlockedIncrement
(
&
op
->
texture
->
resource
.
bind_count
)
==
1
)
op
->
texture
->
sampler
=
op
->
stage
;
InterlockedIncrement
(
&
op
->
texture
->
resource
.
bind_count
);
if
(
texture_binding_might_invalidate_ps
(
op
->
texture
,
prev
,
d3d_info
))
device_invalidate_state
(
cs
->
c
.
device
,
STATE_SHADER
(
WINED3D_SHADER_TYPE_PIXEL
));
...
...
@@ -1519,23 +1518,7 @@ static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data)
if
(
prev
)
{
if
(
InterlockedDecrement
(
&
prev
->
resource
.
bind_count
)
&&
prev
->
sampler
==
op
->
stage
)
{
unsigned
int
i
;
/* Search for other stages the texture is bound to. Shouldn't
* happen if applications bind textures to a single stage only. */
TRACE
(
"Searching for other stages the texture is bound to.
\n
"
);
for
(
i
=
0
;
i
<
WINED3D_MAX_COMBINED_SAMPLERS
;
++
i
)
{
if
(
cs
->
state
.
textures
[
i
]
==
prev
)
{
TRACE
(
"Texture is also bound to stage %u.
\n
"
,
i
);
prev
->
sampler
=
i
;
break
;
}
}
}
InterlockedDecrement
(
&
prev
->
resource
.
bind_count
);
if
(
!
op
->
texture
&&
op
->
stage
<
d3d_info
->
ffp_fragment_caps
.
max_blend_stages
)
{
...
...
dlls/wined3d/wined3d_private.h
View file @
b186455c
...
...
@@ -3329,7 +3329,6 @@ struct wined3d_texture
unsigned
int
sysmem_count
;
float
pow2_matrix
[
16
];
unsigned
int
lod
;
DWORD
sampler
;
uint32_t
flags
;
DWORD
update_map_binding
;
...
...
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