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
820c12c9
Commit
820c12c9
authored
Apr 25, 2013
by
Stefan Dösinger
Committed by
Alexandre Julliard
Apr 25, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Access gl_info and d3d_info from the context in find_arb_*_compile_args.
parent
16e862ba
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
9 deletions
+10
-9
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+10
-9
No files found.
dlls/wined3d/arb_program_shader.c
View file @
820c12c9
...
...
@@ -4472,11 +4472,11 @@ 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_shader
*
shader
,
struct
arb_ps_compile_args
*
args
)
const
struct
wined3d_context
*
context
,
const
struct
wined3d_shader
*
shader
,
struct
arb_ps_compile_args
*
args
)
{
struct
wined3d_device
*
device
=
shader
->
device
;
const
struct
wined3d_gl_info
*
gl_info
=
&
device
->
adapter
->
gl_info
;
const
struct
wined3d_d3d_info
*
d3d_info
=
&
device
->
adapter
->
d3d_info
;
const
struct
wined3d_gl_info
*
gl_info
=
context
->
gl_info
;
const
struct
wined3d_d3d_info
*
d3d_info
=
context
->
d3d_info
;
int
i
;
WORD
int_skip
;
...
...
@@ -4528,12 +4528,13 @@ static void find_arb_ps_compile_args(const struct wined3d_state *state,
}
static
void
find_arb_vs_compile_args
(
const
struct
wined3d_state
*
state
,
const
struct
wined3d_shader
*
shader
,
struct
arb_vs_compile_args
*
args
)
const
struct
wined3d_context
*
context
,
const
struct
wined3d_shader
*
shader
,
struct
arb_vs_compile_args
*
args
)
{
struct
wined3d_device
*
device
=
shader
->
device
;
const
struct
wined3d_adapter
*
adapter
=
device
->
adapter
;
const
struct
wined3d_gl_info
*
gl_info
=
&
adapter
->
gl_info
;
const
struct
wined3d_d3d_info
*
d3d_info
=
&
adapter
->
d3d_info
;
const
struct
wined3d_gl_info
*
gl_info
=
context
->
gl_info
;
const
struct
wined3d_d3d_info
*
d3d_info
=
context
->
d3d_info
;
int
i
;
WORD
int_skip
;
...
...
@@ -4623,7 +4624,7 @@ static void shader_arb_select(const struct wined3d_context *context, enum wined3
struct
arb_ps_compiled_shader
*
compiled
;
TRACE
(
"Using pixel shader %p.
\n
"
,
ps
);
find_arb_ps_compile_args
(
state
,
ps
,
&
compile_args
);
find_arb_ps_compile_args
(
state
,
context
,
ps
,
&
compile_args
);
compiled
=
find_arb_pshader
(
ps
,
&
compile_args
);
priv
->
current_fprogram_id
=
compiled
->
prgId
;
priv
->
compiled_fprog
=
compiled
;
...
...
@@ -4688,7 +4689,7 @@ static void shader_arb_select(const struct wined3d_context *context, enum wined3
struct
arb_vs_compiled_shader
*
compiled
;
TRACE
(
"Using vertex shader %p
\n
"
,
vs
);
find_arb_vs_compile_args
(
state
,
vs
,
&
compile_args
);
find_arb_vs_compile_args
(
state
,
context
,
vs
,
&
compile_args
);
compiled
=
find_arb_vshader
(
vs
,
&
compile_args
);
priv
->
current_vprogram_id
=
compiled
->
prgId
;
priv
->
compiled_vprog
=
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