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

wined3d: Support SM5 variant of gather4. 

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2017-04-11 13:30:33 +02:00 committed by Alexandre Julliard
parent 6fec723c9d
commit 739ac1c264
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/wined3d/glsl_shader.c
View File

@ -5928,9 +5928,9 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins)
{ {
const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps;
const char *prefix = shader_glsl_get_prefix(reg_maps->shader_version.type); const char *prefix = shader_glsl_get_prefix(reg_maps->shader_version.type);
unsigned int resource_idx, sampler_idx, sampler_bind_idx, component_idx;
const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; const struct wined3d_gl_info *gl_info = ins->ctx->gl_info;
const struct wined3d_shader_resource_info *resource_info; const struct wined3d_shader_resource_info *resource_info;
unsigned int resource_idx, sampler_idx, sampler_bind_idx;
struct wined3d_string_buffer *buffer = ins->ctx->buffer; struct wined3d_string_buffer *buffer = ins->ctx->buffer;
struct glsl_src_param coord_param, compare_param; struct glsl_src_param coord_param, compare_param;
unsigned int coord_size, offset_size; unsigned int coord_size, offset_size;
@ -5947,6 +5947,7 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins)
resource_idx = ins->src[1].reg.idx[0].offset; resource_idx = ins->src[1].reg.idx[0].offset;
sampler_idx = ins->src[2].reg.idx[0].offset; sampler_idx = ins->src[2].reg.idx[0].offset;
component_idx = shader_glsl_swizzle_get_component(ins->src[2].swizzle, 0);
sampler_bind_idx = shader_glsl_find_sampler(&reg_maps->sampler_map, resource_idx, sampler_idx); sampler_bind_idx = shader_glsl_find_sampler(&reg_maps->sampler_map, resource_idx, sampler_idx);
if (!(resource_info = shader_glsl_get_resource_info(ins, &ins->src[1].reg))) if (!(resource_info = shader_glsl_get_resource_info(ins, &ins->src[1].reg)))
@ -5977,6 +5978,8 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins)
shader_addline(buffer, ", "); shader_addline(buffer, ", ");
shader_glsl_append_imm_ivec(buffer, offset_immdata, offset_size); shader_glsl_append_imm_ivec(buffer, offset_immdata, offset_size);
} }
if (component_idx)
shader_addline(buffer, ", %u", component_idx);
shader_addline(buffer, ")%s);\n", dst_swizzle); shader_addline(buffer, ")%s);\n", dst_swizzle);
} }