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

Run format_all.sh.

Browse Source
This commit is contained in:
Hans-Kristian Arntzen 2018-01-04 12:15:55 +01:00
parent ec1180f198
commit d9c0948a9c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spirv_hlsl.cpp
View File

@ -2340,23 +2340,26 @@ void CompilerHLSL::emit_modern_uniform(const SPIRVariable &var)
case SPIRType::SampledImage: case SPIRType::SampledImage:
case SPIRType::Image: case SPIRType::Image:
{ {
statement(image_type_hlsl_modern(type), " ", to_name(var.self), type_to_array_glsl(type), to_resource_binding(var), ";"); statement(image_type_hlsl_modern(type), " ", to_name(var.self), type_to_array_glsl(type),
to_resource_binding(var), ";");
if (type.basetype == SPIRType::SampledImage && type.image.dim != DimBuffer) if (type.basetype == SPIRType::SampledImage && type.image.dim != DimBuffer)
{ {
// For combined image samplers, also emit a combined image sampler. // For combined image samplers, also emit a combined image sampler.
if (type.image.depth) if (type.image.depth)
statement("SamplerComparisonState ", to_sampler_expression(var.self), type_to_array_glsl(type), to_resource_binding_sampler(var), statement("SamplerComparisonState ", to_sampler_expression(var.self), type_to_array_glsl(type),
";"); to_resource_binding_sampler(var), ";");
else else
statement("SamplerState ", to_sampler_expression(var.self), type_to_array_glsl(type), to_resource_binding_sampler(var), ";"); statement("SamplerState ", to_sampler_expression(var.self), type_to_array_glsl(type),
to_resource_binding_sampler(var), ";");
} }
break; break;
} }
case SPIRType::Sampler: case SPIRType::Sampler:
if (comparison_samplers.count(var.self)) if (comparison_samplers.count(var.self))
statement("SamplerComparisonState ", to_name(var.self), type_to_array_glsl(type), to_resource_binding(var), ";"); statement("SamplerComparisonState ", to_name(var.self), type_to_array_glsl(type), to_resource_binding(var),
";");
else else
statement("SamplerState ", to_name(var.self), type_to_array_glsl(type), to_resource_binding(var), ";"); statement("SamplerState ", to_name(var.self), type_to_array_glsl(type), to_resource_binding(var), ";");
break; break;