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
d1b650e9
Commit
d1b650e9
authored
Jul 11, 2011
by
Henri Verbeet
Committed by
Alexandre Julliard
Jul 12, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Explicitly pass gl_info to gen_arbfp_ffp_shader().
parent
1f6f9467
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+2
-3
No files found.
dlls/wined3d/arb_program_shader.c
View file @
d1b650e9
...
...
@@ -5952,9 +5952,8 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta
}
}
static
GLuint
gen_arbfp_ffp_shader
(
const
struct
ffp_frag_settings
*
settings
,
struct
wined3d_stateblock
*
stateblock
)
static
GLuint
gen_arbfp_ffp_shader
(
const
struct
ffp_frag_settings
*
settings
,
const
struct
wined3d_gl_info
*
gl_info
)
{
const
struct
wined3d_gl_info
*
gl_info
=
&
stateblock
->
device
->
adapter
->
gl_info
;
unsigned
int
stage
;
struct
wined3d_shader_buffer
buffer
;
BOOL
tex_read
[
MAX_TEXTURES
]
=
{
FALSE
,
FALSE
,
FALSE
,
FALSE
,
FALSE
,
FALSE
,
FALSE
,
FALSE
};
...
...
@@ -6280,7 +6279,7 @@ static void fragment_prog_arbfp(DWORD state_id, struct wined3d_stateblock *state
}
memcpy
(
&
new_desc
->
parent
.
settings
,
&
settings
,
sizeof
(
settings
));
new_desc
->
shader
=
gen_arbfp_ffp_shader
(
&
settings
,
stateblock
);
new_desc
->
shader
=
gen_arbfp_ffp_shader
(
&
settings
,
gl_info
);
add_ffp_frag_shader
(
&
priv
->
fragment_shaders
,
&
new_desc
->
parent
);
TRACE
(
"Allocated fixed function replacement shader descriptor %p
\n
"
,
new_desc
);
desc
=
new_desc
;
...
...
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