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
02b3a8cb
Commit
02b3a8cb
authored
Nov 21, 2023
by
Zebediah Figura
Committed by
Alexandre Julliard
Nov 23, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Revert uses of wined3d_state_get_ffp_texture() for non-FFP textures.
This fixes a crash when loading a world in Spore. Fixes:
831a41ee
parent
bdc61326
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+1
-1
glsl_shader.c
dlls/wined3d/glsl_shader.c
+1
-1
shader.c
dlls/wined3d/shader.c
+3
-3
No files found.
dlls/wined3d/arb_program_shader.c
View file @
02b3a8cb
...
...
@@ -490,7 +490,7 @@ static void shader_arb_load_np2fixup_constants(const struct arb_ps_np2fixup_info
while
(
active
)
{
i
=
wined3d_bit_scan
(
&
active
);
if
(
!
(
tex
=
wined3d_state_get_ffp_texture
(
state
,
i
)
))
if
(
!
(
tex
=
state
->
textures
[
i
]
))
{
ERR
(
"Nonexistent texture is flagged for NP2 texcoord fixup.
\n
"
);
continue
;
...
...
dlls/wined3d/glsl_shader.c
View file @
02b3a8cb
...
...
@@ -1299,7 +1299,7 @@ static void shader_glsl_load_np2fixup_constants(const struct glsl_ps_program *ps
for
(
i
=
0
;
fixup
;
fixup
>>=
1
,
++
i
)
{
const
struct
wined3d_texture
*
tex
=
wined3d_state_get_ffp_texture
(
state
,
i
)
;
const
struct
wined3d_texture
*
tex
=
state
->
textures
[
i
]
;
unsigned
char
idx
=
ps
->
np2_fixup_info
->
idx
[
i
];
if
(
!
tex
)
...
...
dlls/wined3d/shader.c
View file @
02b3a8cb
...
...
@@ -2858,7 +2858,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3
/* Treat unbound textures as 2D. The dummy texture will provide
* the proper sample value. The tex_types bitmap defaults to
* 2D because of the memset. */
if
(
!
(
texture
=
wined3d_state_get_ffp_texture
(
state
,
i
)
))
if
(
!
(
texture
=
state
->
textures
[
i
]
))
continue
;
switch
(
wined3d_texture_gl
(
texture
)
->
target
)
...
...
@@ -2900,7 +2900,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3
break
;
}
if
((
texture
=
wined3d_state_get_ffp_texture
(
state
,
i
)
))
if
((
texture
=
state
->
textures
[
i
]
))
{
/* Star Wars: The Old Republic uses mismatched samplers for rendering water. */
if
(
texture
->
resource
.
type
==
WINED3D_RTYPE_TEXTURE_2D
...
...
@@ -2930,7 +2930,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3
if
(
!
shader
->
reg_maps
.
resource_info
[
i
].
type
)
continue
;
if
(
!
(
texture
=
wined3d_state_get_ffp_texture
(
state
,
i
)
))
if
(
!
(
texture
=
state
->
textures
[
i
]
))
{
args
->
color_fixup
[
i
]
=
COLOR_FIXUP_IDENTITY
;
continue
;
...
...
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