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
c9458882
Commit
c9458882
authored
Jun 25, 2013
by
Matteo Bruni
Committed by
Alexandre Julliard
Jun 26, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Fix handling of cnd instruction with coissue flag.
parent
2db2303b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
7 deletions
+4
-7
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+2
-2
glsl_shader.c
dlls/wined3d/glsl_shader.c
+2
-5
No files found.
dlls/wined3d/arb_program_shader.c
View file @
c9458882
...
...
@@ -1630,8 +1630,8 @@ static void pshader_hw_cnd(const struct wined3d_shader_instruction *ins)
shader_arb_get_dst_param
(
ins
,
dst
,
dst_name
);
shader_arb_get_src_param
(
ins
,
&
ins
->
src
[
1
],
1
,
src_name
[
1
]);
/* The coissue flag changes the semantic of the cnd instruction in <= 1.3 shaders */
if
(
shader_version
<=
WINED3D_SHADER_VERSION
(
1
,
3
)
&&
ins
->
coissue
)
if
(
shader_version
<=
WINED3D_SHADER_VERSION
(
1
,
3
)
&&
ins
->
coissue
&&
ins
->
dst
->
write_mask
!=
WINED3DSP_WRITEMASK_3
)
{
shader_addline
(
buffer
,
"MOV%s %s, %s;
\n
"
,
shader_arb_get_modifier
(
ins
),
dst_name
,
src_name
[
1
]);
}
...
...
dlls/wined3d/glsl_shader.c
View file @
c9458882
...
...
@@ -3029,14 +3029,11 @@ static void shader_glsl_cnd(const struct wined3d_shader_instruction *ins)
shader_glsl_add_src_param
(
ins
,
&
ins
->
src
[
1
],
write_mask
,
&
src1_param
);
shader_glsl_add_src_param
(
ins
,
&
ins
->
src
[
2
],
write_mask
,
&
src2_param
);
/* Fun: The D3DSI_COISSUE flag changes the semantic of the cnd instruction for < 1.4 shaders */
if
(
ins
->
coissue
)
{
if
(
ins
->
coissue
&&
ins
->
dst
->
write_mask
!=
WINED3DSP_WRITEMASK_3
)
shader_addline
(
ins
->
ctx
->
buffer
,
"%s /* COISSUE! */);
\n
"
,
src1_param
.
param_str
);
}
else
{
else
shader_addline
(
ins
->
ctx
->
buffer
,
"%s > 0.5 ? %s : %s);
\n
"
,
src0_param
.
param_str
,
src1_param
.
param_str
,
src2_param
.
param_str
);
}
return
;
}
...
...
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