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
b96b4c63
Commit
b96b4c63
authored
Oct 21, 2012
by
Henri Verbeet
Committed by
Alexandre Julliard
Oct 22, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Use shader_glsl_get_prefix() in shader_glsl_gen_sample_code().
parent
db3bdb0a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
glsl_shader.c
dlls/wined3d/glsl_shader.c
+2
-4
No files found.
dlls/wined3d/glsl_shader.c
View file @
b96b4c63
...
...
@@ -2141,7 +2141,6 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s
const
char
*
dx
,
const
char
*
dy
,
const
char
*
bias
,
const
char
*
coord_reg_fmt
,
...)
{
const
struct
wined3d_shader_version
*
version
=
&
ins
->
ctx
->
reg_maps
->
shader_version
;
const
char
*
sampler_base
;
char
dst_swizzle
[
6
];
struct
color_fixup_desc
fixup
;
BOOL
np2_fixup
=
FALSE
;
...
...
@@ -2153,7 +2152,6 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s
{
const
struct
shader_glsl_ctx_priv
*
priv
=
ins
->
ctx
->
backend_data
;
fixup
=
priv
->
cur_ps_args
->
color_fixup
[
sampler
];
sampler_base
=
"ps_sampler"
;
if
(
priv
->
cur_ps_args
->
np2_fixup
&
(
1
<<
sampler
))
{
if
(
bias
)
{
...
...
@@ -2165,13 +2163,13 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s
}
else
{
sampler_base
=
"vs_sampler"
;
fixup
=
COLOR_FIXUP_IDENTITY
;
/* FIXME: Vshader color fixup */
}
shader_glsl_append_dst
(
ins
->
ctx
->
buffer
,
ins
);
shader_addline
(
ins
->
ctx
->
buffer
,
"%s(%s%u, "
,
sample_function
->
name
,
sampler_base
,
sampler
);
shader_addline
(
ins
->
ctx
->
buffer
,
"%s(%s_sampler%u, "
,
sample_function
->
name
,
shader_glsl_get_prefix
(
version
->
type
),
sampler
);
va_start
(
args
,
coord_reg_fmt
);
shader_vaddline
(
ins
->
ctx
->
buffer
,
coord_reg_fmt
,
args
);
...
...
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