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
620bb845
Commit
620bb845
authored
Jun 22, 2019
by
Henri Verbeet
Committed by
Alexandre Julliard
Jun 24, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Pass a wined3d_context_gl structure to find_arb_ps_compile_args().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
07afb240
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+5
-5
No files found.
dlls/wined3d/arb_program_shader.c
View file @
620bb845
...
...
@@ -4414,15 +4414,15 @@ static struct arb_vs_compiled_shader *find_arb_vshader(struct wined3d_shader *sh
}
static
void
find_arb_ps_compile_args
(
const
struct
wined3d_state
*
state
,
const
struct
wined3d_context
*
context
,
const
struct
wined3d_shader
*
shader
,
const
struct
wined3d_context
_gl
*
context_gl
,
const
struct
wined3d_shader
*
shader
,
struct
arb_ps_compile_args
*
args
)
{
const
struct
wined3d_
gl_info
*
gl_info
=
context
->
gl
_info
;
const
struct
wined3d_
d3d_info
*
d3d_info
=
context
->
d3d
_info
;
const
struct
wined3d_
d3d_info
*
d3d_info
=
context_gl
->
c
.
d3d
_info
;
const
struct
wined3d_
gl_info
*
gl_info
=
context_gl
->
c
.
gl
_info
;
int
i
;
WORD
int_skip
;
find_ps_compile_args
(
state
,
shader
,
context
->
stream_info
.
position_transformed
,
&
args
->
super
,
context
);
find_ps_compile_args
(
state
,
shader
,
context
_gl
->
c
.
stream_info
.
position_transformed
,
&
args
->
super
,
&
context_gl
->
c
);
/* This forces all local boolean constants to 1 to make them stateblock independent */
args
->
bools
=
shader
->
reg_maps
.
local_bool_consts
;
...
...
@@ -4564,7 +4564,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context
struct
arb_ps_compiled_shader
*
compiled
;
TRACE
(
"Using pixel shader %p.
\n
"
,
ps
);
find_arb_ps_compile_args
(
state
,
context
,
ps
,
&
compile_args
);
find_arb_ps_compile_args
(
state
,
context
_gl
,
ps
,
&
compile_args
);
compiled
=
find_arb_pshader
(
context_gl
,
ps
,
&
compile_args
);
priv
->
current_fprogram_id
=
compiled
->
prgId
;
priv
->
compiled_fprog
=
compiled
;
...
...
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