Skip to content

Commit

Permalink
gsdx ogl: minor string update
Browse files Browse the repository at this point in the history
  • Loading branch information
@gregory38
gregory38 committed Jan 1, 2016
1 parent 6e34f18 commit 7aae0ce
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions plugins/GSdx/GLLoader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,16 +329,16 @@ namespace GLLoader {


// 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_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_buffer_storage = false;
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_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
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_clip_control = false;
bool found_GL_ARB_direct_state_access = false;
Expand Down Expand Up @@ -434,7 +434,8 @@ namespace GLLoader {
// GL4.1
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;
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
if (ext.compare("GL_ARB_shading_language_420pack") == 0) found_GL_ARB_shading_language_420pack = true;
Expand Down
2 changes: 1 addition & 1 deletion plugins/GSdx/GSWndOGL.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ void GSWndOGL::CheckContext()
int glxMajorVersion, glxMinorVersion;
glXQueryVersion(m_NativeDisplay, &glxMajorVersion, &glxMinorVersion);
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 {
fprintf(stderr, "glX-Version %d.%d with Indirect Rendering !!! It won't support properly opengl\n", glxMajorVersion, glxMinorVersion);
throw GSDXRecoverableError();
Expand Down

9 comments on commit 7aae0ce

@frantisekz
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GL_ARB_separate_shader_objects is still buggy on Intel with Mesa 11.1. Perf boost is nice in some games (reduced GS usage by up to 20%) but glitches are present. Do you want debug build logs?

@gregory38
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seriously. Mesa's dev did various change so maybe it broke again. Would it be possible to test latest Mesa?

Could you describe me the glitches? Is the geometry shader enabled? Could you test without them?

@frantisekz
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A picture is worth a thousand words - http://imgur.com/a/DW7nt
Everything is ok with disabled Geometry Shaders but perf gain is gone too

I can test latest mesa git but it'll take a while.

@gregory38
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hum :(

I can test latest mesa git but it'll take a while.

Please do. I'm not in the mood to restart my computer. Besides, GS is disabled on Gallium driver (Nouveau here). I'm not sure I will be able to debug the SSO issue on my computer.

By the way, I'm surprise of the perf impact of GS.

@frantisekz
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, I can't even boot with mesa from git :(

I'll keep an eye on this and report when something changes.

@gregory38
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By boot, you mean your computer? or PCSX2?

You don't need to install it normally. You can keep mesa 11.1.0 in your computer. You just need to select the GL runtime driver.

    mesa=/home/gregory/project/mesa 
    export LIBGL_DRIVERS_PATH=$mesa/lib/gallium
    export EGL_DRIVERS_PATH=$mesa/lib/egl
    export LD_LIBRARY_PATH="$mesa/lib"

@frantisekz
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've meant computer. Thanks, I've forgot about this (i was compiling mesa as rpm and then upgrading it :/ ...). I'll look into this later today.

@frantisekz
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So it's same even on latest Mesa.

@gregory38
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. Please open me a github bug report. I will look into it after the 1.4 release. Or if you manage to generate a short apitrace trace, you could open a bug report in mesa (put the one with the reverted screen). It would be easier to debug and put me in cc and Timothy.

Please sign in to comment.