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

Fix a vertex shader generation bug that crashed Super Monkey Ball. Better shader error handling. Random warning fixes.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4170 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
2009-09-02 21:19:35 +00:00
parent 50593397f3
commit 1e016dd522
8 changed files with 47 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
View File

@ -57,10 +57,8 @@ void PixelShaderCache::Shutdown()
PixelShaders.clear();
}
void PixelShaderCache::SetShader(bool dstAlpha)
bool PixelShaderCache::SetShader(bool dstAlpha)
{
static LPDIRECT3DPIXELSHADER9 last_shader = NULL;
DVSTARTPROFILE();
PIXELSHADERUID uid;
@ -68,19 +66,14 @@ void PixelShaderCache::SetShader(bool dstAlpha)
PSCache::iterator iter;
iter = PixelShaders.find(uid);
if (iter != PixelShaders.end())
{
iter->second.frameCount = frameCount;
const PSCacheEntry &entry = iter->second;
D3D::dev->SetPixelShader(entry.shader);
last_entry = &entry;
if (!last_shader || entry.shader != last_shader)
{
D3D::dev->SetPixelShader(entry.shader);
last_shader = entry.shader;
DEBUGGER_PAUSE_COUNT_N(NEXT_PIXEL_SHADER_CHANGE);
}
return;
DEBUGGER_PAUSE_COUNT_N(NEXT_PIXEL_SHADER_CHANGE);
return true;
}
const char *code = GeneratePixelShader(PixelShaderManager::GetTextureMask(), dstAlpha, true);
@ -88,26 +81,27 @@ void PixelShaderCache::SetShader(bool dstAlpha)
if (shader)
{
//Make an entry in the table
// Make an entry in the table
PSCacheEntry newentry;
newentry.shader = shader;
newentry.frameCount = frameCount;
#ifdef _DEBUG
#if defined(_DEBUG) || defined(DEBUGFAST)
newentry.code = code;
#endif
PixelShaders[uid] = newentry;
last_entry = &PixelShaders[uid];
D3D::dev->SetPixelShader(shader);
last_shader = shader;
INCSTAT(stats.numPixelShadersCreated);
SETSTAT(stats.numPixelShadersAlive, (int)PixelShaders.size());
return true;
}
else if (g_Config.bShowShaderErrors)
{
PanicAlert("Failed to compile Pixel Shader:\n\n%s", code);
}
return false;
}
@ -131,7 +125,7 @@ void PixelShaderCache::Cleanup()
SETSTAT(stats.numPixelShadersAlive, (int)PixelShaders.size());
}
#ifdef _DEBUG
#if defined(_DEBUG) || defined(DEBUGFAST)
std::string PixelShaderCache::GetCurrentShaderCode()
{
if (last_entry)