From 3a569dba23844e8a289bd95943cc44278acd5aaa Mon Sep 17 00:00:00 2001
From: gabest11 <gabest11@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Wed, 22 Jul 2009 12:23:58 +0000
Subject: [PATCH] GSdx: disabled "gather" until I can sort it out

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1551 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 plugins/GSdx/res/tfx.fx | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/plugins/GSdx/res/tfx.fx b/plugins/GSdx/res/tfx.fx
index c2f30bf562..630fda80c8 100644
--- a/plugins/GSdx/res/tfx.fx
+++ b/plugins/GSdx/res/tfx.fx
@@ -304,23 +304,23 @@ float4x4 sample_4c(float4 uv)
 	return c;
 }
 
-float4 sample_4a(float4 uv)
+float4 sample_4a(float4 uv, float2 st)
 {
 	float4 c;
-
-	#if SHADER_MODEL >= 0x401 && PS_LTF && PS_WMS < 2 && PS_WMT < 2
+/*
+	#if SHADER_MODEL >= 0x401 && PS_FMT == FMT_8 && PS_LTF && PS_WMS < 2 && PS_WMT < 2
 	
-	c = gather_c(uv.xy); 
+	c = gather_c(st); // the order of samples returned might not be the same as ours
 	
 	#else
-
+*/
 	c.x = sample_c(uv.xy).a;
 	c.y = sample_c(uv.zy).a;
 	c.z = sample_c(uv.xw).a;
 	c.w = sample_c(uv.zw).a;
-	
+/*	
 	#endif
-
+*/
 	#if SHADER_MODEL <= 0x300
 	if(PS_RT) c *= 128.0f / 255;
 	#endif
@@ -379,19 +379,19 @@ float4 sample(float2 st, float q)
 
 		if(PS_FMT == FMT_8H)
 		{
-			c = sample_4p(sample_4a(uv));
+			c = sample_4p(sample_4a(uv, st.xy));
 		}
 		else if(PS_FMT == FMT_4HL)
 		{
-			c = sample_4p(fmod(sample_4a(uv), 1.0f / 16));
+			c = sample_4p(fmod(sample_4a(uv, st.xy), 1.0f / 16));
 		}
 		else if(PS_FMT == FMT_4HH)
 		{
-			c = sample_4p(fmod(sample_4a(uv) * 16, 1.0f / 16));
+			c = sample_4p(fmod(sample_4a(uv, st.xy) * 16, 1.0f / 16));
 		}
 		else if(PS_FMT == FMT_8)
 		{
-			c = sample_4p(sample_4a(uv));
+			c = sample_4p(sample_4a(uv, st.xy));
 		}
 		else
 		{