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
aa59d40a
Commit
aa59d40a
authored
Apr 16, 2018
by
Matteo Bruni
Committed by
Alexandre Julliard
Apr 16, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Implement source fixups in the GLSL blitter.
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
40496c90
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
5 deletions
+10
-5
glsl_shader.c
dlls/wined3d/glsl_shader.c
+10
-5
No files found.
dlls/wined3d/glsl_shader.c
View file @
aa59d40a
...
@@ -12270,8 +12270,8 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter
...
@@ -12270,8 +12270,8 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter
"
\n
"
"
\n
"
"void main()
\n
"
"void main()
\n
"
"{
\n
"
;
"{
\n
"
;
struct
wined3d_string_buffer
*
buffer
,
*
string
;
GLuint
program
,
vshader_id
,
fshader_id
;
GLuint
program
,
vshader_id
,
fshader_id
;
struct
wined3d_string_buffer
*
buffer
;
const
char
*
tex_type
,
*
swizzle
,
*
ptr
;
const
char
*
tex_type
,
*
swizzle
,
*
ptr
;
unsigned
int
i
;
unsigned
int
i
;
...
@@ -12314,9 +12314,14 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter
...
@@ -12314,9 +12314,14 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter
declare_in_varying
(
gl_info
,
buffer
,
FALSE
,
"vec3 out_texcoord;
\n
"
);
declare_in_varying
(
gl_info
,
buffer
,
FALSE
,
"vec3 out_texcoord;
\n
"
);
if
(
!
needs_legacy_glsl_syntax
(
gl_info
))
if
(
!
needs_legacy_glsl_syntax
(
gl_info
))
shader_addline
(
buffer
,
"out vec4 ps_out[1];
\n
"
);
shader_addline
(
buffer
,
"out vec4 ps_out[1];
\n
"
);
shader_addline
(
buffer
,
fshader_header
);
shader_addline
(
buffer
,
fshader_header
);
shader_addline
(
buffer
,
" %s[0] = texture%s(sampler, out_texcoord.%s);
\n
"
,
string
=
string_buffer_get
(
&
blitter
->
string_buffers
);
get_fragment_output
(
gl_info
),
needs_legacy_glsl_syntax
(
gl_info
)
?
tex_type
:
""
,
swizzle
);
string_buffer_sprintf
(
string
,
"%s[0]"
,
get_fragment_output
(
gl_info
));
shader_addline
(
buffer
,
" %s = texture%s(sampler, out_texcoord.%s);
\n
"
,
string
->
buffer
,
needs_legacy_glsl_syntax
(
gl_info
)
?
tex_type
:
""
,
swizzle
);
shader_glsl_color_correction_ext
(
buffer
,
string
->
buffer
,
WINED3DSP_WRITEMASK_ALL
,
args
->
fixup
);
string_buffer_release
(
&
blitter
->
string_buffers
,
string
);
shader_addline
(
buffer
,
"}
\n
"
);
shader_addline
(
buffer
,
"}
\n
"
);
ptr
=
buffer
->
buffer
;
ptr
=
buffer
->
buffer
;
...
@@ -12436,9 +12441,9 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi
...
@@ -12436,9 +12441,9 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi
return
FALSE
;
return
FALSE
;
}
}
if
(
!
is_identity
_fixup
(
src_format
->
color_fixup
))
if
(
is_complex
_fixup
(
src_format
->
color_fixup
))
{
{
TRACE
(
"
S
ource fixups are not supported.
\n
"
);
TRACE
(
"
Complex s
ource fixups are not supported.
\n
"
);
return
FALSE
;
return
FALSE
;
}
}
...
...
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