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
248b11cc
Commit
248b11cc
authored
May 09, 2019
by
Henri Verbeet
Committed by
Alexandre Julliard
May 10, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Pass a wined3d_context_gl structure to context_unit_free_for_vs().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
167a0f57
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
context.c
dlls/wined3d/context.c
+6
-5
No files found.
dlls/wined3d/context.c
View file @
248b11cc
...
...
@@ -3365,10 +3365,10 @@ static void wined3d_context_gl_map_psamplers(struct wined3d_context_gl *context_
}
}
static
BOOL
context_unit_free_for_vs
(
const
struct
wined3d_context
*
context
,
const
struct
wined3d_shader_resource_info
*
ps_resource_info
,
DWORD
unit
)
static
BOOL
wined3d_context_gl_unit_free_for_vs
(
const
struct
wined3d_context_gl
*
context_gl
,
const
struct
wined3d_shader_resource_info
*
ps_resource_info
,
unsigned
int
unit
)
{
DWORD
current_mapping
=
context
->
rev_tex_unit_map
[
unit
];
unsigned
int
current_mapping
=
context_gl
->
c
.
rev_tex_unit_map
[
unit
];
/* Not currently used */
if
(
current_mapping
==
WINED3D_UNMAPPED_STAGE
)
...
...
@@ -3381,7 +3381,8 @@ static BOOL context_unit_free_for_vs(const struct wined3d_context *context,
if
(
!
ps_resource_info
)
{
/* No pixel shader, check fixed function */
return
current_mapping
>=
WINED3D_MAX_TEXTURES
||
!
(
context
->
fixed_function_usage_map
&
(
1u
<<
current_mapping
));
return
current_mapping
>=
WINED3D_MAX_TEXTURES
||
!
(
context_gl
->
c
.
fixed_function_usage_map
&
(
1u
<<
current_mapping
));
}
/* Pixel shader, check the shader's sampler map */
...
...
@@ -3414,7 +3415,7 @@ static void wined3d_context_gl_map_vsamplers(struct wined3d_context_gl *context_
{
while
(
start
>=
0
)
{
if
(
context_unit_free_for_vs
(
&
context_gl
->
c
,
ps_resource_info
,
start
))
if
(
wined3d_context_gl_unit_free_for_vs
(
context_gl
,
ps_resource_info
,
start
))
{
if
(
context_gl
->
c
.
tex_unit_map
[
vsampler_idx
]
!=
start
)
{
...
...
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