piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-31 01:59:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Clarify texture cache code. Previously, there were THREE sets of texture dimensions, and it was hard to tell which set was for what purpose.

Browse Source 
Now, there are two:
Real dimensions: Width and height of the original GameCube texture
Virtual dimensions: Width and height of the texture used by dolphin-emu's renderer

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6291 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Nolan Check
2010-10-20 00:39:45 +00:00
parent 9a03484d64
commit 0e534dd033
8 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp
View File

@ -121,7 +121,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(bool bFromZBuffer, bool bScaleB
bool bIsIntensityFmt, u32 copyfmt)
{
// stretch picture with increased internal resolution
const D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, (float)scaledW, (float)scaledH);
const D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, (float)virtualW, (float)virtualH);
D3D::context->RSSetViewports(1, &vp);
// set transformation

2
Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
View File

@ -225,7 +225,7 @@ void VertexManager::vFlush()
if (tentry)
{
// 0s are probably for no manual wrapping needed.
PixelShaderManager::SetTexDims(i, tentry->nativeW, tentry->nativeH, 0, 0);
PixelShaderManager::SetTexDims(i, tentry->realW, tentry->realH, 0, 0);
}
else
ERROR_LOG(VIDEO, "error loading texture");

10
Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp
View File

@ -89,15 +89,15 @@ void TextureCache::TCacheEntry::FromRenderTarget(bool bFromZBuffer, bool bScaleB
// Stretch picture with increased internal resolution
vp.X = 0;
vp.Y = 0;
vp.Width = scaledW;
vp.Height = scaledH;
vp.Width = virtualW;
vp.Height = virtualH;
vp.MinZ = 0.0f;
vp.MaxZ = 1.0f;
D3D::dev->SetViewport(&vp);
RECT destrect;
destrect.bottom = scaledH;
destrect.bottom = virtualH;
destrect.left = 0;
destrect.right = scaledW;
destrect.right = virtualW;
destrect.top = 0;
const float* const fConstAdd = colmat + 16; // fConstAdd is the last 4 floats of colmat
@ -133,7 +133,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(bool bFromZBuffer, bool bScaleB
D3D::drawShadedTexQuad(read_texture, &sourcerect,
Renderer::GetFullTargetWidth(), Renderer::GetFullTargetHeight(),
scaledW, scaledH,
virtualW, virtualH,
((bformat != FOURCC_RAWZ && bformat != D3DFMT_D24X8) && bFromZBuffer) ?
PixelShaderCache::GetDepthMatrixProgram(SSAAMode) :
PixelShaderCache::GetColorMatrixProgram(SSAAMode),

2
Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
View File

@ -144,7 +144,7 @@ void VertexManager::vFlush()
if (tentry)
{
// 0s are probably for no manual wrapping needed.
PixelShaderManager::SetTexDims(i, tentry->nativeW, tentry->nativeH, 0, 0);
PixelShaderManager::SetTexDims(i, tentry->realW, tentry->realH, 0, 0);
}
else
ERROR_LOG(VIDEO, "error loading texture");

6
Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
View File

@ -125,7 +125,7 @@ bool TextureCache::TCacheEntry::Save(const char filename[])
std::string tga_filename(filename);
tga_filename.replace(tga_filename.size() - 3, 3, "tga");
return SaveTexture(tga_filename.c_str(), GL_TEXTURE_2D, texture, w, h);
return SaveTexture(tga_filename.c_str(), GL_TEXTURE_2D, texture, realW, realH);
}
TextureCache::TCacheEntryBase* TextureCache::CreateTexture(unsigned int width,
@ -298,7 +298,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(bool bFromZBuffer, bool bScaleB
glEnable(GL_TEXTURE_RECTANGLE_ARB);
glBindTexture(GL_TEXTURE_RECTANGLE_ARB, read_texture);
glViewport(0, 0, scaledW, scaledH);
glViewport(0, 0, virtualW, virtualH);
PixelShaderCache::SetCurrentShader(bFromZBuffer ? PixelShaderCache::GetDepthMatrixProgram() : PixelShaderCache::GetColorMatrixProgram());
const float* const fConstAdd = colmat + 16; // fConstAdd is the last 4 floats of colmat
@ -344,7 +344,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(bool bFromZBuffer, bool bScaleB
{
static int count = 0;
SaveTexture(StringFromFormat("%sefb_frame_%i.tga", File::GetUserPath(D_DUMPTEXTURES_IDX),
count++).c_str(), GL_TEXTURE_2D, texture, w, h);
count++).c_str(), GL_TEXTURE_2D, texture, realW, realH);
}
}

2
Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
View File

@ -165,7 +165,7 @@ void VertexManager::vFlush()
if (tentry)
{
// 0s are probably for no manual wrapping needed.
PixelShaderManager::SetTexDims(i, tentry->nativeW, tentry->nativeH, 0, 0);
PixelShaderManager::SetTexDims(i, tentry->realW, tentry->realH, 0, 0);
if (g_ActiveConfig.iLog & CONF_SAVETEXTURES)
{