address more review comments

This commit is contained in:
Frédéric Wang 2022-06-23 11:40:02 +02:00
parent 1310f5ba4d
commit 9c44a97faa
2 changed files with 8 additions and 4 deletions

View File

@ -5213,7 +5213,7 @@ string CompilerGLSL::constant_expression(const SPIRConstant &c, bool inside_bloc
}
}
#ifdef _WIN32
#ifdef _MSC_VER
// snprintf does not exist or is buggy on older MSVC versions, some of them
// being used by MinGW. Use sprintf instead and disable corresponding warning.
#pragma warning(push)
@ -5408,7 +5408,7 @@ std::string CompilerGLSL::convert_double_to_string(const SPIRConstant &c, uint32
return res;
}
#ifdef _WIN32
#ifdef _MSC_VER
#pragma warning(pop)
#endif

View File

@ -16405,16 +16405,20 @@ void CompilerMSL::emit_block_hints(const SPIRBlock &)
string CompilerMSL::additional_fixed_sample_mask_str() const
{
char print_buffer[32];
#ifdef _WIN32
#ifdef _MSC_VER
// snprintf does not exist or is buggy on older MSVC versions, some of
// them being used by MinGW. Use sprintf instead and disable
// corresponding warning.
#pragma warning(push)
#pragma warning(disable : 4996)
#endif
#if _WIN32
sprintf(print_buffer, "0x%x", msl_options.additional_fixed_sample_mask);
#pragma warning(pop)
#else
snprintf(print_buffer, sizeof(print_buffer), "0x%x", msl_options.additional_fixed_sample_mask);
#endif
#ifdef _MSC_VER
#pragma warning(pop)
#endif
return print_buffer;
}