mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-24 14:49:42 -06:00
One step closer towards CgD3D to work. Now something is being compiled twice...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2501 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -25,9 +25,6 @@
|
||||
#include "PixelShaderGen.h"
|
||||
#include "VertexShaderGen.h"
|
||||
|
||||
#include <Cg/cg.h>
|
||||
#include <Cg/cgD3D9.h>
|
||||
|
||||
typedef u32 tevhash;
|
||||
|
||||
tevhash GetCurrentTEV();
|
||||
@ -36,9 +33,8 @@ class PixelShaderCache
|
||||
{
|
||||
struct PSCacheEntry
|
||||
{
|
||||
//LPDIRECT3DPIXELSHADER9 shader;
|
||||
CGprogram shader;
|
||||
|
||||
LPDIRECT3DPIXELSHADER9 shader;
|
||||
|
||||
int frameCount;
|
||||
PSCacheEntry()
|
||||
{
|
||||
@ -47,12 +43,8 @@ class PixelShaderCache
|
||||
}
|
||||
void Destroy()
|
||||
{
|
||||
if (shader) {
|
||||
cgD3D9UnloadProgram(shader);
|
||||
cgDestroyProgram(shader);
|
||||
// shader->Release();
|
||||
}
|
||||
|
||||
if (shader)
|
||||
shader->Release();
|
||||
}
|
||||
};
|
||||
|
||||
@ -65,7 +57,7 @@ public:
|
||||
static void Cleanup();
|
||||
static void Shutdown();
|
||||
static void SetShader();
|
||||
static CGprogram CompileCgShader(const char *pstrprogram);
|
||||
static LPDIRECT3DPIXELSHADER9 CompileCgShader(const char *pstrprogram);
|
||||
};
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user