Added support for roundNearest() in Sfx.

* round() in HLSL is roundEven() in GLSL. * roundNearest() is Sfx/HLSL is round in GLSL.
simul · Jan 15, 2025 · fb66120 · fb66120
1 parent 885e413
commit fb66120
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 3 deletions.
diff --git a/DirectX11/Sfx/shader_platform.sl b/DirectX11/Sfx/shader_platform.sl
@@ -46,6 +46,22 @@
 	#ifndef BOTTOM_UP_TEXTURE_COORDINATES
 	#define BOTTOM_UP_TEXTURE_COORDINATES 1
 	#endif
+
+	float roundNearest(float x)
+	{
+		float x_f = floor(x);
+		float x_c = ceil(x);
+		return x_c - x <= x - x_f ? x_c : x_f;
+	}
+	float1 roundNearest(float1 x) { return float1(roundNearest(x.x)); }
+	float2 roundNearest(float2 x) { return float2(roundNearest(x.x), roundNearest(x.y)); }
+	float3 roundNearest(float3 x) { return float3(roundNearest(x.x), roundNearest(x.y), roundNearest(x.z)); }
+	float4 roundNearest(float4 x) { return float4(roundNearest(x.x), roundNearest(x.y), roundNearest(x.z), roundNearest(x.w)); }
+
+	float4x4 roundNearest(float4x4 x) { return float4x4(roundNearest(x[0]), roundNearest(x[1]), roundNearest(x[2]), roundNearest(x[3])); }
+	float3x3 roundNearest(float3x3 x) { return float3x3(roundNearest(x[0]), roundNearest(x[1]), roundNearest(x[2])); }
+	float2x2 roundNearest(float2x2 x) { return float2x2(roundNearest(x[0]), roundNearest(x[1])); }
+	float1x1 roundNearest(float1x1 x) { return float1x1(roundNearest(x[0])); }
 #endif
 
 

diff --git a/DirectX12/Sfx/shader_platform.sl b/DirectX12/Sfx/shader_platform.sl
@@ -27,6 +27,20 @@
 	#define BOTTOM_UP_TEXTURE_COORDINATES 1
 	#endif
 
+	float roundNearest(float x)
+	{
+		float x_f = floor(x);
+		float x_c = ceil(x);
+		return x_c - x <= x - x_f ? x_c : x_f;
+	}
+	float2 roundNearest(float2 x) { return float2(roundNearest(x.x), roundNearest(x.y)); }
+	float3 roundNearest(float3 x) { return float3(roundNearest(x.x), roundNearest(x.y), roundNearest(x.z)); }
+	float4 roundNearest(float4 x) { return float4(roundNearest(x.x), roundNearest(x.y), roundNearest(x.z), roundNearest(x.w)); }
+
+	float4x4 roundNearest(float4x4 x) { return float4x4(roundNearest(x[0]), roundNearest(x[1]), roundNearest(x[2]), roundNearest(x[3])); }
+	float3x3 roundNearest(float3x3 x) { return float3x3(roundNearest(x[0]), roundNearest(x[1]), roundNearest(x[2])); }
+	float2x2 roundNearest(float2x2 x) { return float2x2(roundNearest(x[0]), roundNearest(x[1])); }
+
 #endif
 
 #endif
diff --git a/OpenGL/Sfx/OpenGL.json b/OpenGL/Sfx/OpenGL.json
@@ -212,7 +212,9 @@
 		"frac": "fract",
 		"ddx": "dFdx",
 		"ddy": "dFdy",
-		"static": ""
+		"static": "",
+		"round": "roundEven",
+		"roundNearest": "round"
 	},
 	"maxShaderModel": 5.0
 }
diff --git a/Vulkan/Sfx/Vulkan.json b/Vulkan/Sfx/Vulkan.json
@@ -270,6 +270,8 @@
 		"._m30": "[3][0]",
 		"._m31": "[3][1]",
 		"._m32": "[3][2]",
-		"._m33": "[3][3]"
+		"._m33": "[3][3]",
+		"round": "roundEven",
+		"roundNearest": "round"
 	}
 }
diff --git a/Vulkan/Sfx/VulkanAndroid.json b/Vulkan/Sfx/VulkanAndroid.json
@@ -222,6 +222,8 @@
 		"flat": "",
 		"ddx": "dFdx",
 		"ddy": "dFdy",
-		"static": ""
+		"static": "",
+		"round": "roundEven",
+		"roundNearest": "round"
 	}
 }