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

gsdx ogl: minor string update

This commit is contained in:
Gregory Hainaut 2016-01-01 14:43:47 +01:00
parent 6e34f183ea
commit 7aae0ce394
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/GSdx/GLLoader.cpp
View File

@ -329,7 +329,7 @@ namespace GLLoader {
// GL4 hardware (due to proprietary driver limitation) // GL4 hardware (due to proprietary driver limitation)
bool found_GL_ARB_separate_shader_objects = false; // Issue with Mesa and Catalyst... bool found_GL_ARB_separate_shader_objects = false; // Issue with Catalyst...
bool found_geometry_shader = true; // we require GL3.3 so geometry must be supported by default bool found_geometry_shader = true; // we require GL3.3 so geometry must be supported by default
bool found_GL_EXT_texture_filter_anisotropic = false; bool found_GL_EXT_texture_filter_anisotropic = false;
bool found_GL_ARB_clear_texture = false; // Don't know if GL3 GPU can support it bool found_GL_ARB_clear_texture = false; // Don't know if GL3 GPU can support it
@ -337,8 +337,8 @@ namespace GLLoader {
bool found_GL_ARB_copy_image = false; // Not sure actually maybe GL3 GPU can do it bool found_GL_ARB_copy_image = false; // Not sure actually maybe GL3 GPU can do it
bool found_GL_ARB_gpu_shader5 = false; bool found_GL_ARB_gpu_shader5 = false;
bool found_GL_ARB_shader_image_load_store = false; // GLES3.1 bool found_GL_ARB_shader_image_load_store = false; // GLES3.1
bool found_GL_ARB_texture_barrier = false; // Well maybe supported by older hardware I don't know
// DX10 GPU limited driver // DX10 GPU limited driver
bool found_GL_ARB_texture_barrier = false; // Well maybe supported by older hardware I don't know
bool found_GL_ARB_draw_buffers_blend = false; bool found_GL_ARB_draw_buffers_blend = false;
bool found_GL_ARB_clip_control = false; bool found_GL_ARB_clip_control = false;
bool found_GL_ARB_direct_state_access = false; bool found_GL_ARB_direct_state_access = false;
@ -434,7 +434,8 @@ namespace GLLoader {
// GL4.1 // GL4.1
if (ext.compare("GL_ARB_separate_shader_objects") == 0) { if (ext.compare("GL_ARB_separate_shader_objects") == 0) {
if (!fglrx_buggy_driver && !mesa_amd_buggy_driver && !intel_buggy_driver) found_GL_ARB_separate_shader_objects = true; if (!fglrx_buggy_driver && !mesa_amd_buggy_driver && !intel_buggy_driver) found_GL_ARB_separate_shader_objects = true;
else fprintf(stderr, "Buggy driver detected, GL_ARB_separate_shader_objects will be disabled\n"); else fprintf(stderr, "Buggy driver detected, GL_ARB_separate_shader_objects will be disabled\n"
"Note the extension was fixed on Mesa 11.1, you will need a manual overwrite to use it\n");
} }
// GL4.2 // GL4.2
if (ext.compare("GL_ARB_shading_language_420pack") == 0) found_GL_ARB_shading_language_420pack = true; if (ext.compare("GL_ARB_shading_language_420pack") == 0) found_GL_ARB_shading_language_420pack = true;

2
plugins/GSdx/GSWndOGL.cpp
View File

@ -124,7 +124,7 @@ void GSWndOGL::CheckContext()
int glxMajorVersion, glxMinorVersion; int glxMajorVersion, glxMinorVersion;
glXQueryVersion(m_NativeDisplay, &glxMajorVersion, &glxMinorVersion); glXQueryVersion(m_NativeDisplay, &glxMajorVersion, &glxMinorVersion);
if (glXIsDirect(m_NativeDisplay, m_context)) if (glXIsDirect(m_NativeDisplay, m_context))
fprintf(stderr, "glX-Version %d.%d with Direct Rendering\n", glxMajorVersion, glxMinorVersion); fprintf(stdout, "glX-Version %d.%d with Direct Rendering\n", glxMajorVersion, glxMinorVersion);
else { else {
fprintf(stderr, "glX-Version %d.%d with Indirect Rendering !!! It won't support properly opengl\n", glxMajorVersion, glxMinorVersion); fprintf(stderr, "glX-Version %d.%d with Indirect Rendering !!! It won't support properly opengl\n", glxMajorVersion, glxMinorVersion);
throw GSDXRecoverableError(); throw GSDXRecoverableError();