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 check dual source support on SW mode to avoid a crash on SW mode. (note HW is still crashing but better than nothing) 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5464 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2012-11-27 07:50:51 +00:00
parent 3c3e0f7113
commit c86ca9c56e
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/GSdx/GSDeviceOGL.cpp
View File

@ -1349,16 +1349,26 @@ void GSDeviceOGL::CompileShaderFromSource(const std::string& glsl_file, const st
header.copy(header_str, header.size(), 0); header.copy(header_str, header.size(), 0);
header_str[header.size()] = '\0'; header_str[header.size()] = '\0';
#if 0
// Could be useful one day
const GLchar* ShaderSource[1];
ShaderSource[0] = header.append(source).c_str();
*program = glCreateShaderProgramv(type, 1, &ShaderSource[0]);
#else
*program = glCreateShaderProgramv(type, 2, sources_array); *program = glCreateShaderProgramv(type, 2, sources_array);
#endif
// Check the correctness of the driver // Check the correctness of the (AMD) driver
GLint slot = glGetFragDataLocation(*program, "SV_Target1"); // Note: glGetFragDataLocation crash too!!! Catalyst 12.10 => HD 6XXX
if (slot == 0) { // <=> SV_Target1 used same slot as SV_Target0 if (theApp.GetConfig("renderer", 0) == 12) {
GLint index = glGetFragDataIndex(*program, "SV_Target1"); GLint slot = glGetFragDataLocation(*program, "SV_Target1");
if (index != 1) { if (slot == 0) { // <=> SV_Target1 used same slot as SV_Target0
fprintf(stderr, "Driver bug: failed to set the index, program will be recompiled\n"); GLint index = glGetFragDataIndex(*program, "SV_Target1");
glDeleteProgram(*program); if (index != 1) {
*program = glCreateShaderProgramv_AMD_BUG_WORKAROUND(type, 2, sources_array); fprintf(stderr, "Driver bug: failed to set the index, program will be recompiled\n");
glDeleteProgram(*program);
*program = glCreateShaderProgramv_AMD_BUG_WORKAROUND(type, 2, sources_array);
}
} }
} }