From bd55f17f0d3c25c393fb5924fbfd17ccf4ca0f3c Mon Sep 17 00:00:00 2001
From: Anthony Miles <a.miles.nz@gmail.com>
Date: Wed, 4 Dec 2019 22:50:10 +1300
Subject: [PATCH] - Move ILU ops together - Some ops use the .w component by
 default. Ensure they will use w instead of x, if the default xyzw swizzle was
 used

---
 src/core/hle/D3D8/Direct3D9/Xb.hlsl | 53 +++++++++++++++++------------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/core/hle/D3D8/Direct3D9/Xb.hlsl b/src/core/hle/D3D8/Direct3D9/Xb.hlsl
index 40a26436b..774c5afdc 100644
--- a/src/core/hle/D3D8/Direct3D9/Xb.hlsl
+++ b/src/core/hle/D3D8/Direct3D9/Xb.hlsl
@@ -45,11 +45,7 @@ float4 c(int index) {
 #define x_max(src0, src1) max(src0, src1)
 #define x_mad(src0, src1, src2) src0 * src1 + src2
 
-// Macros for ILU ('Inverse Logic Unit') opcodes
-#define x_rcp(src0) rcp(src0)
-#define x_rsq(src0) rsqrt(src0)
-
-// Xbox functions
+// Xbox MAC functions
 int x_arl(float src0) {
 	// The address register should be floored
 	// Due to rounding differences with the Xbox (and increased precision on PC?)
@@ -59,20 +55,6 @@ int x_arl(float src0) {
 	return floor(src0 + 0.0001);
 }
 
-float4 x_exp(float src0) {
-	float x = pow(2, floor(src0));
-	float fractional = frac(src0);
-	float power = pow(2, src0);
-	return float4(x, fractional, power, 1);
-}
-
-float4 x_log(float src0) {
-	float exponent = floor(log(src0));
-	float mantissa = 1 / pow(2, exponent);
-	float logResult = log(src0);
-	return float4(exponent, mantissa, logResult, 1);
-}
-
 
 float x_dp3(float4 src0, float4 src1) {
 	return dot(src0.xyz, src1.xyz);
@@ -102,18 +84,45 @@ float4 x_slt(float4 src0, float4 src1) {
 	dest.z = (src0.z < src1.z) ? 1.0f : 0.0f;
 	dest.w = (src0.w < src1.w) ? 1.0f : 0.0f;
 	return dest;
-}
+}
+
+// Xbox ILU Functions
+
+float x_rcp(float4 src0) {
+	return 1 / src0.w; // use w component by default
+}
 
 // Clamped reciprocal
-float x_rcc(float src0) {
+float x_rcc(float4 src0) {
+	float input = src0.w; // use w component by default
 
 	// Calculate the reciprocal
-	float r = 1.0f / src0;
+	float r = 1.0f / input;
 
 	// Clamp
 	return (r > 0)
 		? clamp(r, 5.42101e-020, 1.84467e+019)
 		: clamp(r, -1.84467e+019, -5.42101e-020);
+}
+
+float x_rsq(float4 src0) {
+	return rsqrt(src0.w); // use w component by default
+}
+
+float4 x_exp(float4 src0) {
+	float input = src0.w; // use w component by default
+	float x = pow(2, floor(input));
+	float fractional = frac(input);
+	float power = pow(2, input);
+	return float4(x, fractional, power, 1);
+}
+
+float4 x_log(float4 src0) {
+	float input = src0.w; // use w component by default
+	float exponent = floor(log(input));
+	float mantissa = 1 / pow(2, exponent);
+	float logResult = log(input);
+	return float4(exponent, mantissa, logResult, 1);
 }
 
 float4 x_lit(float4 src0) {