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
ab73f20e
Commit
ab73f20e
authored
Nov 28, 2011
by
Henri Verbeet
Committed by
Alexandre Julliard
Nov 29, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Use proper texcoord masks for GLSL texm3x3spec / texm3x3vspec.
parent
22d41e2c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
2 deletions
+8
-2
glsl_shader.c
dlls/wined3d/glsl_shader.c
+8
-2
No files found.
dlls/wined3d/glsl_shader.c
View file @
ab73f20e
...
...
@@ -3425,6 +3425,7 @@ static void shader_glsl_texm3x3spec(const struct wined3d_shader_instruction *ins
struct
wined3d_shader_tex_mx
*
tex_mx
=
ins
->
ctx
->
tex_mx
;
DWORD
src_mask
=
WINED3DSP_WRITEMASK_0
|
WINED3DSP_WRITEMASK_1
|
WINED3DSP_WRITEMASK_2
;
struct
glsl_sample_function
sample_function
;
char
coord_mask
[
6
];
shader_glsl_add_src_param
(
ins
,
&
ins
->
src
[
0
],
src_mask
,
&
src0_param
);
shader_glsl_add_src_param
(
ins
,
&
ins
->
src
[
1
],
src_mask
,
&
src1_param
);
...
...
@@ -3436,9 +3437,11 @@ static void shader_glsl_texm3x3spec(const struct wined3d_shader_instruction *ins
/* Dependent read, not valid with conditional NP2 */
shader_glsl_get_sample_function
(
ins
->
ctx
,
reg
,
0
,
&
sample_function
);
shader_glsl_write_mask_to_str
(
sample_function
.
coord_mask
,
coord_mask
);
/* Sample the texture */
shader_glsl_gen_sample_code
(
ins
,
reg
,
&
sample_function
,
WINED3DSP_NOSWIZZLE
,
NULL
,
NULL
,
NULL
,
"tmp0.xyz"
);
shader_glsl_gen_sample_code
(
ins
,
reg
,
&
sample_function
,
WINED3DSP_NOSWIZZLE
,
NULL
,
NULL
,
NULL
,
"tmp0%s"
,
coord_mask
);
tex_mx
->
current_row
=
0
;
}
...
...
@@ -3453,6 +3456,7 @@ static void shader_glsl_texm3x3vspec(const struct wined3d_shader_instruction *in
DWORD
src_mask
=
WINED3DSP_WRITEMASK_0
|
WINED3DSP_WRITEMASK_1
|
WINED3DSP_WRITEMASK_2
;
struct
glsl_sample_function
sample_function
;
struct
glsl_src_param
src0_param
;
char
coord_mask
[
6
];
shader_glsl_add_src_param
(
ins
,
&
ins
->
src
[
0
],
src_mask
,
&
src0_param
);
...
...
@@ -3466,9 +3470,11 @@ static void shader_glsl_texm3x3vspec(const struct wined3d_shader_instruction *in
/* Dependent read, not valid with conditional NP2 */
shader_glsl_get_sample_function
(
ins
->
ctx
,
reg
,
0
,
&
sample_function
);
shader_glsl_write_mask_to_str
(
sample_function
.
coord_mask
,
coord_mask
);
/* Sample the texture using the calculated coordinates */
shader_glsl_gen_sample_code
(
ins
,
reg
,
&
sample_function
,
WINED3DSP_NOSWIZZLE
,
NULL
,
NULL
,
NULL
,
"tmp0.xyz"
);
shader_glsl_gen_sample_code
(
ins
,
reg
,
&
sample_function
,
WINED3DSP_NOSWIZZLE
,
NULL
,
NULL
,
NULL
,
"tmp0%s"
,
coord_mask
);
tex_mx
->
current_row
=
0
;
}
...
...
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