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
b26fae9a
Commit
b26fae9a
authored
Jan 15, 2007
by
H. Verbeet
Committed by
Alexandre Julliard
Jan 16, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texm3x3tex().
Use shader_glsl_get_sample_function().
parent
950783d4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
5 deletions
+12
-5
glsl_shader.c
dlls/wined3d/glsl_shader.c
+12
-5
No files found.
dlls/wined3d/glsl_shader.c
View file @
b26fae9a
...
...
@@ -1673,20 +1673,27 @@ void pshader_glsl_texm3x2tex(SHADER_OPCODE_ARG* arg) {
/** Process the WINED3DSIO_TEXM3X3TEX instruction in GLSL
* Perform the 3rd row of a 3x3 matrix multiply, then sample the texture using the calculated coordinates */
void
pshader_glsl_texm3x3tex
(
SHADER_OPCODE_ARG
*
arg
)
{
char
dst_str
[
8
]
;
DWORD
src_mask
=
WINED3DSP_WRITEMASK_0
|
WINED3DSP_WRITEMASK_1
|
WINED3DSP_WRITEMASK_2
;
char
src0_str
[
100
];
char
src0_name
[
50
];
char
src0_mask
[
6
];
char
dst_mask
[
6
];
DWORD
reg
=
arg
->
dst
&
WINED3DSP_REGNUM_MASK
;
IWineD3DPixelShaderImpl
*
This
=
(
IWineD3DPixelShaderImpl
*
)
arg
->
shader
;
SHADER_PARSE_STATE
*
current_state
=
&
This
->
baseShader
.
parse_state
;
DWORD
sampler_type
=
arg
->
reg_maps
->
samplers
[
reg
]
&
WINED3DSP_TEXTURETYPE_MASK
;
glsl_sample_function_t
sample_function
;
shader_glsl_add_src_param_old
(
arg
,
arg
->
src
[
0
],
arg
->
src_addr
[
0
],
src0_name
,
src0_mask
,
src0_str
);
shader_addline
(
arg
->
buffer
,
"tmp0.z = dot(vec3(T%u), vec3(%s));
\n
"
,
reg
,
src0_str
);
shader_glsl_add_src_param
(
arg
,
arg
->
src
[
0
],
arg
->
src_addr
[
0
],
src_mask
,
src0_name
,
src0_mask
,
src0_str
);
shader_addline
(
arg
->
buffer
,
"tmp0.z = dot(T%u.xyz, %s);
\n
"
,
reg
,
src0_str
);
shader_glsl_append_dst
(
arg
->
buffer
,
arg
);
shader_glsl_get_write_mask
(
arg
->
dst
,
dst_mask
);
shader_glsl_get_sample_function
(
sampler_type
,
FALSE
,
&
sample_function
);
/* Sample the texture using the calculated coordinates */
s
printf
(
dst_str
,
"T%u"
,
reg
);
shader_glsl_sample
(
arg
,
reg
,
dst_str
,
"tmp0"
);
s
hader_addline
(
arg
->
buffer
,
"%s(Psampler%u, tmp0.xyz)%s);
\n
"
,
sample_function
.
name
,
reg
,
dst_mask
);
current_state
->
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