From ab3f114120bc47d853cfb6e5a76cb2b45aff8330 Mon Sep 17 00:00:00 2001 From: Hans-Kristian Arntzen Date: Tue, 24 Oct 2017 09:23:29 +0200 Subject: [PATCH] Use remap_swizzle for image load-store more actively. --- spirv_glsl.cpp | 27 ++++++++++++++++----------- spirv_glsl.hpp | 2 +- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/spirv_glsl.cpp b/spirv_glsl.cpp index f5ec339e..97d42ca9 100644 --- a/spirv_glsl.cpp +++ b/spirv_glsl.cpp @@ -1704,17 +1704,15 @@ void CompilerGLSL::replace_fragment_outputs() } } -string CompilerGLSL::remap_swizzle(uint32_t result_type, uint32_t input_components, uint32_t expr) +string CompilerGLSL::remap_swizzle(const SPIRType &out_type, uint32_t input_components, const string &expr) { - auto &out_type = get(result_type); - if (out_type.vecsize == input_components) - return to_expression(expr); + return expr; else if (input_components == 1) - return join(type_to_glsl(out_type), "(", to_expression(expr), ")"); + return join(type_to_glsl(out_type), "(", expr, ")"); else { - auto e = to_enclosed_expression(expr) + "."; + auto e = enclose_expression(expr) + "."; // Just clamp the swizzle index if we have more outputs than inputs. for (uint32_t c = 0; c < out_type.vecsize; c++) e += index_to_swizzle(min(c, input_components - 1)); @@ -6103,14 +6101,14 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction) // since ImageRead always returns 4-component vectors and the backing type is opaque. if (!var->remapped_components) SPIRV_CROSS_THROW("subpassInput was remapped, but remap_components is not set correctly."); - imgexpr = remap_swizzle(result_type, var->remapped_components, ops[2]); + imgexpr = remap_swizzle(get(result_type), var->remapped_components, to_expression(ops[2])); } else { // PLS input could have different number of components than what the SPIR expects, swizzle to // the appropriate vector size. uint32_t components = pls_format_to_components(itr->format); - imgexpr = remap_swizzle(result_type, components, ops[2]); + imgexpr = remap_swizzle(get(result_type), components, to_expression(ops[2])); } pure = true; } @@ -6151,6 +6149,7 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction) imgexpr = join("texelFetch(", to_expression(ops[2]), ", ivec2(gl_FragCoord.xy), 0)"); } } + imgexpr = remap_swizzle(get(result_type), 4, imgexpr); pure = true; } else @@ -6168,6 +6167,8 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction) } else imgexpr = join("imageLoad(", to_expression(ops[2]), ", ", to_expression(ops[3]), ")"); + + imgexpr = remap_swizzle(get(result_type), 4, imgexpr); pure = false; } @@ -6216,6 +6217,10 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction) } auto &type = expression_type(ops[0]); + auto &value_type = expression_type(ops[2]); + auto store_type = value_type; + store_type.vecsize = 4; + if (type.image.ms) { uint32_t operands = ops[3]; @@ -6223,11 +6228,11 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction) SPIRV_CROSS_THROW("Multisampled image used in OpImageWrite, but unexpected operand mask was used."); uint32_t samples = ops[4]; statement("imageStore(", to_expression(ops[0]), ", ", to_expression(ops[1]), ", ", to_expression(samples), - ", ", to_expression(ops[2]), ");"); + ", ", remap_swizzle(store_type, value_type.vecsize, to_expression(ops[2])), ");"); } else - statement("imageStore(", to_expression(ops[0]), ", ", to_expression(ops[1]), ", ", to_expression(ops[2]), - ");"); + statement("imageStore(", to_expression(ops[0]), ", ", to_expression(ops[1]), ", ", + remap_swizzle(store_type, value_type.vecsize, to_expression(ops[2])), ");"); if (var && variable_storage_is_aliased(*var)) flush_all_aliased_variables(); diff --git a/spirv_glsl.hpp b/spirv_glsl.hpp index 9f3750c3..2c806dd7 100644 --- a/spirv_glsl.hpp +++ b/spirv_glsl.hpp @@ -381,7 +381,7 @@ protected: uint32_t *matrix_stride = nullptr); const char *index_to_swizzle(uint32_t index); - std::string remap_swizzle(uint32_t result_type, uint32_t input_components, uint32_t expr); + std::string remap_swizzle(const SPIRType &result_type, uint32_t input_components, const std::string &expr); std::string declare_temporary(uint32_t type, uint32_t id); void append_global_func_args(const SPIRFunction &func, uint32_t index, std::vector &arglist); std::string to_expression(uint32_t id);