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
4c1b3de9
Commit
4c1b3de9
authored
Aug 06, 2009
by
Henri Verbeet
Committed by
Alexandre Julliard
Aug 06, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Call the shader_load_np2fixup_constants() handler directly from inside the shader backend.
parent
03686cb6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+1
-1
glsl_shader.c
dlls/wined3d/glsl_shader.c
+3
-2
No files found.
dlls/wined3d/arb_program_shader.c
View file @
4c1b3de9
...
...
@@ -4260,7 +4260,7 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) {
}
/* Force constant reloading for the NP2 fixup (see comment in shader_glsl_select for more info) */
if
(
compiled
->
np2fixup_info
.
super
.
active
)
This
->
shader_backend
->
shader
_load_np2fixup_constants
(
iface
,
usePS
,
useVS
);
if
(
compiled
->
np2fixup_info
.
super
.
active
)
shader_arb
_load_np2fixup_constants
(
iface
,
usePS
,
useVS
);
}
else
if
(
GL_SUPPORT
(
ARB_FRAGMENT_PROGRAM
)
&&
!
priv
->
use_arbfp_fixed_func
)
{
/* Disable only if we're not using arbfp fixed function fragment processing. If this is used,
* keep GL_FRAGMENT_PROGRAM_ARB enabled, and the fixed function pipeline will bind the fixed function
...
...
dlls/wined3d/glsl_shader.c
View file @
4c1b3de9
...
...
@@ -4281,8 +4281,9 @@ static void shader_glsl_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) {
/* In case that NP2 texcoord fixup data is found for the selected program, trigger a reload of the
* constants. This has to be done because it can't be guaranteed that sampler() (from state.c) is
* called between selecting the shader and using it, which results in wrong fixup for some frames. */
if
(
priv
->
glsl_program
&&
priv
->
glsl_program
->
np2Fixup_info
)
{
This
->
shader_backend
->
shader_load_np2fixup_constants
(
iface
,
usePS
,
useVS
);
if
(
priv
->
glsl_program
&&
priv
->
glsl_program
->
np2Fixup_info
)
{
shader_glsl_load_np2fixup_constants
(
iface
,
usePS
,
useVS
);
}
}
...
...
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