diff options
| author | 2018-11-24 00:07:42 -0300 | |
|---|---|---|
| committer | 2018-11-28 21:18:13 -0300 | |
| commit | 22c7c710b4cd35b2275b1dbbcaa400c1fbb4243d (patch) | |
| tree | a1f747fd00fc1b348847aaae4705962921bf759c /src | |
| parent | Merge pull request #1808 from Tinob/master (diff) | |
| download | yuzu-22c7c710b4cd35b2275b1dbbcaa400c1fbb4243d.tar.gz yuzu-22c7c710b4cd35b2275b1dbbcaa400c1fbb4243d.tar.xz yuzu-22c7c710b4cd35b2275b1dbbcaa400c1fbb4243d.zip | |
gl_rasterizer: Remove extension booleans
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 13 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.h | 3 | ||||
| -rw-r--r-- | src/yuzu/main.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | 2 |
4 files changed, 4 insertions, 16 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index a44bbfae8..f5c785467 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -88,19 +88,6 @@ RasterizerOpenGL::RasterizerOpenGL(Core::Frontend::EmuWindow& window, ScreenInfo | |||
| 88 | state.texture_units[i].sampler = texture_samplers[i].sampler.handle; | 88 | state.texture_units[i].sampler = texture_samplers[i].sampler.handle; |
| 89 | } | 89 | } |
| 90 | 90 | ||
| 91 | GLint ext_num; | ||
| 92 | glGetIntegerv(GL_NUM_EXTENSIONS, &ext_num); | ||
| 93 | for (GLint i = 0; i < ext_num; i++) { | ||
| 94 | const std::string_view extension{ | ||
| 95 | reinterpret_cast<const char*>(glGetStringi(GL_EXTENSIONS, i))}; | ||
| 96 | |||
| 97 | if (extension == "GL_ARB_direct_state_access") { | ||
| 98 | has_ARB_direct_state_access = true; | ||
| 99 | } else if (extension == "GL_ARB_multi_bind") { | ||
| 100 | has_ARB_multi_bind = true; | ||
| 101 | } | ||
| 102 | } | ||
| 103 | |||
| 104 | OpenGLState::ApplyDefaultState(); | 91 | OpenGLState::ApplyDefaultState(); |
| 105 | 92 | ||
| 106 | // Create render framebuffer | 93 | // Create render framebuffer |
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index 7ec9746b1..f3a163f6b 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h | |||
| @@ -193,9 +193,6 @@ private: | |||
| 193 | /// but are needed for correct emulation | 193 | /// but are needed for correct emulation |
| 194 | void CheckExtensions(); | 194 | void CheckExtensions(); |
| 195 | 195 | ||
| 196 | bool has_ARB_direct_state_access = false; | ||
| 197 | bool has_ARB_multi_bind = false; | ||
| 198 | |||
| 199 | OpenGLState state; | 196 | OpenGLState state; |
| 200 | 197 | ||
| 201 | RasterizerCacheOpenGL res_cache; | 198 | RasterizerCacheOpenGL res_cache; |
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 93bf117c8..d4010001d 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -518,6 +518,8 @@ void GMainWindow::OnDisplayTitleBars(bool show) { | |||
| 518 | QStringList GMainWindow::GetUnsupportedGLExtensions() { | 518 | QStringList GMainWindow::GetUnsupportedGLExtensions() { |
| 519 | QStringList unsupported_ext; | 519 | QStringList unsupported_ext; |
| 520 | 520 | ||
| 521 | if (!GLAD_GL_ARB_direct_state_access) | ||
| 522 | unsupported_ext.append("ARB_direct_state_access"); | ||
| 521 | if (!GLAD_GL_ARB_vertex_type_10f_11f_11f_rev) | 523 | if (!GLAD_GL_ARB_vertex_type_10f_11f_11f_rev) |
| 522 | unsupported_ext.append("ARB_vertex_type_10f_11f_11f_rev"); | 524 | unsupported_ext.append("ARB_vertex_type_10f_11f_11f_rev"); |
| 523 | if (!GLAD_GL_ARB_texture_mirror_clamp_to_edge) | 525 | if (!GLAD_GL_ARB_texture_mirror_clamp_to_edge) |
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp index 2d6f8cced..a557f2884 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | |||
| @@ -111,6 +111,8 @@ void EmuWindow_SDL2::Fullscreen() { | |||
| 111 | bool EmuWindow_SDL2::SupportsRequiredGLExtensions() { | 111 | bool EmuWindow_SDL2::SupportsRequiredGLExtensions() { |
| 112 | std::vector<std::string> unsupported_ext; | 112 | std::vector<std::string> unsupported_ext; |
| 113 | 113 | ||
| 114 | if (!GLAD_GL_ARB_direct_state_access) | ||
| 115 | unsupported_ext.push_back("ARB_direct_state_access"); | ||
| 114 | if (!GLAD_GL_ARB_vertex_type_10f_11f_11f_rev) | 116 | if (!GLAD_GL_ARB_vertex_type_10f_11f_11f_rev) |
| 115 | unsupported_ext.push_back("ARB_vertex_type_10f_11f_11f_rev"); | 117 | unsupported_ext.push_back("ARB_vertex_type_10f_11f_11f_rev"); |
| 116 | if (!GLAD_GL_ARB_texture_mirror_clamp_to_edge) | 118 | if (!GLAD_GL_ARB_texture_mirror_clamp_to_edge) |