[PATCH 8/9] wined3d: Implement SM5 ld_uav_typed instruction.
Józef Kucia
jkucia at codeweavers.com
Tue Nov 29 05:06:31 CST 2016
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
dlls/wined3d/glsl_shader.c | 36 +++++++++++++++++++++++++++++++++++-
dlls/wined3d/shader.c | 9 +++++++--
2 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index ca91908..c95dc00 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -4773,6 +4773,40 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins)
image_coord_param.param_str, image_data_param.param_str);
}
+static void shader_glsl_ld_uav(const struct wined3d_shader_instruction *ins)
+{
+ const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps;
+ const struct wined3d_shader_version *version = ®_maps->shader_version;
+ enum wined3d_shader_resource_type resource_type;
+ struct glsl_src_param image_coord_param;
+ enum wined3d_data_type data_type;
+ DWORD coord_mask, write_mask;
+ unsigned int uav_idx;
+ char dst_swizzle[6];
+
+ uav_idx = ins->src[1].reg.idx[0].offset;
+ if (uav_idx >= ARRAY_SIZE(reg_maps->uav_resource_info))
+ {
+ ERR("Invalid UAV index %u.\n", uav_idx);
+ return;
+ }
+ resource_type = reg_maps->uav_resource_info[uav_idx].type;
+ if (resource_type >= ARRAY_SIZE(resource_type_info))
+ {
+ ERR("Unexpected resource type %#x.\n", resource_type);
+ resource_type = WINED3D_SHADER_RESOURCE_TEXTURE_2D;
+ }
+ data_type = reg_maps->uav_resource_info[uav_idx].data_type;
+ coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1;
+
+ write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &ins->dst[0], data_type);
+ shader_glsl_get_swizzle(&ins->src[1], FALSE, write_mask, dst_swizzle);
+
+ shader_glsl_add_src_param(ins, &ins->src[0], coord_mask, &image_coord_param);
+ shader_addline(ins->ctx->buffer, "imageLoad(%s_image%u, %s)%s);\n",
+ shader_glsl_get_prefix(version->type), uav_idx, image_coord_param.param_str, dst_swizzle);
+}
+
static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins)
{
const struct wined3d_shader_version *version = &ins->ctx->reg_maps->shader_version;
@@ -8937,7 +8971,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_LD2DMS */ NULL,
/* WINED3DSIH_LD_RAW */ NULL,
/* WINED3DSIH_LD_STRUCTURED */ NULL,
- /* WINED3DSIH_LD_UAV_TYPED */ NULL,
+ /* WINED3DSIH_LD_UAV_TYPED */ shader_glsl_ld_uav,
/* WINED3DSIH_LIT */ shader_glsl_lit,
/* WINED3DSIH_LOD */ NULL,
/* WINED3DSIH_LOG */ shader_glsl_scalar_op,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index e1c097a..eadf331 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -1228,9 +1228,14 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st
}
}
- if (ins.handler_idx == WINED3DSIH_ATOMIC_IADD)
+ if (ins.handler_idx == WINED3DSIH_ATOMIC_IADD
+ || ins.handler_idx == WINED3DSIH_LD_UAV_TYPED)
{
- unsigned int reg_idx = ins.dst[0].reg.idx[0].offset;
+ unsigned int reg_idx;
+ if (ins.handler_idx == WINED3DSIH_ATOMIC_IADD)
+ reg_idx = ins.dst[0].reg.idx[0].offset;
+ else
+ reg_idx = ins.src[1].reg.idx[0].offset;
if (reg_idx >= MAX_UNORDERED_ACCESS_VIEWS)
{
ERR("Invalid UAV index %u.\n", reg_idx);
--
2.7.3
More information about the wine-patches
mailing list