Merge pull request #1564 from KhronosGroup/fix-1558

GLSL: Emit nonuniformEXT in correct place for late-combined samplers.
This commit is contained in:
Hans-Kristian Arntzen 2020-12-07 14:07:38 +01:00 committed by GitHub
commit 762c3082ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 133 additions and 2 deletions

View File

@ -0,0 +1,32 @@
Texture2D<float4> uTex[] : register(t0, space0);
SamplerState Immut : register(s0, space1);
static float4 FragColor;
static int vIndex;
static float2 vUV;
struct SPIRV_Cross_Input
{
float2 vUV : TEXCOORD0;
nointerpolation int vIndex : TEXCOORD1;
};
struct SPIRV_Cross_Output
{
float4 FragColor : SV_Target0;
};
void frag_main()
{
FragColor = uTex[NonUniformResourceIndex(vIndex)].Sample(Immut, vUV);
}
SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
{
vIndex = stage_input.vIndex;
vUV = stage_input.vUV;
frag_main();
SPIRV_Cross_Output stage_output;
stage_output.FragColor = FragColor;
return stage_output;
}

View File

@ -0,0 +1,23 @@
#include <metal_stdlib>
#include <simd/simd.h>
using namespace metal;
struct main0_out
{
float4 FragColor [[color(0)]];
};
struct main0_in
{
float2 vUV [[user(locn0)]];
int vIndex [[user(locn1)]];
};
fragment main0_out main0(main0_in in [[stage_in]], array<texture2d<float>, 10> uTex [[texture(0)]], sampler Immut [[sampler(0)]])
{
main0_out out = {};
out.FragColor = uTex[in.vIndex].sample(Immut, in.vUV);
return out;
}

View File

@ -24,7 +24,7 @@ void main()
int i = vIndex;
int _59 = i + 10;
int _64 = i + 40;
FragColor = texture(sampler2D(uSamplers[nonuniformEXT(_59)], uSamps[nonuniformEXT(_64)]), vUV);
FragColor = texture(nonuniformEXT(sampler2D(uSamplers[_59], uSamps[_64])), vUV);
int _71 = i + 10;
FragColor = texture(uCombinedSamplers[nonuniformEXT(_71)], vUV);
int _77 = i + 20;

View File

@ -0,0 +1,15 @@
#version 450
#extension GL_EXT_nonuniform_qualifier : require
layout(set = 0, binding = 0) uniform texture2D uTex[];
layout(set = 1, binding = 0) uniform sampler Immut;
layout(location = 0) out vec4 FragColor;
layout(location = 1) flat in int vIndex;
layout(location = 0) in vec2 vUV;
void main()
{
FragColor = texture(nonuniformEXT(sampler2D(uTex[vIndex], Immut)), vUV);
}

View File

@ -0,0 +1,14 @@
#version 450
#extension GL_EXT_nonuniform_qualifier : require
layout(location = 0) out vec4 FragColor;
layout(location = 0) in vec2 vUV;
layout(location = 1) flat in int vIndex;
layout(set = 0, binding = 0) uniform texture2D uTex[];
layout(set = 1, binding = 0) uniform sampler Immut;
void main()
{
FragColor = texture(nonuniformEXT(sampler2D(uTex[vIndex], Immut)), vUV);
}

View File

@ -0,0 +1,14 @@
#version 450
#extension GL_EXT_nonuniform_qualifier : require
layout(location = 0) out vec4 FragColor;
layout(location = 0) in vec2 vUV;
layout(location = 1) flat in int vIndex;
layout(set = 0, binding = 0) uniform texture2D uTex[10];
layout(set = 1, binding = 0) uniform sampler Immut;
void main()
{
FragColor = texture(nonuniformEXT(sampler2D(uTex[vIndex], Immut)), vUV);
}

View File

@ -0,0 +1,14 @@
#version 450
#extension GL_EXT_nonuniform_qualifier : require
layout(location = 0) out vec4 FragColor;
layout(location = 0) in vec2 vUV;
layout(location = 1) flat in int vIndex;
layout(set = 0, binding = 0) uniform texture2D uTex[];
layout(set = 1, binding = 0) uniform sampler Immut;
void main()
{
FragColor = texture(nonuniformEXT(sampler2D(uTex[vIndex], Immut)), vUV);
}

View File

@ -6173,6 +6173,7 @@ std::string CompilerGLSL::to_texture_op(const Instruction &i, bool sparse, bool
bool gather = false;
bool proj = false;
bool fetch = false;
bool nonuniform_expression = false;
const uint32_t *opt = nullptr;
auto &result_type = get<SPIRType>(result_type_id);
@ -6181,7 +6182,17 @@ std::string CompilerGLSL::to_texture_op(const Instruction &i, bool sparse, bool
// Make sure non-uniform decoration is back-propagated to where it needs to be.
if (has_decoration(img, DecorationNonUniformEXT))
propagate_nonuniform_qualifier(img);
{
// In Vulkan GLSL, we cannot back-propgate nonuniform qualifiers if we
// use a combined image sampler constructor.
// We're only interested in back-propagating if we can trace back through access chains.
// If not, we will apply nonuniform to the sampled image expression itself.
auto *backing = maybe_get_backing_variable(img);
if (backing)
propagate_nonuniform_qualifier(img);
else
nonuniform_expression = true;
}
switch (op)
{
@ -6366,6 +6377,7 @@ std::string CompilerGLSL::to_texture_op(const Instruction &i, bool sparse, bool
args.sample = sample;
args.sparse_texel = sparse_texel_id;
args.min_lod = minlod;
args.nonuniform_expression = nonuniform_expression;
expr += to_function_args(args, forward);
expr += ")";
@ -6554,6 +6566,12 @@ string CompilerGLSL::to_function_args(const TextureFunctionArguments &args, bool
else
farg_str = to_expression(img);
if (args.nonuniform_expression && farg_str.find_first_of('[') != string::npos)
{
// Only emit nonuniformEXT() wrapper if the underlying expression is arrayed in some way.
farg_str = join(backend.nonuniform_qualifier, "(", farg_str, ")");
}
bool swizz_func = backend.swizzle_is_function;
auto swizzle = [swizz_func](uint32_t comps, uint32_t in_comps) -> const char * {
if (comps == in_comps)

View File

@ -405,6 +405,7 @@ protected:
uint32_t coord = 0, coord_components = 0, dref = 0;
uint32_t grad_x = 0, grad_y = 0, lod = 0, coffset = 0, offset = 0;
uint32_t bias = 0, component = 0, sample = 0, sparse_texel = 0, min_lod = 0;
bool nonuniform_expression = false;
};
virtual std::string to_function_args(const TextureFunctionArguments &args, bool *p_forward);