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

gsdx-ogl-wnd: fix ifdef mess on fxaa (both dx and ogl) 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/gsdx-ogl-wnd@5665 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2013-06-15 10:35:10 +00:00
parent adc232cb95
commit 4c37d25134
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/GSdx/GSDeviceOGL.cpp
View File

@ -323,7 +323,7 @@ bool GSDeviceOGL::Create(GSWnd* wnd)
if (!GLLoader::found_only_gl30) { if (!GLLoader::found_only_gl30) {
// This extension become core on openGL4 // This extension become core on openGL4
fxaa_macro += "#extension GL_ARB_gpu_shader5 : enable\n"; fxaa_macro += "#extension GL_ARB_gpu_shader5 : enable\n";
fxaa_macro += "#define FXAA_GATHER4_ALPHA\n"; fxaa_macro += "#define FXAA_GATHER4_ALPHA 1\n";
} }
m_fxaa.cb = new GSUniformBufferOGL(g_fxaa_cb_index, sizeof(FXAAConstantBuffer)); m_fxaa.cb = new GSUniformBufferOGL(g_fxaa_cb_index, sizeof(FXAAConstantBuffer));
CompileShaderFromSource("fxaa.fx", "ps_main", GL_FRAGMENT_SHADER, &m_fxaa.ps, fxaa_fx, fxaa_macro); CompileShaderFromSource("fxaa.fx", "ps_main", GL_FRAGMENT_SHADER, &m_fxaa.ps, fxaa_fx, fxaa_macro);

8
plugins/GSdx/res/fxaa.fx
View File

@ -1,5 +1,9 @@
#if defined(SHADER_MODEL) || defined(FXAA_GLSL_130) // make safe to include in resource file to enforce dependency #if defined(SHADER_MODEL) || defined(FXAA_GLSL_130) // make safe to include in resource file to enforce dependency
#ifndef FXAA_GLSL_130
#define FXAA_GLSL_130 0
#endif
#define FXAA_PC 1 #define FXAA_PC 1
#define FXAA_QUALITY_SUBPIX 0.0 #define FXAA_QUALITY_SUBPIX 0.0
@ -60,7 +64,7 @@ struct PS_OUTPUT
#endif #endif
#ifdef FXAA_GLSL_130 #if (FXAA_GLSL_130 == 1)
struct vertex_basic struct vertex_basic
{ {
vec4 p; vec4 p;
@ -1224,7 +1228,7 @@ PS_OUTPUT ps_main(PS_INPUT input)
} }
#endif #endif
#ifdef FXAA_GLSL_130 #if (FXAA_GLSL_130 == 1)
void ps_main() void ps_main()
{ {
vec2 pos = PSin_t; vec2 pos = PSin_t;

8
plugins/GSdx/res/fxaa.h
View File

@ -28,6 +28,10 @@
static const char* fxaa_fx = static const char* fxaa_fx =
"#if defined(SHADER_MODEL) || defined(FXAA_GLSL_130) // make safe to include in resource file to enforce dependency\n" "#if defined(SHADER_MODEL) || defined(FXAA_GLSL_130) // make safe to include in resource file to enforce dependency\n"
"\n" "\n"
"#ifndef FXAA_GLSL_130\n"
" #define FXAA_GLSL_130 0\n"
"#endif\n"
"\n"
"#define FXAA_PC 1\n" "#define FXAA_PC 1\n"
"#define FXAA_QUALITY_SUBPIX 0.0\n" "#define FXAA_QUALITY_SUBPIX 0.0\n"
"\n" "\n"
@ -88,7 +92,7 @@ static const char* fxaa_fx =
"#endif\n" "#endif\n"
"\n" "\n"
"\n" "\n"
"#ifdef FXAA_GLSL_130\n" "#if (FXAA_GLSL_130 == 1)\n"
"struct vertex_basic\n" "struct vertex_basic\n"
"{\n" "{\n"
" vec4 p;\n" " vec4 p;\n"
@ -1252,7 +1256,7 @@ static const char* fxaa_fx =
"}\n" "}\n"
"#endif\n" "#endif\n"
"\n" "\n"
"#ifdef FXAA_GLSL_130\n" "#if (FXAA_GLSL_130 == 1)\n"
"void ps_main()\n" "void ps_main()\n"
"{\n" "{\n"
" vec2 pos = PSin_t;\n" " vec2 pos = PSin_t;\n"