From 219b7b9f72930f7296a8a9e96e562e7dd66b88a7 Mon Sep 17 00:00:00 2001
From: Robin Quint <rob2309@hotmail.de>
Date: Tue, 20 Apr 2021 07:58:36 +0200
Subject: [PATCH 1/2] Exposed #856 as --hlsl-sampled-textures in the StandAlone

---
 StandAlone/StandAlone.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

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

From ebfca6099f2cfe1693afe2abd9c229c853631c25 Mon Sep 17 00:00:00 2001
From: Greg Fischer <greg@lunarg.com>
Date: Wed, 21 Apr 2021 16:49:53 -0600
Subject: [PATCH 2/2] Change --hlsl-sampled-textures to --auto-sampled-textures

---
 StandAlone/StandAlone.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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