From ea08178dde98bb4aee85ae7b1a7263928125e40e Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 1 May 2020 05:52:45 -0400
Subject: [PATCH] gl_rasterizer: Remove unused emu_window variable in
RasterizerOpenGL
Silences an unused private variable warning.
---
src/video_core/renderer_base.cpp | 2 +-
src/video_core/renderer_opengl/gl_rasterizer.cpp | 7 +++----
src/video_core/renderer_opengl/gl_rasterizer.h | 6 ++----
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/video_core/renderer_base.cpp b/src/video_core/renderer_base.cpp
index 8d18b6800..48a3601c2 100644
--- a/src/video_core/renderer_base.cpp
+++ b/src/video_core/renderer_base.cpp
@@ -22,7 +22,7 @@ void RendererBase::RefreshRasterizerSetting() {
opengl_rasterizer_active = hw_renderer_enabled;
if (hw_renderer_enabled) {
- rasterizer = std::make_unique<OpenGL::RasterizerOpenGL>(render_window);
+ rasterizer = std::make_unique<OpenGL::RasterizerOpenGL>();
} else {
rasterizer = std::make_unique<VideoCore::SWRasterizer>();
}
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index b2fd23ff7..92b99eee5 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -44,12 +44,11 @@ static bool IsVendorAmd() {
return gpu_vendor == "ATI Technologies Inc." || gpu_vendor == "Advanced Micro Devices, Inc.";
}
-RasterizerOpenGL::RasterizerOpenGL(Frontend::EmuWindow& window)
- : is_amd(IsVendorAmd()), shader_dirty(true),
- vertex_buffer(GL_ARRAY_BUFFER, VERTEX_BUFFER_SIZE, is_amd),
+RasterizerOpenGL::RasterizerOpenGL()
+ : is_amd(IsVendorAmd()), vertex_buffer(GL_ARRAY_BUFFER, VERTEX_BUFFER_SIZE, is_amd),
uniform_buffer(GL_UNIFORM_BUFFER, UNIFORM_BUFFER_SIZE, false),
index_buffer(GL_ELEMENT_ARRAY_BUFFER, INDEX_BUFFER_SIZE, false),
- texture_buffer(GL_TEXTURE_BUFFER, TEXTURE_BUFFER_SIZE, false), emu_window{window} {
+ texture_buffer(GL_TEXTURE_BUFFER, TEXTURE_BUFFER_SIZE, false) {
allow_shadow = GLAD_GL_ARB_shader_image_load_store && GLAD_GL_ARB_shader_image_size &&
GLAD_GL_ARB_framebuffer_no_attachments;
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h
index 11b479486..bfddef4d9 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.h
+++ b/src/video_core/renderer_opengl/gl_rasterizer.h
@@ -38,7 +38,7 @@ class ShaderProgramManager;
class RasterizerOpenGL : public VideoCore::RasterizerInterface {
public:
- explicit RasterizerOpenGL(Frontend::EmuWindow& renderer);
+ explicit RasterizerOpenGL();
~RasterizerOpenGL() override;
void LoadDiskResources(const std::atomic_bool& stop_loading,
@@ -268,11 +268,9 @@ private:
RasterizerCacheOpenGL res_cache;
- Frontend::EmuWindow& emu_window;
-
std::vector<HardwareVertex> vertex_batch;
- bool shader_dirty;
+ bool shader_dirty = true;
struct {
UniformData data;