Merge pull request #148 from Kode/fix

Prefer plain texture2D in legacy es vertex shaders

reference/shaders/legacy/fragment/explicit-lod.legacy.frag

@@ -0,0 +1,12 @@
+#version 100
+#extension GL_EXT_shader_texture_lod : require
+precision mediump float;
+precision highp int;
+
+uniform mediump sampler2D tex;
+
+void main()
+{
+    gl_FragData[0] = texture2DLodEXT(tex, vec2(0.4000000059604644775390625, 0.60000002384185791015625), 0.0);
+}
+

reference/shaders/legacy/vert/implicit-lod.legacy.vert

@@ -0,0 +1,9 @@
+#version 100
+
+uniform mediump sampler2D tex;
+
+void main()
+{
+    gl_Position = texture2D(tex, vec2(0.4000000059604644775390625, 0.60000002384185791015625));
+}
+

shaders/legacy/fragment/explicit-lod.legacy.frag

@@ -0,0 +1,12 @@
+#version 310 es
+
+precision mediump float;
+
+uniform sampler2D tex;
+
+layout(location = 0) out vec4 FragColor;
+
+void main()
+{
+	FragColor = textureLod(tex, vec2(0.4, 0.6), 0.0);
+}

shaders/legacy/vert/implicit-lod.legacy.vert

@@ -0,0 +1,8 @@
+#version 310 es
+
+uniform sampler2D tex;
+
+void main()
+{
+	gl_Position = texture(tex, vec2(0.4, 0.6));
+}

spirv_glsl.cpp

@@ -2409,7 +2409,26 @@ void CompilerGLSL::emit_quaternary_func_op(uint32_t result_type, uint32_t result
 	inherit_expression_dependencies(result_id, op3);
 }
 
