AuroraMiddleware/SPIRV-Cross-Vulnerable
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Cross.git synced 2024-11-15 16:30:08 +00:00
Code Issues Projects Releases Wiki Activity

Use is_sampled_image_type() elsewhere.

Browse Source
This commit is contained in:
Chip Davis 2018-09-24 12:33:11 -05:00
parent 8855ea0a3e
commit db7a40ce77
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spirv_msl.cpp
View File

@ -589,9 +589,7 @@ void CompilerMSL::extract_global_variables_from_function(uint32_t func_id, std::
added_arg_ids.insert(builtin_frag_coord_id);
}
if (msl_options.swizzle_texture_samples &&
(type.basetype == SPIRType::Image || type.basetype == SPIRType::SampledImage) &&
type.image.sampled == 1 && type.image.dim != DimBuffer)
if (msl_options.swizzle_texture_samples && is_sampled_image_type(type))
{
// Implicitly reads spvAuxBuffer.
assert(aux_buffer_id != 0);
@ -2881,8 +2879,7 @@ string CompilerMSL::to_function_name(uint32_t img, const SPIRType &imgtype, bool
// Texture reference
string fname = to_expression(img) + ".";
if (msl_options.swizzle_texture_samples && !is_gather && imgtype.image.sampled == 1 &&
imgtype.image.dim != DimBuffer)
if (msl_options.swizzle_texture_samples && !is_gather && is_sampled_image_type(imgtype))
fname = "spvTextureSwizzle(" + fname;
// Texture function and sampler
@ -3164,7 +3161,7 @@ string CompilerMSL::to_function_args(uint32_t img, const SPIRType &imgtype, bool
farg_str += to_expression(sample);
}
if (msl_options.swizzle_texture_samples && imgtype.image.sampled == 1 && imgtype.image.dim != DimBuffer &&
if (msl_options.swizzle_texture_samples && is_sampled_image_type(imgtype) &&
(!is_gather || !imgtype.image.depth))
{
// Add the swizzle constant from the swizzle buffer.