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

gsdx (ogl): 

* Don't try to allocate a "null" array when shader log is empty
* glsl: hopefully implicit cast error on Nvidia driver


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5542 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2013-02-03 15:46:42 +00:00
parent c78b6157cb
commit 580f7a2e3d
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/GSdx/GSDeviceOGL.cpp
View File

@ -1359,7 +1359,7 @@ void GSDeviceOGL::CompileShaderFromSource(const std::string& glsl_file, const st
#endif #endif
// Check the correctness of the (AMD) driver // Check the correctness of the (AMD) driver
// Note: glGetFragDataLocation crash too!!! Catalyst 12.10 => HD 6XXX // Note: glGetFragDataLocation crash too!!! Catalyst 12.10 (and later) => HD 5XXX,6XXX !!!
if (theApp.GetConfig("renderer", 0) == 12) { if (theApp.GetConfig("renderer", 0) == 12) {
GLint slot = glGetFragDataLocation(*program, "SV_Target1"); GLint slot = glGetFragDataLocation(*program, "SV_Target1");
if (slot == 0) { // <=> SV_Target1 used same slot as SV_Target0 if (slot == 0) { // <=> SV_Target1 used same slot as SV_Target0
@ -1378,16 +1378,19 @@ void GSDeviceOGL::CompileShaderFromSource(const std::string& glsl_file, const st
if (theApp.GetConfig("debug_ogl_shader", 1) == 1) { if (theApp.GetConfig("debug_ogl_shader", 1) == 1) {
// Print a nice debug log // Print a nice debug log
GLint log_length = 0;
glGetProgramiv(*program, GL_INFO_LOG_LENGTH, &log_length);
char* log = (char*)malloc(log_length);
glGetProgramInfoLog(*program, log_length, NULL, log);
fprintf(stderr, "%s (entry %s, prog %d) :", glsl_file.c_str(), entry.c_str(), *program); fprintf(stderr, "%s (entry %s, prog %d) :", glsl_file.c_str(), entry.c_str(), *program);
fprintf(stderr, "\n%s", macro_sel.c_str()); fprintf(stderr, "\n%s", macro_sel.c_str());
fprintf(stderr, "%s\n", log);
GLint log_length = 0;
glGetProgramiv(*program, GL_INFO_LOG_LENGTH, &log_length);
if (log_length > 0) {
char* log = (char*)malloc(log_length);
glGetProgramInfoLog(*program, log_length, NULL, log);
fprintf(stderr, "%s", log);
free(log); free(log);
}
fprintf(stderr, "\n");
} }
} }

2
plugins/GSdx/res/tfx.glsl
View File

@ -443,7 +443,7 @@ vec4 sample_color(vec2 st, float q)
} }
// PERF: see the impact of the exansion before/after the interpolation // PERF: see the impact of the exansion before/after the interpolation
for (uint i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
if((PS_FMT & ~FMT_PAL) == FMT_24) if((PS_FMT & ~FMT_PAL) == FMT_24)
{ {