ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Implement source fixups in the GLSL blitter. 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Matteo Bruni 2018-04-16 17:59:27 +04:30 committed by Alexandre Julliard
parent 40496c9083
commit aa59d40a18
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/wined3d/glsl_shader.c
View File

@ -12270,8 +12270,8 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter
"\n"
"void main()\n"
"{\n";
struct wined3d_string_buffer *buffer, *string;
GLuint program, vshader_id, fshader_id;
struct wined3d_string_buffer *buffer;
const char *tex_type, *swizzle, *ptr;
unsigned int i;
@ -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");
if (!needs_legacy_glsl_syntax(gl_info))
shader_addline(buffer, "out vec4 ps_out[1];\n");
shader_addline(buffer, fshader_header);
shader_addline(buffer, " %s[0] = texture%s(sampler, out_texcoord.%s);\n",
get_fragment_output(gl_info), needs_legacy_glsl_syntax(gl_info) ? tex_type : "", swizzle);
string = string_buffer_get(&blitter->string_buffers);
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");
ptr = buffer->buffer;
@ -12436,9 +12441,9 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi
return FALSE;
}
if (!is_identity_fixup(src_format->color_fixup))
if (is_complex_fixup(src_format->color_fixup))
{
TRACE("Source fixups are not supported.\n");
TRACE("Complex source fixups are not supported.\n");
return FALSE;
}