mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change --hlsl-sampled-textures to --auto-sampled-textures

Browse Source
This commit is contained in:
Greg Fischer 2021-04-21 16:49:53 -06:00
parent 219b7b9f72
commit ebfca6099f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
StandAlone/StandAlone.cpp
View File

@ -111,7 +111,7 @@ bool NaNClamp = false;
bool stripDebugInfo = false; bool stripDebugInfo = false;
bool beQuiet = false; bool beQuiet = false;
bool VulkanRulesRelaxed = false; bool VulkanRulesRelaxed = false;
bool hlslSampledTextures = false; bool autoSampledTextures = false;
// //
// Return codes from main/exit(). // Return codes from main/exit().
@ -656,8 +656,8 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
HlslEnable16BitTypes = true; HlslEnable16BitTypes = true;
} else if (lowerword == "hlsl-dx9-compatible") { } else if (lowerword == "hlsl-dx9-compatible") {
HlslDX9compatible = true; HlslDX9compatible = true;
} else if (lowerword == "hlsl-sampled-textures") { } else if (lowerword == "auto-sampled-textures") {
hlslSampledTextures = true; autoSampledTextures = true;
} else if (lowerword == "invert-y" || // synonyms } else if (lowerword == "invert-y" || // synonyms
lowerword == "iy") { lowerword == "iy") {
Options |= EOptionInvertY; Options |= EOptionInvertY;
@ -1192,7 +1192,7 @@ void CompileAndLinkShaderUnits(std::vector<ShaderCompUnit> compUnits)
shader->setNoStorageFormat((Options & EOptionNoStorageFormat) != 0); shader->setNoStorageFormat((Options & EOptionNoStorageFormat) != 0);
shader->setResourceSetBinding(baseResourceSetBinding[compUnit.stage]); shader->setResourceSetBinding(baseResourceSetBinding[compUnit.stage]);
if (hlslSampledTextures) if (autoSampledTextures)
shader->setTextureSamplerTransformMode(EShTexSampTransUpgradeTextureRemoveSampler); shader->setTextureSamplerTransformMode(EShTexSampTransUpgradeTextureRemoveSampler);
if (Options & EOptionAutoMapBindings) if (Options & EOptionAutoMapBindings)