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

gsdx-ogl: mark GL_EXT_shader_io_blocks as mandatory for GLES

This commit is contained in:
Gregory Hainaut 2014-10-02 19:09:31 +02:00
parent ccc1137e12
commit a573ce185c
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/GSdx/GLLoader.cpp
View File

@ -159,7 +159,8 @@ namespace GLLoader {
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_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
bool found_GL_ARB_buffer_storage = false; bool found_GL_ARB_buffer_storage = false;
bool found_GL_ARB_explicit_uniform_location = false; // need by subroutine // Note: except Apple, all drivers support explicit uniform location
bool found_GL_ARB_explicit_uniform_location = false; // need by subroutine and bindless texture
// GL4 hardware // GL4 hardware
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;
@ -330,7 +331,7 @@ namespace GLLoader {
status &= status_and_override(found_GL_ARB_clip_control, "GL_ARB_clip_control"); status &= status_and_override(found_GL_ARB_clip_control, "GL_ARB_clip_control");
status &= status_and_override(found_GL_ARB_direct_state_access, "GL_ARB_direct_state_access"); status &= status_and_override(found_GL_ARB_direct_state_access, "GL_ARB_direct_state_access");
#else // ENABLE_GLES #else // ENABLE_GLES
status &= status_and_override(found_GL_EXT_shader_io_blocks, "GL_EXT_shader_io_blocks"); status &= status_and_override(found_GL_EXT_shader_io_blocks, "GL_EXT_shader_io_blocks", true);
#endif #endif
fprintf(stderr, "\n"); fprintf(stderr, "\n");

3
plugins/GSdx/GLLoader.h
View File

@ -415,7 +415,6 @@ namespace GLLoader {
// GL // GL
extern bool found_GL_ARB_separate_shader_objects; extern bool found_GL_ARB_separate_shader_objects;
extern bool found_GL_ARB_shading_language_420pack;
extern bool found_GL_ARB_copy_image; extern bool found_GL_ARB_copy_image;
extern bool found_geometry_shader; extern bool found_geometry_shader;
extern bool found_GL_ARB_gpu_shader5; extern bool found_GL_ARB_gpu_shader5;
@ -427,6 +426,4 @@ namespace GLLoader {
extern bool found_GL_ARB_explicit_uniform_location; extern bool found_GL_ARB_explicit_uniform_location;
extern bool found_GL_ARB_clip_control; extern bool found_GL_ARB_clip_control;
extern bool found_GL_ARB_direct_state_access; extern bool found_GL_ARB_direct_state_access;
// GLES
extern bool found_GL_EXT_shader_io_blocks;
} }