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
90485cdc
Commit
90485cdc
authored
Jun 13, 2019
by
Henri Verbeet
Committed by
Alexandre Julliard
Jun 13, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Pass a wined3d_context_gl structure to wined3d_sampler_bind().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
f3ee4d40
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
7 deletions
+6
-7
sampler.c
dlls/wined3d/sampler.c
+2
-3
state.c
dlls/wined3d/state.c
+1
-1
view.c
dlls/wined3d/view.c
+2
-2
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
No files found.
dlls/wined3d/sampler.c
View file @
90485cdc
...
...
@@ -182,10 +182,9 @@ static void texture_gl_apply_base_level(struct wined3d_texture_gl *texture_gl,
/* This function relies on the correct texture being bound and loaded. */
void
wined3d_sampler_bind
(
struct
wined3d_sampler
*
sampler
,
unsigned
int
unit
,
struct
wined3d_texture_gl
*
texture_gl
,
const
struct
wined3d_context
*
context
)
struct
wined3d_texture_gl
*
texture_gl
,
const
struct
wined3d_context
_gl
*
context_gl
)
{
const
struct
wined3d_context_gl
*
context_gl
=
wined3d_context_gl_const
(
context
);
const
struct
wined3d_gl_info
*
gl_info
=
context
->
gl_info
;
const
struct
wined3d_gl_info
*
gl_info
=
context_gl
->
c
.
gl_info
;
if
(
gl_info
->
supported
[
ARB_SAMPLER_OBJECTS
])
{
...
...
dlls/wined3d/state.c
View file @
90485cdc
...
...
@@ -3638,7 +3638,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state
}
}
wined3d_sampler_bind
(
sampler
,
mapped_stage
,
texture_gl
,
context
);
wined3d_sampler_bind
(
sampler
,
mapped_stage
,
texture_gl
,
context
_gl
);
/* Trigger shader constant reloading (for NP2 texcoord fixup) */
if
(
!
(
texture_gl
->
t
.
flags
&
WINED3D_TEXTURE_POW2_MAT_IDENT
))
...
...
dlls/wined3d/view.c
View file @
90485cdc
...
...
@@ -839,7 +839,7 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl
if
(
view_gl
->
gl_view
.
name
)
{
wined3d_context_gl_bind_texture
(
context_gl
,
view_gl
->
gl_view
.
target
,
view_gl
->
gl_view
.
name
);
wined3d_sampler_bind
(
sampler
,
unit
,
NULL
,
context
);
wined3d_sampler_bind
(
sampler
,
unit
,
NULL
,
context
_gl
);
return
;
}
...
...
@@ -851,7 +851,7 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl
texture_gl
=
wined3d_texture_gl
(
wined3d_texture_from_resource
(
view_gl
->
v
.
resource
));
wined3d_texture_gl_bind
(
texture_gl
,
context_gl
,
FALSE
);
wined3d_sampler_bind
(
sampler
,
unit
,
texture_gl
,
context
);
wined3d_sampler_bind
(
sampler
,
unit
,
texture_gl
,
context
_gl
);
}
/* Context activation is done by the caller. */
...
...
dlls/wined3d/wined3d_private.h
View file @
90485cdc
...
...
@@ -3685,7 +3685,7 @@ struct wined3d_sampler
};
void
wined3d_sampler_bind
(
struct
wined3d_sampler
*
sampler
,
unsigned
int
unit
,
struct
wined3d_texture_gl
*
texture_gl
,
const
struct
wined3d_context
*
context
)
DECLSPEC_HIDDEN
;
struct
wined3d_texture_gl
*
texture_gl
,
const
struct
wined3d_context
_gl
*
context_gl
)
DECLSPEC_HIDDEN
;
struct
wined3d_vertex_declaration_element
{
...
...
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