AuroraMiddleware/SPIRV-Cross
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add test for texelFetch without sampler.

Browse Source
This commit is contained in:
Hans-Kristian Arntzen 2018-02-21 13:43:16 +01:00
parent 4db7061dd1
commit 1a2e4de7a5
9 changed files with 304 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main.cpp
View File

@ -733,6 +733,7 @@ static int main_inner(int argc, char *argv[])
unique_ptr<CompilerGLSL> compiler;
bool combined_image_samplers = false;
bool build_dummy_sampler = false;
if (args.cpp)
{
@ -755,6 +756,7 @@ static int main_inner(int argc, char *argv[])
else
{
combined_image_samplers = !args.vulkan_semantics;
build_dummy_sampler = true;
compiler = unique_ptr<CompilerGLSL>(new CompilerGLSL(read_spirv_file(args.input)));
}
@ -820,6 +822,9 @@ static int main_inner(int argc, char *argv[])
hlsl->set_options(hlsl_opts);
}
if (build_dummy_sampler)
compiler->build_dummy_sampler_for_combined_images();
ShaderResources res;
if (args.remove_unused)
{
@ -878,7 +883,6 @@ static int main_inner(int argc, char *argv[])
if (combined_image_samplers)
{
compiler->build_dummy_sampler_for_combined_images();
compiler->build_combined_image_samplers();
// Give the remapped combined samplers new names.
for (auto &remap : compiler->get_combined_image_samplers())

13
reference/opt/shaders/asm/frag/image-fetch-no-sampler.asm.vk.frag Normal file
View File

@ -0,0 +1,13 @@
#version 450
uniform sampler2D SPIRV_Cross_CombinedSampledImageSPIRV_Cross_DummySampler;
uniform sampler2D SPIRV_Cross_CombinedSampledImageSampler;
layout(location = 0) out vec4 _entryPointOutput;
void main()
{
ivec3 _122 = ivec3(int(gl_FragCoord.x * 1280.0), int(gl_FragCoord.y * 720.0), 0);
_entryPointOutput = ((texelFetch(SPIRV_Cross_CombinedSampledImageSPIRV_Cross_DummySampler, _122.xy, 0) + texelFetch(SPIRV_Cross_CombinedSampledImageSPIRV_Cross_DummySampler, _122.xy, 0)) + texture(SPIRV_Cross_CombinedSampledImageSampler, gl_FragCoord.xy)) + texture(SPIRV_Cross_CombinedSampledImageSampler, gl_FragCoord.xy);
}

14
reference/opt/shaders/asm/frag/image-fetch-no-sampler.asm.vk.frag.vk Normal file
View File

@ -0,0 +1,14 @@
#version 450
layout(set = 0, binding = 0) uniform sampler Sampler;
layout(set = 0, binding = 0) uniform texture2D SampledImage;
uniform sampler SPIRV_Cross_DummySampler;
layout(location = 0) out vec4 _entryPointOutput;
void main()
{
ivec3 _122 = ivec3(int(gl_FragCoord.x * 1280.0), int(gl_FragCoord.y * 720.0), 0);
_entryPointOutput = ((texelFetch(sampler2D(SampledImage, SPIRV_Cross_DummySampler), _122.xy, 0) + texelFetch(sampler2D(SampledImage, SPIRV_Cross_DummySampler), _122.xy, 0)) + texture(sampler2D(SampledImage, Sampler), gl_FragCoord.xy)) + texture(sampler2D(SampledImage, Sampler), gl_FragCoord.xy);
}

38
reference/shaders/asm/frag/image-fetch-no-sampler.asm.vk.frag Normal file
View File

@ -0,0 +1,38 @@
#version 450
uniform sampler2D SPIRV_Cross_CombinedparamSPIRV_Cross_DummySampler;
uniform sampler2D SPIRV_Cross_CombinedSampledImageSPIRV_Cross_DummySampler;
uniform sampler2D SPIRV_Cross_CombinedparamSampler;
uniform sampler2D SPIRV_Cross_CombinedSampledImageSampler;
layout(location = 0) out vec4 _entryPointOutput;
vec4 sample_fetch(ivec3 UV, sampler2D SPIRV_Cross_CombinedtexSPIRV_Cross_DummySampler)
{
return texelFetch(SPIRV_Cross_CombinedtexSPIRV_Cross_DummySampler, UV.xy, UV.z);
}
vec4 sample_sampler(vec2 UV, sampler2D SPIRV_Cross_CombinedtexSampler)
{
return texture(SPIRV_Cross_CombinedtexSampler, UV);
}
vec4 _main(vec4 xIn)
{
ivec3 coord = ivec3(int(xIn.x * 1280.0), int(xIn.y * 720.0), 0);
ivec3 param = coord;
vec4 value = sample_fetch(param, SPIRV_Cross_CombinedparamSPIRV_Cross_DummySampler);
value += texelFetch(SPIRV_Cross_CombinedSampledImageSPIRV_Cross_DummySampler, coord.xy, coord.z);
vec2 param_1 = xIn.xy;
value += sample_sampler(param_1, SPIRV_Cross_CombinedparamSampler);
value += texture(SPIRV_Cross_CombinedSampledImageSampler, xIn.xy);
return value;
}
void main()
{
vec4 xIn = gl_FragCoord;
vec4 param = xIn;
_entryPointOutput = _main(param);
}

37
reference/shaders/asm/frag/image-fetch-no-sampler.asm.vk.frag.vk Normal file
View File

@ -0,0 +1,37 @@
#version 450
layout(set = 0, binding = 0) uniform sampler Sampler;
layout(set = 0, binding = 0) uniform texture2D SampledImage;
uniform sampler SPIRV_Cross_DummySampler;
layout(location = 0) out vec4 _entryPointOutput;
vec4 sample_fetch(texture2D tex, ivec3 UV)
{
return texelFetch(sampler2D(tex, SPIRV_Cross_DummySampler), UV.xy, UV.z);
}
vec4 sample_sampler(texture2D tex, vec2 UV)
{
return texture(sampler2D(tex, Sampler), UV);
}
vec4 _main(vec4 xIn)
{
ivec3 coord = ivec3(int(xIn.x * 1280.0), int(xIn.y * 720.0), 0);
ivec3 param = coord;
vec4 value = sample_fetch(SampledImage, param);
value += texelFetch(sampler2D(SampledImage, SPIRV_Cross_DummySampler), coord.xy, coord.z);
vec2 param_1 = xIn.xy;
value += sample_sampler(SampledImage, param_1);
value += texture(sampler2D(SampledImage, Sampler), xIn.xy);
return value;
}
void main()
{
vec4 xIn = gl_FragCoord;
vec4 param = xIn;
_entryPointOutput = _main(param);
}

163
shaders/asm/frag/image-fetch-no-sampler.asm.vk.frag Normal file
View File

@ -0,0 +1,163 @@
; SPIR-V
; Version: 1.0
; Generator: Khronos Glslang Reference Front End; 2
; Bound: 113
; Schema: 0
OpCapability Shader
%1 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %main "main" %xIn_1 %_entryPointOutput
OpExecutionMode %main OriginUpperLeft
OpSource HLSL 500
OpName %main "main"
OpName %sample_fetch_t21_vi3_ "sample_fetch(t21;vi3;"
OpName %tex "tex"
OpName %UV "UV"
OpName %sample_sampler_t21_vf2_ "sample_sampler(t21;vf2;"
OpName %tex_0 "tex"
OpName %UV_0 "UV"
OpName %_main_vf4_ "@main(vf4;"
OpName %xIn "xIn"
OpName %Sampler "Sampler"
OpName %coord "coord"
OpName %value "value"
OpName %SampledImage "SampledImage"
OpName %param "param"
OpName %param_0 "param"
OpName %param_1 "param"
OpName %param_2 "param"
OpName %xIn_0 "xIn"
OpName %xIn_1 "xIn"
OpName %_entryPointOutput "@entryPointOutput"
OpName %param_3 "param"
OpDecorate %Sampler DescriptorSet 0
OpDecorate %Sampler Binding 0
OpDecorate %SampledImage DescriptorSet 0
OpDecorate %SampledImage Binding 0
OpDecorate %xIn_1 BuiltIn FragCoord
OpDecorate %_entryPointOutput Location 0
%void = OpTypeVoid
%3 = OpTypeFunction %void
%float = OpTypeFloat 32
%7 = OpTypeImage %float 2D 0 0 0 1 Unknown
%_ptr_Function_7 = OpTypePointer Function %7
%int = OpTypeInt 32 1
%v3int = OpTypeVector %int 3
%_ptr_Function_v3int = OpTypePointer Function %v3int
%v4float = OpTypeVector %float 4
%13 = OpTypeFunction %v4float %_ptr_Function_7 %_ptr_Function_v3int
%v2float = OpTypeVector %float 2
%_ptr_Function_v2float = OpTypePointer Function %v2float
%20 = OpTypeFunction %v4float %_ptr_Function_7 %_ptr_Function_v2float
%_ptr_Function_v4float = OpTypePointer Function %v4float
%26 = OpTypeFunction %v4float %_ptr_Function_v4float
%v2int = OpTypeVector %int 2
%uint = OpTypeInt 32 0
%uint_2 = OpConstant %uint 2
%_ptr_Function_int = OpTypePointer Function %int
%43 = OpTypeSampler
%_ptr_UniformConstant_43 = OpTypePointer UniformConstant %43
%Sampler = OpVariable %_ptr_UniformConstant_43 UniformConstant
%47 = OpTypeSampledImage %7
%uint_0 = OpConstant %uint 0
%_ptr_Function_float = OpTypePointer Function %float
%float_1280 = OpConstant %float 1280
%uint_1 = OpConstant %uint 1
%float_720 = OpConstant %float 720
%int_0 = OpConstant %int 0
%_ptr_UniformConstant_7 = OpTypePointer UniformConstant %7
%SampledImage = OpVariable %_ptr_UniformConstant_7 UniformConstant
%_ptr_Input_v4float = OpTypePointer Input %v4float
%xIn_1 = OpVariable %_ptr_Input_v4float Input
%_ptr_Output_v4float = OpTypePointer Output %v4float
%_entryPointOutput = OpVariable %_ptr_Output_v4float Output
%main = OpFunction %void None %3
%5 = OpLabel
%xIn_0 = OpVariable %_ptr_Function_v4float Function
%param_3 = OpVariable %_ptr_Function_v4float Function
%107 = OpLoad %v4float %xIn_1
OpStore %xIn_0 %107
%111 = OpLoad %v4float %xIn_0
OpStore %param_3 %111
%112 = OpFunctionCall %v4float %_main_vf4_ %param_3
OpStore %_entryPointOutput %112
OpReturn
OpFunctionEnd
%sample_fetch_t21_vi3_ = OpFunction %v4float None %13
%tex = OpFunctionParameter %_ptr_Function_7
%UV = OpFunctionParameter %_ptr_Function_v3int
%17 = OpLabel
%30 = OpLoad %7 %tex
%32 = OpLoad %v3int %UV
%33 = OpVectorShuffle %v2int %32 %32 0 1
%37 = OpAccessChain %_ptr_Function_int %UV %uint_2
%38 = OpLoad %int %37
%39 = OpImageFetch %v4float %30 %33 Lod %38
OpReturnValue %39
OpFunctionEnd
%sample_sampler_t21_vf2_ = OpFunction %v4float None %20
%tex_0 = OpFunctionParameter %_ptr_Function_7
%UV_0 = OpFunctionParameter %_ptr_Function_v2float
%24 = OpLabel
%42 = OpLoad %7 %tex_0
%46 = OpLoad %43 %Sampler
%48 = OpSampledImage %47 %42 %46
%49 = OpLoad %v2float %UV_0
%50 = OpImageSampleImplicitLod %v4float %48 %49
OpReturnValue %50
OpFunctionEnd
%_main_vf4_ = OpFunction %v4float None %26
%xIn = OpFunctionParameter %_ptr_Function_v4float
%29 = OpLabel
%coord = OpVariable %_ptr_Function_v3int Function
%value = OpVariable %_ptr_Function_v4float Function
%param = OpVariable %_ptr_Function_7 Function
%param_0 = OpVariable %_ptr_Function_v3int Function
%param_1 = OpVariable %_ptr_Function_7 Function
%param_2 = OpVariable %_ptr_Function_v2float Function
%56 = OpAccessChain %_ptr_Function_float %xIn %uint_0
%57 = OpLoad %float %56
%59 = OpFMul %float %57 %float_1280
%60 = OpConvertFToS %int %59
%62 = OpAccessChain %_ptr_Function_float %xIn %uint_1
%63 = OpLoad %float %62
%65 = OpFMul %float %63 %float_720
%66 = OpConvertFToS %int %65
%68 = OpCompositeConstruct %v3int %60 %66 %int_0
OpStore %coord %68
%73 = OpLoad %7 %SampledImage
OpStore %param %73
%75 = OpLoad %v3int %coord
OpStore %param_0 %75
%76 = OpFunctionCall %v4float %sample_fetch_t21_vi3_ %param %param_0
OpStore %value %76
%77 = OpLoad %7 %SampledImage
%78 = OpLoad %v3int %coord
%79 = OpVectorShuffle %v2int %78 %78 0 1
%80 = OpAccessChain %_ptr_Function_int %coord %uint_2
%81 = OpLoad %int %80
%82 = OpImageFetch %v4float %77 %79 Lod %81
%83 = OpLoad %v4float %value
%84 = OpFAdd %v4float %83 %82
OpStore %value %84
%86 = OpLoad %7 %SampledImage
OpStore %param_1 %86
%88 = OpLoad %v4float %xIn
%89 = OpVectorShuffle %v2float %88 %88 0 1
OpStore %param_2 %89
%90 = OpFunctionCall %v4float %sample_sampler_t21_vf2_ %param_1 %param_2
%91 = OpLoad %v4float %value
%92 = OpFAdd %v4float %91 %90
OpStore %value %92
%93 = OpLoad %7 %SampledImage
%94 = OpLoad %43 %Sampler
%95 = OpSampledImage %47 %93 %94
%96 = OpLoad %v4float %xIn
%97 = OpVectorShuffle %v2float %96 %96 0 1
%98 = OpImageSampleImplicitLod %v4float %95 %97
%99 = OpLoad %v4float %value
%100 = OpFAdd %v4float %99 %98
OpStore %value %100
%101 = OpLoad %v4float %value
OpReturnValue %101
OpFunctionEnd

6
spirv_cross.cpp
View File

@ -646,6 +646,11 @@ unordered_set<uint32_t> Compiler::get_active_interface_variables() const
unordered_set<uint32_t> variables;
InterfaceVariableAccessHandler handler(*this, variables);
traverse_all_reachable_opcodes(get<SPIRFunction>(entry_point), handler);
// If we needed to create one, we'll need it.
if (dummy_sampler_id)
variables.insert(dummy_sampler_id);
return variables;
}
@ -3073,6 +3078,7 @@ uint32_t Compiler::build_dummy_sampler_for_combined_images()
ptr_sampler = sampler;
ptr_sampler.self = type_id;
ptr_sampler.storage = StorageClassUniformConstant;
ptr_sampler.pointer = true;
set<SPIRVariable>(var_id, ptr_type_id, StorageClassUniformConstant, 0);
set_name(var_id, "SPIRV_Cross_DummySampler");

2
spirv_cross.hpp
View File

@ -326,6 +326,8 @@ public:
// is required.
//
// If the returned ID is non-zero, it can be decorated with set/bindings as desired before calling compile().
// Calling this function also invalidates get_active_interface_variables(), so this should be called
// before that function.
uint32_t build_dummy_sampler_for_combined_images();
// Analyzes all separate image and samplers used from the currently selected entry point,

27
spirv_glsl.cpp
View File

@ -3485,13 +3485,38 @@ string CompilerGLSL::to_function_name(uint32_t, const SPIRType &imgtype, bool is
}
// Returns the function args for a texture sampling function for the specified image and sampling characteristics.
string CompilerGLSL::to_function_args(uint32_t img, const SPIRType &imgtype, bool, bool, bool is_proj, uint32_t coord,
string CompilerGLSL::to_function_args(uint32_t img, const SPIRType &imgtype, bool is_fetch, bool, bool is_proj, uint32_t coord,
uint32_t coord_components, uint32_t dref, uint32_t grad_x, uint32_t grad_y,
uint32_t lod, uint32_t coffset, uint32_t offset, uint32_t bias, uint32_t comp,
uint32_t sample, bool *p_forward)
{
string farg_str = to_expression(img);
if (is_fetch)
{
auto *var = maybe_get_backing_variable(img);
// If we are fetching from a plain OpTypeImage, we must combine with a dummy sampler.
if (var)
{
auto &type = get<SPIRType>(var->basetype);
if (type.basetype == SPIRType::Image && type.image.sampled == 1 && type.image.dim != DimBuffer)
{
if (!dummy_sampler_id)
SPIRV_CROSS_THROW("Cannot find dummy sampler ID. Was build_dummy_sampler_for_combined_images() called?");
if (options.vulkan_semantics)
{
auto sampled_type = imgtype;
sampled_type.basetype = SPIRType::SampledImage;
farg_str = join(type_to_glsl(sampled_type), "(", to_expression(img), ", ", to_expression(dummy_sampler_id), ")");
}
else
farg_str = to_combined_image_sampler(img, dummy_sampler_id);
}
}
}
bool swizz_func = backend.swizzle_is_function;
auto swizzle = [swizz_func](uint32_t comps, uint32_t in_comps) -> const char * {
if (comps == in_comps)