SPV: Use more correct SPV-Tools environment, partially addressing #2290
This commit is contained in:
parent
f881f08358
commit
a1a497ffe7
1 changed files with 2 additions and 2 deletions
|
|
@ -165,7 +165,7 @@ void SpirvToolsValidate(const glslang::TIntermediate& intermediate, std::vector<
|
||||||
void SpirvToolsTransform(const glslang::TIntermediate& intermediate, std::vector<unsigned int>& spirv,
|
void SpirvToolsTransform(const glslang::TIntermediate& intermediate, std::vector<unsigned int>& spirv,
|
||||||
spv::SpvBuildLogger* logger, const SpvOptions* options)
|
spv::SpvBuildLogger* logger, const SpvOptions* options)
|
||||||
{
|
{
|
||||||
spv_target_env target_env = SPV_ENV_UNIVERSAL_1_2;
|
spv_target_env target_env = MapToSpirvToolsEnv(intermediate.getSpv(), logger);
|
||||||
|
|
||||||
spvtools::Optimizer optimizer(target_env);
|
spvtools::Optimizer optimizer(target_env);
|
||||||
optimizer.SetMessageConsumer(OptimizerMesssageConsumer);
|
optimizer.SetMessageConsumer(OptimizerMesssageConsumer);
|
||||||
|
|
@ -223,7 +223,7 @@ void SpirvToolsTransform(const glslang::TIntermediate& intermediate, std::vector
|
||||||
void SpirvToolsStripDebugInfo(const glslang::TIntermediate& intermediate,
|
void SpirvToolsStripDebugInfo(const glslang::TIntermediate& intermediate,
|
||||||
std::vector<unsigned int>& spirv, spv::SpvBuildLogger* logger)
|
std::vector<unsigned int>& spirv, spv::SpvBuildLogger* logger)
|
||||||
{
|
{
|
||||||
spv_target_env target_env = SPV_ENV_UNIVERSAL_1_2;
|
spv_target_env target_env = MapToSpirvToolsEnv(intermediate.getSpv(), logger);
|
||||||
|
|
||||||
spvtools::Optimizer optimizer(target_env);
|
spvtools::Optimizer optimizer(target_env);
|
||||||
optimizer.SetMessageConsumer(OptimizerMesssageConsumer);
|
optimizer.SetMessageConsumer(OptimizerMesssageConsumer);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue