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
14f1cc73
Commit
14f1cc73
authored
Jul 04, 2019
by
Henri Verbeet
Committed by
Alexandre Julliard
Jul 04, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Pass a wined3d_context_gl structure to glsl_blitter_get_program().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
48d710dc
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
glsl_shader.c
dlls/wined3d/glsl_shader.c
+3
-3
No files found.
dlls/wined3d/glsl_shader.c
View file @
14f1cc73
...
@@ -12803,9 +12803,9 @@ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter,
...
@@ -12803,9 +12803,9 @@ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter,
/* Context activation is done by the caller. */
/* Context activation is done by the caller. */
static
struct
glsl_blitter_program
*
glsl_blitter_get_program
(
struct
wined3d_glsl_blitter
*
blitter
,
static
struct
glsl_blitter_program
*
glsl_blitter_get_program
(
struct
wined3d_glsl_blitter
*
blitter
,
struct
wined3d_context
*
context
,
const
struct
wined3d_texture_gl
*
texture_gl
,
BOOL
use_colour_key
)
struct
wined3d_context
_gl
*
context_gl
,
const
struct
wined3d_texture_gl
*
texture_gl
,
BOOL
use_colour_key
)
{
{
const
struct
wined3d_gl_info
*
gl_info
=
context
->
gl_info
;
const
struct
wined3d_gl_info
*
gl_info
=
context
_gl
->
c
.
gl_info
;
struct
glsl_blitter_program
*
program
;
struct
glsl_blitter_program
*
program
;
struct
glsl_blitter_args
args
;
struct
glsl_blitter_args
args
;
struct
wine_rb_entry
*
entry
;
struct
wine_rb_entry
*
entry
;
...
@@ -13052,7 +13052,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli
...
@@ -13052,7 +13052,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli
colour_key
=
NULL
;
colour_key
=
NULL
;
}
}
if
(
!
(
program
=
glsl_blitter_get_program
(
glsl_blitter
,
context
,
src_texture_gl
,
!!
colour_key
)))
if
(
!
(
program
=
glsl_blitter_get_program
(
glsl_blitter
,
context
_gl
,
src_texture_gl
,
!!
colour_key
)))
{
{
ERR
(
"Failed to get blitter program.
\n
"
);
ERR
(
"Failed to get blitter program.
\n
"
);
return
dst_location
;
return
dst_location
;
...
...
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