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

Revert r7421 and r7422.

Browse Source 
Should fix issue 4413.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7592 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
NeoBrainX
2011-06-11 19:37:21 +00:00
parent e5210de9d5
commit 8244efcc02
42 changed files with 1647 additions and 1420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h
View File

@ -33,12 +33,11 @@ public:
static void Init();
static void Clear();
static void Shutdown();
static bool LoadShader(DSTALPHA_MODE dstAlphaMode, u32 components);
static bool SetShader(DSTALPHA_MODE dstAlphaMode, u32 components); // TODO: Should be renamed to LoadShader
static bool InsertByteCode(const PIXELSHADERUID &uid, const void* bytecode, unsigned int bytecodelen);
static SharedPtr<ID3D11PixelShader> GetActiveShader() { return last_entry->shader; }
static ID3D11Buffer*const& GetConstantBuffer();
static ID3D11PixelShader* GetActiveShader() { return last_entry->shader; }
static ID3D11Buffer* &GetConstantBuffer();
static ID3D11PixelShader* GetColorMatrixProgram(bool multisampled);
static ID3D11PixelShader* GetColorCopyProgram(bool multisampled);
@ -52,10 +51,11 @@ public:
private:
struct PSCacheEntry
{
SharedPtr<ID3D11PixelShader> shader;
ID3D11PixelShader* shader;
int frameCount;
PSCacheEntry() : frameCount(0) {}
PSCacheEntry() : shader(NULL), frameCount(0) {}
void Destroy() { SAFE_RELEASE(shader); }
};
typedef std::map<PIXELSHADERUID, PSCacheEntry> PSCache;