From ec0ddb476ebea7d40bc11333264c42eacea936dc Mon Sep 17 00:00:00 2001
From: skidau <skidau@gmail.com>
Date: Sun, 6 May 2012 10:51:38 +1000
Subject: [PATCH] Fixed texture encoding in DX11. Thanks to wordmanwords for
 the patch.

---
 .../Plugin_VideoDX11/Src/PSTextureEncoder.cpp | 70 ++++++++++++-------
 1 file changed, 43 insertions(+), 27 deletions(-)

diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PSTextureEncoder.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PSTextureEncoder.cpp
index aa96aac51d..d62517e99b 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/PSTextureEncoder.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/PSTextureEncoder.cpp
@@ -156,18 +156,34 @@ static const char EFB_ENCODE_PS[] =
 	"return (a << 16) | b;\n"
 "}\n"
 
+"uint Float8ToUint3(float v) {\n"
+	"return (uint)(v*255.0) >> 5;\n"
+"}\n"
+
+"uint Float8ToUint4(float v) {\n"
+	"return (uint)(v*255.0) >> 4;\n"
+"}\n"
+
+"uint Float8ToUint5(float v) {\n"
+	"return (uint)(v*255.0) >> 3;\n"
+"}\n"
+
+"uint Float8ToUint6(float v) {\n"
+	"return (uint)(v*255.0) >> 2;\n"
+"}\n"
+
 "uint EncodeRGB5A3(float4 pixel) {\n"
 	"if (pixel.a >= 224.0/255.0) {\n"
 		// Encode to ARGB1555
-		"return UINT_1555(1, pixel.r*31, pixel.g*31, pixel.b*31);\n"
+		"return UINT_1555(1, Float8ToUint5(pixel.r), Float8ToUint5(pixel.g), Float8ToUint5(pixel.b));\n"
 	"} else {\n"
 		// Encode to ARGB3444
-		"return UINT_3444(pixel.a*7, pixel.r*15, pixel.g*15, pixel.b*15);\n"
+		"return UINT_3444(Float8ToUint3(pixel.a), Float8ToUint4(pixel.r), Float8ToUint4(pixel.g), Float8ToUint4(pixel.b));\n"
 	"}\n"
 "}\n"
 
 "uint EncodeRGB565(float4 pixel) {\n"
-	"return UINT_565(pixel.r*31, pixel.g*63, pixel.b*31);\n"
+	"return UINT_565(Float8ToUint5(pixel.r), Float8ToUint6(pixel.g), Float8ToUint5(pixel.b));\n"
 "}\n"
 
 "float2 CalcTexCoord(float2 coord)\n"
@@ -385,14 +401,14 @@ static const char EFB_ENCODE_PS[] =
 	"uint dw[4];\n"
 	"for (uint i = 0; i < 4; ++i) {\n"
 		"dw[i] = UINT_44444444_BE(\n"
-			"15*sample[8*i+0].r,\n"
-			"15*sample[8*i+1].r,\n"
-			"15*sample[8*i+2].r,\n"
-			"15*sample[8*i+3].r,\n"
-			"15*sample[8*i+4].r,\n"
-			"15*sample[8*i+5].r,\n"
-			"15*sample[8*i+6].r,\n"
-			"15*sample[8*i+7].r\n"
+			"Float8ToUint4(sample[8*i+0].r),\n"
+			"Float8ToUint4(sample[8*i+1].r),\n"
+			"Float8ToUint4(sample[8*i+2].r),\n"
+			"Float8ToUint4(sample[8*i+3].r),\n"
+			"Float8ToUint4(sample[8*i+4].r),\n"
+			"Float8ToUint4(sample[8*i+5].r),\n"
+			"Float8ToUint4(sample[8*i+6].r),\n"
+			"Float8ToUint4(sample[8*i+7].r)\n"
 			");\n"
 	"}\n"
 
@@ -460,28 +476,28 @@ static const char EFB_ENCODE_PS[] =
 	"float4 sampleF = SampleEFB(subBlockUL+float2(7,1));\n"
 
 	"uint dw0 = UINT_44444444_BE(\n"
-		"15*sample0.a, 15*sample0.r,\n"
-		"15*sample1.a, 15*sample1.r,\n"
-		"15*sample2.a, 15*sample2.r,\n"
-		"15*sample3.a, 15*sample3.r\n"
+		"Float8ToUint4(sample0.a), Float8ToUint4(sample0.r),\n"
+		"Float8ToUint4(sample1.a), Float8ToUint4(sample1.r),\n"
+		"Float8ToUint4(sample2.a), Float8ToUint4(sample2.r),\n"
+		"Float8ToUint4(sample3.a), Float8ToUint4(sample3.r)\n"
 		");\n"
 	"uint dw1 = UINT_44444444_BE(\n"
-		"15*sample4.a, 15*sample4.r,\n"
-		"15*sample5.a, 15*sample5.r,\n"
-		"15*sample6.a, 15*sample6.r,\n"
-		"15*sample7.a, 15*sample7.r\n"
+		"Float8ToUint4(sample4.a), Float8ToUint4(sample4.r),\n"
+		"Float8ToUint4(sample5.a), Float8ToUint4(sample5.r),\n"
+		"Float8ToUint4(sample6.a), Float8ToUint4(sample6.r),\n"
+		"Float8ToUint4(sample7.a), Float8ToUint4(sample7.r)\n"
 		");\n"
 	"uint dw2 = UINT_44444444_BE(\n"
-		"15*sample8.a, 15*sample8.r,\n"
-		"15*sample9.a, 15*sample9.r,\n"
-		"15*sampleA.a, 15*sampleA.r,\n"
-		"15*sampleB.a, 15*sampleB.r\n"
+		"Float8ToUint4(sample8.a), Float8ToUint4(sample8.r),\n"
+		"Float8ToUint4(sample9.a), Float8ToUint4(sample9.r),\n"
+		"Float8ToUint4(sampleA.a), Float8ToUint4(sampleA.r),\n"
+		"Float8ToUint4(sampleB.a), Float8ToUint4(sampleB.r)\n"
 		");\n"
 	"uint dw3 = UINT_44444444_BE(\n"
-		"15*sampleC.a, 15*sampleC.r,\n"
-		"15*sampleD.a, 15*sampleD.r,\n"
-		"15*sampleE.a, 15*sampleE.r,\n"
-		"15*sampleF.a, 15*sampleF.r\n"
+		"Float8ToUint4(sampleC.a), Float8ToUint4(sampleC.r),\n"
+		"Float8ToUint4(sampleD.a), Float8ToUint4(sampleD.r),\n"
+		"Float8ToUint4(sampleE.a), Float8ToUint4(sampleE.r),\n"
+		"Float8ToUint4(sampleF.a), Float8ToUint4(sampleF.r)\n"
 		");\n"
 	
 	"return uint4(dw0, dw1, dw2, dw3);\n"