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

Merge pull request #2616 from Rob2309/standalone-hlsl-sampled-textures

Browse Source 
Exposed #856 as --hlsl-sampled-textures in the StandAlone
This commit is contained in:
Greg Fischer 2021-04-21 18:17:42 -06:00 committed by GitHub
commit 7f46558b8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
StandAlone/StandAlone.cpp
View File

@ -112,6 +112,7 @@ bool NaNClamp = false;
bool stripDebugInfo = false; bool stripDebugInfo = false;
bool beQuiet = false; bool beQuiet = false;
bool VulkanRulesRelaxed = false; bool VulkanRulesRelaxed = false;
bool autoSampledTextures = false;
// //
// Return codes from main/exit(). // Return codes from main/exit().
@ -657,6 +658,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 == "auto-sampled-textures") {
autoSampledTextures = true;
} else if (lowerword == "invert-y" || // synonyms } else if (lowerword == "invert-y" || // synonyms
lowerword == "iy") { lowerword == "iy") {
Options |= EOptionInvertY; Options |= EOptionInvertY;
@ -1222,6 +1225,9 @@ 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 (autoSampledTextures)
shader->setTextureSamplerTransformMode(EShTexSampTransUpgradeTextureRemoveSampler);
if (Options & EOptionAutoMapBindings) if (Options & EOptionAutoMapBindings)
shader->setAutoMapBindings(true); shader->setAutoMapBindings(true);