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

Update HLSL test results

Browse Source
This commit is contained in:
Robert Konrad 2017-04-18 15:17:55 +02:00
parent 15807a6036
commit be4c919d08
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
reference/shaders-hlsl/frag/basic.frag
View File

@ -1,4 +1,5 @@
uniform sampler2D uTex;
Texture2D<float4> uTex;
SamplerState _uTex_sampler;
static float4 FragColor;
static float4 vColor;
@ -17,7 +18,7 @@ struct SPIRV_Cross_Output
void frag_main()
{
FragColor = vColor * tex2D(uTex, vTex);
FragColor = vColor * uTex.Sample(_uTex_sampler, vTex);
}
SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)

4
spirv_hlsl.cpp
View File

@ -1146,7 +1146,7 @@ void CompilerHLSL::emit_texture_op(const Instruction &i)
expr += to_expression(img);
if (options.shader_model >= 40)
{
expr += "_sample";
expr += "_sampler";
}
bool swizz_func = backend.swizzle_is_function;
@ -1276,7 +1276,7 @@ void CompilerHLSL::emit_uniform(const SPIRVariable &var)
if (options.shader_model >= 40 && (type.basetype == SPIRType::Image || type.basetype == SPIRType::SampledImage))
{
statement("Texture2D<float4> ", to_name(var.self), ";");
statement("SamplerState _", to_name(var.self), "_sample;");
statement("SamplerState _", to_name(var.self), "_sampler;");
}
else
{