Module: wine Branch: master Commit: 3ab2482e0bfee233bd14da72671ebba7c07a8eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ab2482e0bfee233bd14da7267...
Author: Józef Kucia jkucia@codeweavers.com Date: Tue Feb 28 14:42:40 2017 +0100
wined3d: Add support for ld_raw on thread group shared memory.
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
---
dlls/wined3d/glsl_shader.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3f73201..c65bc69 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5148,7 +5148,7 @@ static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) function = "texelFetch"; resource = "sampler"; } - else + else if (src->reg.type == WINED3DSPR_UAV) { if (resource_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) { @@ -5160,6 +5160,18 @@ static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) function = "imageLoad"; resource = "image"; } + else + { + if (resource_idx >= reg_maps->tgsm_count) + { + ERR("Invalid TGSM index %u.\n", resource_idx); + return; + } + stride = reg_maps->tgsm[resource_idx].stride; + bind_idx = resource_idx; + function = NULL; + resource = "g"; + }
address = string_buffer_get(priv->string_buffers); if (ins->handler_idx == WINED3DSIH_LD_STRUCTURED) @@ -5178,8 +5190,12 @@ static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) continue;
swizzle = shader_glsl_swizzle_get_component(src->swizzle, i); - shader_addline(buffer, "%s(%s_%s%u, %s + %u).x);\n", - function, prefix, resource, bind_idx, address->buffer, swizzle); + if (function) + shader_addline(buffer, "%s(%s_%s%u, %s + %u).x);\n", + function, prefix, resource, bind_idx, address->buffer, swizzle); + else + shader_addline(buffer, "%s_%s%u[%s + %u]);\n", + prefix, resource, bind_idx, address->buffer, swizzle); }
string_buffer_release(priv->string_buffers, address);