GSdx:

Finish up my scanlines attempt. Now the 2 old shaders are back in and all 3 cycle on F7.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5809 96395faa-99c1-11dd-bbfe-3dabce05a288

plugins/GSdx/GSDevice.cpp

@@ -106,7 +106,7 @@ void GSDevice::Present(const GSVector4i& r, int shader)
 
 	if(m_current)
 	{
-		static int s_shader[3] = {0, 5, 6}; // FIXME
+		static int s_shader[4] = {0, 5, 6, 8}; // FIXME
 
 		Present(m_current, m_backbuffer, GSVector4(r), s_shader[shader]);
 	}

plugins/GSdx/GSDevice11.h

@@ -90,7 +90,7 @@ public: // TODO
 	{
 		CComPtr<ID3D11InputLayout> il;
 		CComPtr<ID3D11VertexShader> vs;
-		CComPtr<ID3D11PixelShader> ps[8];
+		CComPtr<ID3D11PixelShader> ps[9];
 		CComPtr<ID3D11SamplerState> ln;
 		CComPtr<ID3D11SamplerState> pt;
 		CComPtr<ID3D11DepthStencilState> dss;

plugins/GSdx/GSDevice9.h

@@ -119,7 +119,7 @@ public: // TODO
 	{
 		CComPtr<IDirect3DVertexDeclaration9> il;
 		CComPtr<IDirect3DVertexShader9> vs;
-		CComPtr<IDirect3DPixelShader9> ps[8];
+		CComPtr<IDirect3DPixelShader9> ps[9];
 		Direct3DSamplerState9 ln;
 		Direct3DSamplerState9 pt;
 		Direct3DDepthStencilState9 dss;

plugins/GSdx/GSRenderer.cpp

@@ -550,7 +550,7 @@ void GSRenderer::KeyEvent(GSKeyEventData* e)
 				m_aspectratio = (m_aspectratio + 3 + step) % 3;
 			return;
 		case VK_F7:
-			m_shader = (m_shader + 3 + step) % 3;
+			m_shader = (m_shader + 4 + step) % 4;
 			printf("GSdx: Set shader %d.\n", (int)m_shader);
 			return;
 		case VK_DELETE:

plugins/GSdx/res/convert.fx

@@ -170,7 +170,29 @@ PS_OUTPUT ps_main4(PS_INPUT input)
 	return output;
 }
 
-PS_OUTPUT ps_main5(PS_INPUT input) // triangular
+PS_OUTPUT ps_main5(PS_INPUT input) // scanlines
+{
+	PS_OUTPUT output;
+	
+	uint4 p = (uint4)input.p;
+
+	output.c = ps_scanlines(input, p.y % 2);
+
+	return output;
+}
+
+PS_OUTPUT ps_main6(PS_INPUT input) // diagonal
+{
+	PS_OUTPUT output;
+
+	uint4 p = (uint4)input.p;
+
+	output.c = ps_crt(input, (p.x + (p.y % 3)) % 3);
+
+	return output;
+}
+
+PS_OUTPUT ps_main8(PS_INPUT input) // triangular
 {
 	PS_OUTPUT output;
 
@@ -182,18 +204,6 @@ PS_OUTPUT ps_main5(PS_INPUT input) // triangular
 	return output;
 }
 
-PS_OUTPUT ps_main6(PS_INPUT input) // diagonal (repurposed for scanlines for now)
-{
-	PS_OUTPUT output;
-
-	uint4 p = (uint4)input.p;
-
-	output.c = ps_scanlines(input, p.y % 2); // scanlines
-	//output.c = ps_crt(input, (p.x + (p.y % 3)) % 3); // diagonal
-
-	return output;
-}
-
 #elif SHADER_MODEL <= 0x300
 
 PS_OUTPUT ps_main1(PS_INPUT input)
@@ -240,7 +250,29 @@ PS_OUTPUT ps_main4(PS_INPUT input)
 	return output;
 }
 
-PS_OUTPUT ps_main5(PS_INPUT input) // triangular
+PS_OUTPUT ps_main5(PS_INPUT input) // scanlines
+{
+	PS_OUTPUT output;
+	
+	int4 p = (int4)input.p;
+
+	output.c = ps_scanlines(input, p.y % 2);
+
+	return output;
+}
+
+PS_OUTPUT ps_main6(PS_INPUT input) // diagonal
+{
+	PS_OUTPUT output;
+
+	int4 p = (int4)input.p;
+
+	output.c = ps_crt(input, (p.x + (p.y % 3)) % 3);
+
+	return output;
+}
+
+PS_OUTPUT ps_main8(PS_INPUT input) // triangular
 {
 	PS_OUTPUT output;
 
@@ -252,17 +284,5 @@ PS_OUTPUT ps_main5(PS_INPUT input) // triangular
 	return output;
 }
 
-PS_OUTPUT ps_main6(PS_INPUT input) // diagonal (repurposed for scanlines for now)
-{
-	PS_OUTPUT output;
-
-	int4 p = (int4)input.p;
-
-	output.c = ps_scanlines(input, p.y % 2); // scanlines
-	//output.c = ps_crt(input, (p.x + (p.y % 3)) % 3); // diagonal
-
-	return output;
-}
-
 #endif
 #endif