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

gsdx:dx9: Refactor shader compilation code 

Don't use D3DX compile from file and compile from resource functions -
use the compile from memory function instead. It does the same thing,
except you have to set things up yourself.

Benefits:
Allows external shaders to be split into a config file and a shader file
without hardcoding the config file name.
Less code.

Yes, I more or less used the same message as the dx11 one.
This commit is contained in:
Jonathan Li 2015-08-29 16:58:01 +01:00
parent fabd6075ef
commit df98c766e5
3 changed files with 41 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
plugins/GSdx/GSDevice9.cpp
View File

@ -23,6 +23,7 @@
#include "GSdx.h" #include "GSdx.h"
#include "GSDevice9.h" #include "GSDevice9.h"
#include "resource.h" #include "resource.h"
#include <fstream>
GSDevice9::GSDevice9() GSDevice9::GSDevice9()
: m_lost(false) : m_lost(false)
@ -289,11 +290,13 @@ bool GSDevice9::Create(GSWnd* wnd)
D3DDECL_END() D3DDECL_END()
}; };
CompileShader(IDR_CONVERT_FX, "vs_main", NULL, &m_convert.vs, il_convert, countof(il_convert), &m_convert.il); vector<unsigned char> shader;
theApp.LoadResource(IDR_CONVERT_FX, shader);
CompileShader((const char *)shader.data(), shader.size(), "vs_main", NULL, &m_convert.vs, il_convert, countof(il_convert), &m_convert.il);
for(size_t i = 0; i < countof(m_convert.ps); i++) for(size_t i = 0; i < countof(m_convert.ps); i++)
{ {
CompileShader(IDR_CONVERT_FX, format("ps_main%d", i), NULL, &m_convert.ps[i]); CompileShader((const char *)shader.data(), shader.size(), format("ps_main%d", i), NULL, &m_convert.ps[i]);
} }
m_convert.dss.DepthEnable = false; m_convert.dss.DepthEnable = false;
@ -322,9 +325,10 @@ bool GSDevice9::Create(GSWnd* wnd)
// merge // merge
theApp.LoadResource(IDR_MERGE_FX, shader);
for(size_t i = 0; i < countof(m_merge.ps); i++) for(size_t i = 0; i < countof(m_merge.ps); i++)
{ {
CompileShader(IDR_MERGE_FX, format("ps_main%d", i), NULL, &m_merge.ps[i]); CompileShader((const char *)shader.data(), shader.size(), format("ps_main%d", i), NULL, &m_merge.ps[i]);
} }
m_merge.bs.BlendEnable = true; m_merge.bs.BlendEnable = true;
@ -338,9 +342,10 @@ bool GSDevice9::Create(GSWnd* wnd)
// interlace // interlace
theApp.LoadResource(IDR_INTERLACE_FX, shader);
for(size_t i = 0; i < countof(m_interlace.ps); i++) for(size_t i = 0; i < countof(m_interlace.ps); i++)
{ {
CompileShader(IDR_INTERLACE_FX, format("ps_main%d", i), NULL, &m_interlace.ps[i]); CompileShader((const char *)shader.data(), shader.size(), format("ps_main%d", i), NULL, &m_interlace.ps[i]);
} }
// Shade Boost // Shade Boost
@ -363,7 +368,8 @@ bool GSDevice9::Create(GSWnd* wnd)
{NULL, NULL}, {NULL, NULL},
}; };
CompileShader(IDR_SHADEBOOST_FX, "ps_main", macro, &m_shadeboost.ps); theApp.LoadResource(IDR_SHADEBOOST_FX, shader);
CompileShader((const char *)shader.data(), shader.size(), "ps_main", macro, &m_shadeboost.ps);
// create shader layout // create shader layout
@ -933,7 +939,17 @@ void GSDevice9::InitExternalFX()
if (!ExShader_Compiled) if (!ExShader_Compiled)
{ {
try { try {
CompileShader("shaders/GSdx.fx", "ps_main", NULL, &m_shaderfx.ps); std::ifstream fshader("shaders/GSdx.fx");
if (fshader.good())
{
std::stringstream shader;
shader << fshader.rdbuf();
CompileShader(shader.str().c_str(), shader.str().length(), "ps_main", NULL, &m_shaderfx.ps);
}
else
{
fprintf(stderr, "GSdx: Failed to load 'shaders/GSdx.fx'. External Shader will be disabled!\n");
}
} }
catch (GSDXRecoverableError) { catch (GSDXRecoverableError) {
printf("GSdx: failed to compile external post-processing shader. \n"); printf("GSdx: failed to compile external post-processing shader. \n");
@ -965,7 +981,9 @@ void GSDevice9::InitFXAA()
if (!FXAA_Compiled) if (!FXAA_Compiled)
{ {
try { try {
CompileShader(IDR_FXAA_FX, "ps_main", NULL, &m_fxaa.ps); vector<unsigned char> shader;
theApp.LoadResource(IDR_FXAA_FX, shader);
CompileShader((const char *)shader.data(), shader.size(), "ps_main", NULL, &m_fxaa.ps);
} }
catch (GSDXRecoverableError) { catch (GSDXRecoverableError) {
printf("GSdx: Failed to compile fxaa shader.\n"); printf("GSdx: Failed to compile fxaa shader.\n");
@ -1421,84 +1439,7 @@ void GSDevice9::OMSetRenderTargets(GSTexture* rt, GSTexture* ds, const GSVector4
} }
} }
void GSDevice9::CompileShader(const char* fn, const string& entry, const D3DXMACRO* macro, IDirect3DVertexShader9** vs, const D3DVERTEXELEMENT9* layout, int count, IDirect3DVertexDeclaration9** il) void GSDevice9::CompileShader(const char *source, size_t size, const string& entry, const D3DXMACRO* macro, IDirect3DVertexShader9** vs, const D3DVERTEXELEMENT9* layout, int count, IDirect3DVertexDeclaration9** il)
{
vector<D3DXMACRO> m;
PrepareShaderMacro(m, macro);
HRESULT hr;
CComPtr<ID3DXBuffer> shader, error;
hr = D3DXCompileShaderFromFile(fn, &m[0], NULL, entry.c_str(), m_shader.vs.c_str(), 0, &shader, &error, NULL);
if(SUCCEEDED(hr))
{
hr = m_dev->CreateVertexShader((DWORD*)shader->GetBufferPointer(), vs);
}
else if(error)
{
printf("%s\n", (const char*)error->GetBufferPointer());
}
ASSERT(SUCCEEDED(hr));
if(FAILED(hr))
{
throw GSDXRecoverableError();
}
hr = m_dev->CreateVertexDeclaration(layout, il);
if(FAILED(hr))
{
throw GSDXRecoverableError();
}
}
void GSDevice9::CompileShader(const char* fn, const string& entry, const D3DXMACRO* macro, IDirect3DPixelShader9** ps)
{
uint32 flags = 0;
if(m_shader.level >= D3D_FEATURE_LEVEL_9_3)
{
flags |= D3DXSHADER_AVOID_FLOW_CONTROL;
}
else
{
flags |= D3DXSHADER_SKIPVALIDATION;
}
vector<D3DXMACRO> m;
PrepareShaderMacro(m, macro);
HRESULT hr;
CComPtr<ID3DXBuffer> shader, error;
hr = D3DXCompileShaderFromFile(fn, &m[0], NULL, entry.c_str(), m_shader.ps.c_str(), flags, &shader, &error, NULL);
if(SUCCEEDED(hr))
{
hr = m_dev->CreatePixelShader((DWORD*)shader->GetBufferPointer(), ps);
}
else if(error)
{
printf("%s\n", (const char*)error->GetBufferPointer());
}
ASSERT(SUCCEEDED(hr));
if(FAILED(hr))
{
throw GSDXRecoverableError();
}
}
void GSDevice9::CompileShader(uint32 id, const string& entry, const D3DXMACRO* macro, IDirect3DVertexShader9** vs, const D3DVERTEXELEMENT9* layout, int count, IDirect3DVertexDeclaration9** il)
{ {
vector<D3DXMACRO> m; vector<D3DXMACRO> m;
@ -1508,7 +1449,7 @@ void GSDevice9::CompileShader(uint32 id, const string& entry, const D3DXMACRO* m
CComPtr<ID3DXBuffer> shader, error; CComPtr<ID3DXBuffer> shader, error;
hr = D3DXCompileShaderFromResource(theApp.GetModuleHandle(), MAKEINTRESOURCE(id), &m[0], NULL, entry.c_str(), m_shader.vs.c_str(), 0, &shader, &error, NULL); hr = D3DXCompileShader(source, size, &m[0], NULL, entry.c_str(), m_shader.vs.c_str(), 0, &shader, &error, NULL);
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
{ {
@ -1519,6 +1460,8 @@ void GSDevice9::CompileShader(uint32 id, const string& entry, const D3DXMACRO* m
printf("%s\n", (const char*)error->GetBufferPointer()); printf("%s\n", (const char*)error->GetBufferPointer());
} }
ASSERT(SUCCEEDED(hr));
if(FAILED(hr)) if(FAILED(hr))
{ {
throw GSDXRecoverableError(); throw GSDXRecoverableError();
@ -1532,7 +1475,7 @@ void GSDevice9::CompileShader(uint32 id, const string& entry, const D3DXMACRO* m
} }
} }
void GSDevice9::CompileShader(uint32 id, const string& entry, const D3DXMACRO* macro, IDirect3DPixelShader9** ps) void GSDevice9::CompileShader(const char *source, size_t size, const string& entry, const D3DXMACRO* macro, IDirect3DPixelShader9** ps)
{ {
uint32 flags = 0; uint32 flags = 0;
@ -1552,8 +1495,7 @@ void GSDevice9::CompileShader(uint32 id, const string& entry, const D3DXMACRO* m
HRESULT hr; HRESULT hr;
CComPtr<ID3DXBuffer> shader, error; CComPtr<ID3DXBuffer> shader, error;
hr = D3DXCompileShader(source, size, &m[0], NULL, entry.c_str(), m_shader.ps.c_str(), flags, &shader, &error, NULL);
hr = D3DXCompileShaderFromResource(theApp.GetModuleHandle(), MAKEINTRESOURCE(id), &m[0], NULL, entry.c_str(), m_shader.ps.c_str(), flags, &shader, &error, NULL);
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
{ {
@ -1564,9 +1506,10 @@ void GSDevice9::CompileShader(uint32 id, const string& entry, const D3DXMACRO* m
printf("%s\n", (const char*)error->GetBufferPointer()); printf("%s\n", (const char*)error->GetBufferPointer());
} }
ASSERT(SUCCEEDED(hr));
if(FAILED(hr)) if(FAILED(hr))
{ {
throw GSDXRecoverableError(); throw GSDXRecoverableError();
} }
} }

7
plugins/GSdx/GSDevice9.h
View File

@ -237,11 +237,8 @@ public:
IDirect3DDevice9* operator->() {return m_dev;} IDirect3DDevice9* operator->() {return m_dev;}
operator IDirect3DDevice9*() {return m_dev;} operator IDirect3DDevice9*() {return m_dev;}
void CompileShader(uint32 id, const string& entry, const D3DXMACRO* macro, IDirect3DVertexShader9** vs, const D3DVERTEXELEMENT9* layout, int count, IDirect3DVertexDeclaration9** il); void CompileShader(const char *source, size_t size, const string& entry, const D3DXMACRO* macro, IDirect3DVertexShader9** vs, const D3DVERTEXELEMENT9* layout, int count, IDirect3DVertexDeclaration9** il);
void CompileShader(uint32 id, const string& entry, const D3DXMACRO* macro, IDirect3DPixelShader9** ps); void CompileShader(const char *source, size_t size, const string& entry, const D3DXMACRO* macro, IDirect3DPixelShader9** ps);
void CompileShader(const char* fn, const string& entry, const D3DXMACRO* macro, IDirect3DVertexShader9** vs, const D3DVERTEXELEMENT9* layout, int count, IDirect3DVertexDeclaration9** il);
void CompileShader(const char* fn, const string& entry, const D3DXMACRO* macro, IDirect3DPixelShader9** ps);
void SetupVS(VSSelector sel, const VSConstantBuffer* cb); void SetupVS(VSSelector sel, const VSConstantBuffer* cb);
void SetupGS(GSSelector sel) {} void SetupGS(GSSelector sel) {}

8
plugins/GSdx/GSTextureFX9.cpp
View File

@ -96,7 +96,9 @@ void GSDevice9::SetupVS(VSSelector sel, const VSConstantBuffer* cb)
GSVertexShader9 vs; GSVertexShader9 vs;
CompileShader(IDR_TFX_FX, "vs_main", macro, &vs.vs, layout, countof(layout), &vs.il); vector<unsigned char> shader;
theApp.LoadResource(IDR_TFX_FX, shader);
CompileShader((const char *)shader.data(), shader.size(), "vs_main", macro, &vs.vs, layout, countof(layout), &vs.il);
m_vs[sel] = vs; m_vs[sel] = vs;
@ -179,7 +181,9 @@ void GSDevice9::SetupPS(PSSelector sel, const PSConstantBuffer* cb, PSSamplerSel
CComPtr<IDirect3DPixelShader9> ps; CComPtr<IDirect3DPixelShader9> ps;
CompileShader(IDR_TFX_FX, "ps_main", macro, &ps); vector<unsigned char> shader;
theApp.LoadResource(IDR_TFX_FX, shader);
CompileShader((const char *)shader.data(), shader.size(), "ps_main", macro, &ps);
m_ps[sel] = ps; m_ps[sel] = ps;