From f383cc98f22944f2f17a0c42fa6bf6bd21551080 Mon Sep 17 00:00:00 2001
From: Hans-Kristian Arntzen <post@arntzen-software.no>
Date: Mon, 8 Jun 2020 13:39:02 +0200
Subject: [PATCH] GLSL: Handle the rest of GL_ARB_sparse_texture_clamp.

Missed these in initial sparse implementation.
---
 .../frag/sparse-texture-clamp.desktop.frag    | 46 +++++++++++++++++++
 .../frag/sparse-texture-clamp.desktop.frag    | 23 ++++++++++
 spirv_glsl.cpp                                |  6 ++-
 3 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 reference/shaders-no-opt/frag/sparse-texture-clamp.desktop.frag
 create mode 100644 shaders-no-opt/frag/sparse-texture-clamp.desktop.frag

diff --git a/reference/shaders-no-opt/frag/sparse-texture-clamp.desktop.frag b/reference/shaders-no-opt/frag/sparse-texture-clamp.desktop.frag
new file mode 100644
index 00000000..df0daa79
--- /dev/null
+++ b/reference/shaders-no-opt/frag/sparse-texture-clamp.desktop.frag
@@ -0,0 +1,46 @@
+#version 450
+#extension GL_ARB_sparse_texture2 : require
+#extension GL_ARB_sparse_texture_clamp : require
+
+struct ResType
+{
+    int _m0;
+    vec4 _m1;
+};
+
+layout(binding = 0) uniform sampler2D uSamp;
+
+layout(location = 0) in vec2 vUV;
+
+void main()
+{
+    int _66;
+    vec4 _67;
+    _66 = sparseTextureClampARB(uSamp, vUV, 1.0, _67, 2.0);
+    ResType _25 = ResType(_66, _67);
+    vec4 texel = _25._m1;
+    int code = _25._m0;
+    texel = textureClampARB(uSamp, vUV, 1.0, 2.0);
+    int _68;
+    vec4 _69;
+    _68 = sparseTextureOffsetClampARB(uSamp, vUV, ivec2(1, 2), 1.0, _69, 2.0);
+    ResType _37 = ResType(_68, _69);
+    texel = _37._m1;
+    code = _37._m0;
+    texel = textureOffsetClampARB(uSamp, vUV, ivec2(1, 2), 1.0, 2.0);
+    int _70;
+    vec4 _71;
+    _70 = sparseTextureGradClampARB(uSamp, vUV, vec2(1.0), vec2(2.0), 1.0, _71);
+    ResType _47 = ResType(_70, _71);
+    texel = _47._m1;
+    code = _47._m0;
+    texel = textureGradClampARB(uSamp, vUV, vec2(1.0), vec2(2.0), 1.0);
+    int _72;
+    vec4 _73;
+    _72 = sparseTextureGradOffsetClampARB(uSamp, vUV, vec2(1.0), vec2(2.0), ivec2(-1, -2), 1.0, _73);
+    ResType _58 = ResType(_72, _73);
+    texel = _58._m1;
+    code = _58._m0;
+    texel = textureGradOffsetClampARB(uSamp, vUV, vec2(1.0), vec2(2.0), ivec2(-1, -2), 1.0);
+}
+
diff --git a/shaders-no-opt/frag/sparse-texture-clamp.desktop.frag b/shaders-no-opt/frag/sparse-texture-clamp.desktop.frag
new file mode 100644
index 00000000..880e67e5
--- /dev/null
+++ b/shaders-no-opt/frag/sparse-texture-clamp.desktop.frag
@@ -0,0 +1,23 @@
+#version 450
+#extension GL_ARB_sparse_texture2 : require
+#extension GL_ARB_sparse_texture_clamp : require
+
+layout(set = 0, binding = 0) uniform sampler2D uSamp;
+layout(location = 0) out vec4 FragColor;
+layout(location = 0) in vec2 vUV;
+
+void main()
+{
+	vec4 texel;
+	int code;
+
+	code = sparseTextureClampARB(uSamp, vUV, 1.0, texel, 2.0);
+	texel = textureClampARB(uSamp, vUV, 1.0, 2.0);
+	code = sparseTextureOffsetClampARB(uSamp, vUV, ivec2(1, 2), 1.0, texel, 2.0);
+	texel = textureOffsetClampARB(uSamp, vUV, ivec2(1, 2), 1.0, 2.0);
+	code = sparseTextureGradClampARB(uSamp, vUV, vec2(1.0), vec2(2.0), 1.0, texel);
+	texel = textureGradClampARB(uSamp, vUV, vec2(1.0), vec2(2.0), 1.0);
+	code = sparseTextureGradOffsetClampARB(uSamp, vUV, vec2(1.0), vec2(2.0), ivec2(-1, -2), 1.0, texel);
+	texel = textureGradOffsetClampARB(uSamp, vUV, vec2(1.0), vec2(2.0), ivec2(-1, -2), 1.0);
+}
+
diff --git a/spirv_glsl.cpp b/spirv_glsl.cpp
index 487b5763..ab302698 100644
--- a/spirv_glsl.cpp
+++ b/spirv_glsl.cpp
@@ -5698,7 +5698,6 @@ string CompilerGLSL::to_function_name(const TextureFunctionNameArguments &args)
 		if (options.es)
 			SPIRV_CROSS_THROW("Sparse residency is not supported in ESSL.");
 		require_extension_internal("GL_ARB_sparse_texture_clamp");
-		return "sparseTextureClampARB";
 	}
 
 	string fname;
@@ -5745,7 +5744,10 @@ string CompilerGLSL::to_function_name(const TextureFunctionNameArguments &args)
 	if (args.has_offset)
 		fname += "Offset";
 
-	if (args.is_sparse_feedback)
+	if (args.has_min_lod)
+		fname += "Clamp";
+
+	if (args.is_sparse_feedback || args.has_min_lod)
 		fname += "ARB";
 
 	return is_legacy() ? legacy_tex_op(fname, imgtype, args.lod, tex) : fname;