Merge pull request #6923 from unknownbrackets/dx9-depal

d3d: Fix depal flipping and negative z
hrydgard · Sep 18, 2014 · da7fea7 · da7fea7
2 parents 7e3629d + ceac22c
commit da7fea7
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/GPU/Directx9/TextureCacheDX9.cpp b/GPU/Directx9/TextureCacheDX9.cpp
@@ -829,17 +829,18 @@ void TextureCacheDX9::SetTextureFramebuffer(TexCacheEntry *entry, VirtualFramebu
 			fbo_bind_as_render_target(depalFBO);
 
 			static const float pos[12 + 8] = {
-				-1, -1, -1,   0, 0,
-				1, -1, -1,    1, 0,
-				1, 1, -1,     1, 1,
-				-1, 1, -1,    0, 1,
+				-1, 1, 0,    0, 0,
+				1, 1, 0,     1, 0,
+				1, -1, 0,    1, 1,
+				-1, -1, 0,   0, 1,
 			};
 			static const u16 indices[4] = { 0, 1, 3, 2 };
 
 			shaderManager_->DirtyLastShader();
 
 			pD3Ddevice->SetPixelShader(pshader);
 			pD3Ddevice->SetVertexShader(depalShaderCache_->GetDepalettizeVertexShader());
+			pD3Ddevice->SetVertexDeclaration(pFramebufferVertexDecl);
 			pD3Ddevice->SetTexture(1, clutTexture);
 
 			framebufferManager_->BindFramebufferColor(framebuffer, true);
@@ -848,7 +849,6 @@ void TextureCacheDX9::SetTextureFramebuffer(TexCacheEntry *entry, VirtualFramebu
 			pD3Ddevice->SetRenderState(D3DRS_STENCILENABLE, FALSE);
 			pD3Ddevice->SetRenderState(D3DRS_SCISSORTESTENABLE, FALSE);
 			pD3Ddevice->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
-			pD3Ddevice->SetFVF(D3DFVF_XYZ | D3DFVF_TEX0);
 
 			D3DVIEWPORT9 vp;
 			vp.MinZ = 0;
@@ -859,7 +859,10 @@ void TextureCacheDX9::SetTextureFramebuffer(TexCacheEntry *entry, VirtualFramebu
 			vp.Height = framebuffer->renderHeight;
 			pD3Ddevice->SetViewport(&vp);
 
-			pD3Ddevice->DrawIndexedPrimitiveUP(D3DPT_TRIANGLEFAN, 0, 4, 2, indices, D3DFMT_INDEX16, pos, (3 + 2) * sizeof(float));
+			HRESULT hr = pD3Ddevice->DrawPrimitiveUP(D3DPT_TRIANGLEFAN, 2, pos, (3 + 2) * sizeof(float));
+			if (FAILED(hr)) {
+				ERROR_LOG_REPORT(G3D, "Depal render failed: %08x", hr);
+			}
 
 			fbo_bind_color_as_texture(depalFBO, 0);