piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

More code movin' .. split Vertex/Pixelshadermngr into xxCache and xxManager.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1677 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
2008-12-26 10:43:18 +00:00
parent 3669d711a2
commit fa9f5c44fb
17 changed files with 436 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -193,7 +193,7 @@ void Flush()
if (tentry != NULL) {
// texture loaded fine, set dims for pixel shader
if (tentry->isNonPow2) {
PixelShaderMngr::SetTexDims(i, tentry->w, tentry->h, tentry->mode.wrap_s, tentry->mode.wrap_t);
PixelShaderManager::SetTexDims(i, tentry->w, tentry->h, tentry->mode.wrap_s, tentry->mode.wrap_t);
nonpow2tex |= 1 << i;
if (tentry->mode.wrap_s > 0) nonpow2tex |= 1 << (8 + i);
if (tentry->mode.wrap_t > 0) nonpow2tex |= 1 << (16 + i);
@ -202,7 +202,7 @@ void Flush()
// if texture is power of two, set to ones (since don't need scaling)
else
{
PixelShaderMngr::SetTexDims(i, tentry->w, tentry->h, 0, 0);
PixelShaderManager::SetTexDims(i, tentry->w, tentry->h, 0, 0);
TextureMngr::EnableTex2D(i);
}
if (g_Config.iLog & CONF_PRIMLOG) {
@ -222,11 +222,11 @@ void Flush()
}
}
PixelShaderMngr::SetTexturesUsed(nonpow2tex);
PixelShaderManager::SetTexturesUsed(nonpow2tex);
}
FRAGMENTSHADER* ps = PixelShaderMngr::GetShader();
VERTEXSHADER* vs = VertexShaderMngr::GetShader(s_prevcomponents);
FRAGMENTSHADER* ps = PixelShaderCache::GetShader();
VERTEXSHADER* vs = VertexShaderCache::GetShader(s_prevcomponents);
bool bRestoreBuffers = false;
if (Renderer::GetZBufferTarget()) {
@ -246,8 +246,8 @@ void Flush()
}
// set global constants
VertexShaderMngr::SetConstants();
PixelShaderMngr::SetConstants();
VertexShaderManager::SetConstants();
PixelShaderManager::SetConstants();
// finally bind