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
f7580726
Commit
f7580726
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: Don't pass the device to gen_ffp_frag_op.
parent
820c12c9
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
7 deletions
+7
-7
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+1
-1
ati_fragment_shader.c
dlls/wined3d/ati_fragment_shader.c
+1
-1
glsl_shader.c
dlls/wined3d/glsl_shader.c
+1
-1
utils.c
dlls/wined3d/utils.c
+3
-3
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
No files found.
dlls/wined3d/arb_program_shader.c
View file @
f7580726
...
...
@@ -6410,7 +6410,7 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi
{
/* Find or create a shader implementing the fixed function pipeline
* settings, then activate it. */
gen_ffp_frag_op
(
device
,
state
,
&
settings
,
FALSE
);
gen_ffp_frag_op
(
context
,
state
,
&
settings
,
FALSE
);
desc
=
(
const
struct
arbfp_ffp_desc
*
)
find_ffp_frag_shader
(
&
priv
->
fragment_shaders
,
&
settings
);
if
(
!
desc
)
{
struct
arbfp_ffp_desc
*
new_desc
=
HeapAlloc
(
GetProcessHeap
(),
0
,
sizeof
(
*
new_desc
));
...
...
dlls/wined3d/ati_fragment_shader.c
View file @
f7580726
...
...
@@ -844,7 +844,7 @@ static void set_tex_op_atifs(struct wined3d_context *context, const struct wined
DWORD
mapped_stage
;
unsigned
int
i
;
gen_ffp_frag_op
(
device
,
state
,
&
settings
,
TRUE
);
gen_ffp_frag_op
(
context
,
state
,
&
settings
,
TRUE
);
desc
=
(
const
struct
atifs_ffp_desc
*
)
find_ffp_frag_shader
(
&
priv
->
fragment_shaders
,
&
settings
);
if
(
!
desc
)
{
struct
atifs_ffp_desc
*
new_desc
=
HeapAlloc
(
GetProcessHeap
(),
0
,
sizeof
(
*
new_desc
));
...
...
dlls/wined3d/glsl_shader.c
View file @
f7580726
...
...
@@ -5532,7 +5532,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, struc
struct
glsl_ffp_fragment_shader
*
ffp_shader
;
struct
ffp_frag_settings
settings
;
gen_ffp_frag_op
(
device
,
state
,
&
settings
,
FALSE
);
gen_ffp_frag_op
(
context
,
state
,
&
settings
,
FALSE
);
ffp_shader
=
shader_glsl_find_ffp_fragment_shader
(
priv
,
gl_info
,
&
settings
);
ps_id
=
ffp_shader
->
id
;
ps_list
=
&
ffp_shader
->
linked_programs
;
...
...
dlls/wined3d/utils.c
View file @
f7580726
...
...
@@ -3090,7 +3090,7 @@ DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) {
return
size
;
}
void
gen_ffp_frag_op
(
const
struct
wined3d_
device
*
device
,
const
struct
wined3d_state
*
state
,
void
gen_ffp_frag_op
(
const
struct
wined3d_
context
*
context
,
const
struct
wined3d_state
*
state
,
struct
ffp_frag_settings
*
settings
,
BOOL
ignore_textype
)
{
#define ARG1 0x01
...
...
@@ -3130,8 +3130,8 @@ void gen_ffp_frag_op(const struct wined3d_device *device, const struct wined3d_s
DWORD
ttff
;
DWORD
cop
,
aop
,
carg0
,
carg1
,
carg2
,
aarg0
,
aarg1
,
aarg2
;
const
struct
wined3d_surface
*
rt
=
state
->
fb
->
render_targets
[
0
];
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
;
for
(
i
=
0
;
i
<
gl_info
->
limits
.
texture_stages
;
++
i
)
{
...
...
dlls/wined3d/wined3d_private.h
View file @
f7580726
...
...
@@ -1674,7 +1674,7 @@ struct ffp_frag_desc
extern
const
struct
wine_rb_functions
wined3d_ffp_frag_program_rb_functions
DECLSPEC_HIDDEN
;
extern
const
struct
wined3d_parent_ops
wined3d_null_parent_ops
DECLSPEC_HIDDEN
;
void
gen_ffp_frag_op
(
const
struct
wined3d_
device
*
device
,
const
struct
wined3d_state
*
state
,
void
gen_ffp_frag_op
(
const
struct
wined3d_
context
*
context
,
const
struct
wined3d_state
*
state
,
struct
ffp_frag_settings
*
settings
,
BOOL
ignore_textype
)
DECLSPEC_HIDDEN
;
const
struct
ffp_frag_desc
*
find_ffp_frag_shader
(
const
struct
wine_rb_tree
*
fragment_shaders
,
const
struct
ffp_frag_settings
*
settings
)
DECLSPEC_HIDDEN
;
...
...
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