diff options
| author | nitsuja- <nitsuja-@hotmail.com> | 2011-01-06 02:24:03 +0000 |
|---|---|---|
| committer | nitsuja- <nitsuja-@hotmail.com> | 2011-01-06 02:24:03 +0000 |
| commit | 4f45b422a2ecf18fc45d2d60ac3afa5bae993c1b (patch) | |
| tree | 9f66c729c01f2cd4dee73f314eec8abcdf9774e6 /Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp | |
| parent | 95b6d3f4453fa3fa02fffcb889cb8f5018a24263 (diff) | |
a little cleanup of dx9 depth conversion code that r6751 made unnecessary, and a question about D3DFMT_D24X8 checks, and (most importantly) spelled Stretch right in video config
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6757 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp')
| -rw-r--r-- | Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp index c5d7d13349..365a80b972 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp @@ -131,18 +131,11 @@ void TextureCache::TCacheEntry::FromRenderTarget(bool bFromZBuffer, bool bScaleB D3DFORMAT bformat = FramebufferManager::GetEFBDepthRTSurfaceFormat(); int SSAAMode = g_ActiveConfig.iMultisampleMode; - int depthConversionType; - if(bformat == FOURCC_RAWZ || bformat == D3DFMT_D24X8 || !bFromZBuffer) - depthConversionType = PixelShaderCache::DEPTH_CONVERSION_TYPE_NONE; - else if(bformat == FOURCC_DF16) - depthConversionType = PixelShaderCache::DEPTH_CONVERSION_TYPE_16BIT; - else - depthConversionType = PixelShaderCache::DEPTH_CONVERSION_TYPE_24BIT; - D3D::drawShadedTexQuad(read_texture, &sourcerect, Renderer::GetFullTargetWidth(), Renderer::GetFullTargetHeight(), virtualW, virtualH, - PixelShaderCache::GetDepthMatrixProgram(SSAAMode, depthConversionType), + // TODO: why is D3DFMT_D24X8 singled out here? why not D3DFMT_D24X4S4/D24S8/D24FS8/D32/D16/D15S1 too, or none of them? + PixelShaderCache::GetDepthMatrixProgram(SSAAMode, bFromZBuffer && bformat != FOURCC_RAWZ && bformat != D3DFMT_D24X8), VertexShaderCache::GetSimpleVertexShader(SSAAMode)); Rendersurf->Release(); |