-string CompilerGLSL::legacy_tex_op(const std::string &op, const SPIRType &imgtype)
+// EXT_shader_texture_lod only concerns fragment shaders so lod tex functions
+// are not allowed in ES 2 vertex shaders. But SPIR-V only supports lod tex
+// functions in vertex shaders so we revert those back to plain calls when
+// the lod is a constant value of zero.
+bool CompilerGLSL::check_explicit_lod_allowed(uint32_t lod)
+{
+	auto &execution = get_entry_point();
+	bool allowed = !is_legacy_es() || execution.model == ExecutionModelFragment;
+	if (!allowed && lod != 0)
+	{
+		auto *lod_constant = maybe_get<SPIRConstant>(lod);
+		if (!lod_constant || lod_constant->scalar_f32() != 0.0f)
+		{
+			SPIRV_CROSS_THROW("Explicit lod not allowed in legacy ES non-fragment shaders.");
+		}
+	}
+	return allowed;
+}
+
+string CompilerGLSL::legacy_tex_op(const std::string &op, const SPIRType &imgtype, uint32_t lod)
 {
 	const char *type;
 	switch (imgtype.image.dim)
@@ -2437,10 +2456,15 @@ string CompilerGLSL::legacy_tex_op(const std::string &op, const SPIRType &imgtyp
 		break;
 	}
 
+	bool use_explicit_lod = check_explicit_lod_allowed(lod);
+
 	if (op == "textureLod" || op == "textureProjLod")
 	{
 		if (is_legacy_es())
-			require_extension("GL_EXT_shader_texture_lod");
+		{
+			if (use_explicit_lod)
+				require_extension("GL_EXT_shader_texture_lod");
+		}
 		else if (is_legacy())
 			require_extension("GL_ARB_shader_texture_lod");
 	}
@@ -2448,11 +2472,21 @@ string CompilerGLSL::legacy_tex_op(const std::string &op, const SPIRType &imgtyp
 	if (op == "texture")
 		return join("texture", type);
 	else if (op == "textureLod")
-		return join("texture", type, is_legacy_es() ? "LodEXT" : "Lod");
+	{
+		if (use_explicit_lod)
+			return join("texture", type, is_legacy_es() ? "LodEXT" : "Lod");
+		else
+			return join("texture", type);
+	}
 	else if (op == "textureProj")
 		return join("texture", type, "Proj");
 	else if (op == "textureProjLod")
-		return join("texture", type, is_legacy_es() ? "ProjLodEXT" : "ProjLod");
+	{
+		if (use_explicit_lod)
+			return join("texture", type, is_legacy_es() ? "ProjLodEXT" : "ProjLod");
+		else
+			return join("texture", type);
+	}
 	else
 	{
 		SPIRV_CROSS_THROW(join("Unsupported legacy texture op: ", op));
@@ -2775,7 +2809,7 @@ void CompilerGLSL::emit_texture_op(const Instruction &i)
 	string expr;
 	bool forward = false;
 	expr += to_function_name(img, imgtype, !!fetch, !!gather, !!proj, !!coffsets, (!!coffset || !!offset),
-	                         (!!grad_x || !!grad_y), !!lod, !!dref);
+	                         (!!grad_x || !!grad_y), !!dref, lod);
 	expr += "(";
 	expr += to_function_args(img, imgtype, fetch, gather, proj, coord, coord_components, dref, grad_x, grad_y, lod,
 	                         coffset, offset, bias, comp, sample, &forward);
@@ -2787,7 +2821,7 @@ void CompilerGLSL::emit_texture_op(const Instruction &i)
 // Returns the function name for a texture sampling function for the specified image and sampling characteristics.
 // For some subclasses, the function is a method on the specified image.
 string CompilerGLSL::to_function_name(uint32_t, const SPIRType &imgtype, bool is_fetch, bool is_gather, bool is_proj,
-                                      bool has_array_offsets, bool has_offset, bool has_grad, bool has_lod, bool)
+                                      bool has_array_offsets, bool has_offset, bool has_grad, bool, uint32_t lod)
 {
 	string fname;
 
@@ -2805,14 +2839,14 @@ string CompilerGLSL::to_function_name(uint32_t, const SPIRType &imgtype, bool is
 			fname += "Proj";
 		if (has_grad)
 			fname += "Grad";
-		if (has_lod)
+		if (!!lod)
 			fname += "Lod";
 	}
 
 	if (has_offset)
 		fname += "Offset";
 
-	return is_legacy() ? legacy_tex_op(fname, imgtype) : fname;
+	return is_legacy() ? legacy_tex_op(fname, imgtype, lod) : fname;
 }
 
 // Returns the function args for a texture sampling function for the specified image and sampling characteristics.
@@ -2894,9 +2928,12 @@ string CompilerGLSL::to_function_args(uint32_t img, const SPIRType &, bool, bool
 
 	if (lod)
 	{
-		forward = forward && should_forward(lod);
+		if (check_explicit_lod_allowed(lod))
-		farg_str += ", ";
+		{
-		farg_str += to_expression(lod);
+			forward = forward && should_forward(lod);
+			farg_str += ", ";
+			farg_str += to_expression(lod);
+		}
 	}
 
 	if (coffset)

spirv_glsl.hpp

@@ -170,7 +170,7 @@ protected:
 	virtual std::string to_func_call_arg(uint32_t id);
 	virtual std::string to_function_name(uint32_t img, const SPIRType &imgtype, bool is_fetch, bool is_gather,
 	                                     bool is_proj, bool has_array_offsets, bool has_offset, bool has_grad,
-	                                     bool has_lod, bool has_dref);
+	                                     bool has_dref, uint32_t lod);
 	virtual std::string to_function_args(uint32_t img, const SPIRType &imgtype, bool is_fetch, bool is_gather,
 	                                     bool is_proj, uint32_t coord, uint32_t coord_components, uint32_t dref,
 	                                     uint32_t grad_x, uint32_t grad_y, uint32_t lod, uint32_t coffset,
@@ -384,7 +384,8 @@ protected:
 
 	void replace_fragment_output(SPIRVariable &var);
 	void replace_fragment_outputs();
-	std::string legacy_tex_op(const std::string &op, const SPIRType &imgtype);
+	bool check_explicit_lod_allowed(uint32_t lod);
+	std::string legacy_tex_op(const std::string &op, const SPIRType &imgtype, uint32_t lod);
 
 	uint32_t indent = 0;
 

spirv_hlsl.cpp

@@ -1091,9 +1091,6 @@ void CompilerHLSL::emit_texture_op(const Instruction &i)
 	if (coffset || offset)
 		texop += "Offset";
 
-	if (is_legacy())
-		texop = legacy_tex_op(texop, imgtype);
-
 	expr += texop;
 	expr += "(";
 	expr += to_expression(img);

spirv_msl.cpp

@@ -989,7 +989,7 @@ void CompilerMSL::emit_function_prototype(SPIRFunction &func, uint64_t)
 
 // Returns the texture sampling function string for the specified image and sampling characteristics.
 string CompilerMSL::to_function_name(uint32_t img, const SPIRType &, bool is_fetch, bool is_gather, bool, bool, bool,
-                                     bool, bool, bool has_dref)
+                                     bool, bool has_dref, uint32_t)
 {
 	// Texture reference
 	string fname = to_expression(img) + ".";

spirv_msl.hpp

@@ -139,8 +139,8 @@ protected:
 	std::string to_func_call_arg(uint32_t id) override;
 	std::string to_name(uint32_t id, bool allow_alias = true) const override;
 	std::string to_function_name(uint32_t img, const SPIRType &imgtype, bool is_fetch, bool is_gather, bool is_proj,
-	                             bool has_array_offsets, bool has_offset, bool has_grad, bool has_lod,
+	                             bool has_array_offsets, bool has_offset, bool has_grad, bool has_dref,
-	                             bool has_dref) override;
+	                             uint32_t lod) override;
 	std::string to_function_args(uint32_t img, const SPIRType &imgtype, bool is_fetch, bool is_gather, bool is_proj,
 	                             uint32_t coord, uint32_t coord_components, uint32_t dref, uint32_t grad_x,
 	                             uint32_t grad_y, uint32_t lod, uint32_t coffset, uint32_t offset, uint32_t bias,