diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-16 01:40:30 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-16 01:40:30 +0100 |
| commit | 7007ec9e42bf443566846296aa70aba47ee9feb3 (patch) | |
| tree | ad5cae07003480fdf2de3ffbd80af5f8644ab39d /gfx | |
| parent | 058105eec0564943dd872a7ae43cd8a5b94f0abf (diff) | |
| download | UXP-7007ec9e42bf443566846296aa70aba47ee9feb3.tar UXP-7007ec9e42bf443566846296aa70aba47ee9feb3.tar.gz UXP-7007ec9e42bf443566846296aa70aba47ee9feb3.tar.lz UXP-7007ec9e42bf443566846296aa70aba47ee9feb3.tar.xz UXP-7007ec9e42bf443566846296aa70aba47ee9feb3.zip | |
Issue #1354 - Don't allow glsl[130,400] unless we have gpu_shader5
- Teach GLContext about gpu_shader5
- Downgrade shader language version if gpu_shader5 support isn't found.
Diffstat (limited to 'gfx')
| -rw-r--r-- | gfx/gl/GLContext.cpp | 3 | ||||
| -rw-r--r-- | gfx/gl/GLContext.h | 4 | ||||
| -rw-r--r-- | gfx/gl/GLContextFeatures.cpp | 12 |
3 files changed, 19 insertions, 0 deletions
diff --git a/gfx/gl/GLContext.cpp b/gfx/gl/GLContext.cpp index 33315413f..1515b8627 100644 --- a/gfx/gl/GLContext.cpp +++ b/gfx/gl/GLContext.cpp @@ -95,6 +95,7 @@ static const char* const sExtensionNames[] = { "GL_ARB_framebuffer_object", "GL_ARB_framebuffer_sRGB", "GL_ARB_geometry_shader4", + "GL_ARB_gpu_shader5", "GL_ARB_half_float_pixel", "GL_ARB_instanced_arrays", "GL_ARB_internalformat_query", @@ -134,6 +135,7 @@ static const char* const sExtensionNames[] = { "GL_EXT_framebuffer_object", "GL_EXT_framebuffer_sRGB", "GL_EXT_gpu_shader4", + "GL_EXT_gpu_shader5", "GL_EXT_multisampled_render_to_texture", "GL_EXT_occlusion_query_boolean", "GL_EXT_packed_depth_stencil", @@ -160,6 +162,7 @@ static const char* const sExtensionNames[] = { "GL_NV_fence", "GL_NV_framebuffer_blit", "GL_NV_geometry_program4", + "GL_NV_gpu_shader5", "GL_NV_half_float", "GL_NV_instanced_arrays", "GL_NV_primitive_restart", diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h index c82efceda..6e3e22207 100644 --- a/gfx/gl/GLContext.h +++ b/gfx/gl/GLContext.h @@ -102,6 +102,7 @@ enum class GLFeature { get_query_object_iv, get_string_indexed, gpu_shader4, + gpu_shader5, instanced_arrays, instanced_non_arrays, internalformat_query, @@ -421,6 +422,7 @@ public: ARB_framebuffer_object, ARB_framebuffer_sRGB, ARB_geometry_shader4, + ARB_gpu_shader5, ARB_half_float_pixel, ARB_instanced_arrays, ARB_internalformat_query, @@ -460,6 +462,7 @@ public: EXT_framebuffer_object, EXT_framebuffer_sRGB, EXT_gpu_shader4, + EXT_gpu_shader5, EXT_multisampled_render_to_texture, EXT_occlusion_query_boolean, EXT_packed_depth_stencil, @@ -486,6 +489,7 @@ public: NV_fence, NV_framebuffer_blit, NV_geometry_program4, + NV_gpu_shader5, NV_half_float, NV_instanced_arrays, NV_primitive_restart, diff --git a/gfx/gl/GLContextFeatures.cpp b/gfx/gl/GLContextFeatures.cpp index 0714d9641..d4f37803f 100644 --- a/gfx/gl/GLContextFeatures.cpp +++ b/gfx/gl/GLContextFeatures.cpp @@ -332,6 +332,18 @@ static const FeatureInfo sFeatureInfoArr[] = { } }, { + "gpu_shader5", + GLVersion::GL4, + GLESVersion::NONE, + GLContext::Extension_None, + { + GLContext::ARB_gpu_shader5, + GLContext::EXT_gpu_shader5, + GLContext::NV_gpu_shader5, + GLContext::Extensions_End + } + }, + { "instanced_arrays", GLVersion::GL3_3, GLESVersion::ES3, |