ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Comments for future reference (ector, please read this) 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2496 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
XTra.KrazzY 2009-03-01 01:50:26 +00:00
parent d8ee333bd7
commit 0710bbb3a7
2 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,13 +34,24 @@ PixelShaderCache::PSCache PixelShaderCache::PixelShaders;
void SetPSConstant4f(int const_number, float f1, float f2, float f3, float f4)
{
const float f[4] = {f1, f2, f3, f4};
D3D::dev->SetPixelShaderConstantF(const_number, f, 1);
//const float f[4] = {f1, f2, f3, f4};
//D3D::dev->SetPixelShaderConstantF(const_number, f, 1);
// TODO: The Cg Way
/** CGparameter param = cgGetNamedParameter(program, "someParameter");
cgSetParameter4f(param, f1, f2, f3, f4); **/
}
void SetPSConstant4fv(int const_number, const float *f)
{
D3D::dev->SetPixelShaderConstantF(const_number, f, 1);
//D3D::dev->SetPixelShaderConstantF(const_number, f, 1);
// TODO: The Cg Way
/** CGparameter param = cgGetNamedParameter(program, "someParameter");
cgSetParameter4fv(param, f); **/
}
void PixelShaderCache::Init()
@ -78,7 +89,8 @@ void PixelShaderCache::SetShader()
if (!lastShader || entry.shader != lastShader)
{
//D3D::dev->SetPixelShader(entry.shader);
cgD3D9LoadProgram(entry.shader, false, 0);
if(!cgD3D9IsProgramLoaded(entry.shader))
cgD3D9LoadProgram(entry.shader, false, 0);
cgD3D9BindProgram(entry.shader);
lastShader = entry.shader;
}
@ -88,6 +100,7 @@ void PixelShaderCache::SetShader()
const char *code = GeneratePixelShader(PixelShaderManager::GetTextureMask(), false, false);
//LPDIRECT3DPIXELSHADER9 shader = D3D::CompilePixelShader(code, (int)(strlen(code)));
CGprogram shader = CompileCgShader(code);
if (shader)
{
//Make an entry in the table
@ -98,8 +111,10 @@ void PixelShaderCache::SetShader()
// There seems to be an unknown Cg error here for some reason
///PanicAlert("Load pShader");
cgD3D9LoadProgram(shader, false, 0);
if(!cgD3D9IsProgramLoaded(shader))
cgD3D9LoadProgram(shader, false, 0);
cgD3D9BindProgram(shader);
D3D::dev->SetFVF(NULL);
///PanicAlert("Loaded pShader");
INCSTAT(stats.numPixelShadersCreated);

23
Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp
View File

@ -34,13 +34,23 @@ VertexShaderCache::VSCache VertexShaderCache::vshaders;
void SetVSConstant4f(int const_number, float f1, float f2, float f3, float f4)
{
const float f[4] = {f1, f2, f3, f4};
D3D::dev->SetVertexShaderConstantF(const_number, f, 1);
//const float f[4] = {f1, f2, f3, f4};
//D3D::dev->SetVertexShaderConstantF(const_number, f, 1);
// TODO: The Cg Way
/** CGparameter param = cgGetNamedParameter(program, "someParameter");
cgSetParameter4f(param, f1, f2, f3, f4); **/
}
void SetVSConstant4fv(int const_number, const float *f)
{
D3D::dev->SetVertexShaderConstantF(const_number, f, 1);
//D3D::dev->SetVertexShaderConstantF(const_number, f, 1);
// TODO: The Cg Way
/** CGparameter param = cgGetNamedParameter(program, "someParameter");
cgSetParameter4fv(param, f); **/
}
@ -81,7 +91,8 @@ void VertexShaderCache::SetShader(u32 components)
if (!lastShader || entry.shader != lastShader)
{
//D3D::dev->SetVertexShader(entry.shader);
cgD3D9LoadProgram(entry.shader, false, 0);
if(!cgD3D9IsProgramLoaded(entry.shader))
cgD3D9LoadProgram(entry.shader, false, 0);
cgD3D9BindProgram(entry.shader);
lastShader = entry.shader;
}
@ -101,8 +112,10 @@ void VertexShaderCache::SetShader(u32 components)
// There seems to be an unknown Cg error here for some reason
///PanicAlert("Load vShader");
cgD3D9LoadProgram(shader, false, 0);
if(!cgD3D9IsProgramLoaded(shader))
cgD3D9LoadProgram(shader, false, 0);
cgD3D9BindProgram(shader);
D3D::dev->SetFVF(NULL);
///PanicAlert("Loaded vShader");
INCSTAT(stats.numVertexShadersCreated);