[Mesa-dev] [PATCH 09/11] radeonsi: add shader buffer support to TGSI_OPCODE_RESQ

[Nicolai Hähnle]

From: Nicolai Hähnle <nicolai.haeh...@amd.com>

---
 src/gallium/drivers/radeonsi/si_shader.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c 
b/src/gallium/drivers/radeonsi/si_shader.c
index 1a0f75b..87dc229 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -3373,14 +3373,17 @@ static void resq_fetch_args(
                struct lp_build_tgsi_context * bld_base,
                struct lp_build_emit_data * emit_data)
 {
+       struct si_shader_context *ctx = si_shader_context(bld_base);
        struct gallivm_state *gallivm = bld_base->base.gallivm;
        const struct tgsi_full_instruction *inst = emit_data->inst;
        const struct tgsi_full_src_register *reg = &inst->Src[0];
-       unsigned tex_target = inst->Memory.Texture;
 
        emit_data->dst_type = LLVMVectorType(bld_base->base.elem_type, 4);
 
-       if (tex_target == TGSI_TEXTURE_BUFFER) {
+       if (reg->Register.File == TGSI_FILE_BUFFER) {
+               emit_data->args[0] = shader_buffer_fetch_rsrc(ctx, reg);
+               emit_data->arg_count = 1;
+       } else if (inst->Memory.Texture == TGSI_TEXTURE_BUFFER) {
                image_fetch_rsrc(bld_base, reg, false, &emit_data->args[0]);
                emit_data->arg_count = 1;
        } else {
@@ -3389,7 +3392,7 @@ static void resq_fetch_args(
                emit_data->args[2] = lp_build_const_int32(gallivm, 15); /* 
dmask */
                emit_data->args[3] = bld_base->uint_bld.zero; /* unorm */
                emit_data->args[4] = bld_base->uint_bld.zero; /* r128 */
-               emit_data->args[5] = tgsi_is_array_image(tex_target) ?
+               emit_data->args[5] = tgsi_is_array_image(inst->Memory.Texture) ?
                        bld_base->uint_bld.one : bld_base->uint_bld.zero; /* da 
*/
                emit_data->args[6] = bld_base->uint_bld.zero; /* glc */
                emit_data->args[7] = bld_base->uint_bld.zero; /* slc */
@@ -3407,10 +3410,12 @@ static void resq_emit(
        struct gallivm_state *gallivm = bld_base->base.gallivm;
        LLVMBuilderRef builder = gallivm->builder;
        const struct tgsi_full_instruction *inst = emit_data->inst;
-       unsigned target = inst->Memory.Texture;
        LLVMValueRef out;
 
-       if (target == TGSI_TEXTURE_BUFFER) {
+       if (inst->Src[0].Register.File == TGSI_FILE_BUFFER) {
+               out = LLVMBuildExtractElement(builder, emit_data->args[0],
+                                             lp_build_const_int32(gallivm, 2), 
"");
+       } else if (inst->Memory.Texture == TGSI_TEXTURE_BUFFER) {
                out = get_buffer_size(bld_base, emit_data->args[0]);
        } else {
                out = lp_build_intrinsic(
@@ -3419,7 +3424,7 @@ static void resq_emit(
                        LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
 
                /* Divide the number of layers by 6 to get the number of cubes. 
*/
-               if (target == TGSI_TEXTURE_CUBE_ARRAY) {
+               if (inst->Memory.Texture == TGSI_TEXTURE_CUBE_ARRAY) {
                        LLVMValueRef imm2 = lp_build_const_int32(gallivm, 2);
                        LLVMValueRef imm6 = lp_build_const_int32(gallivm, 6);
 
-- 
2.5.0

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev