lux/citra
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/citra.git synced 2024-12-01 00:12:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2298 from lioncash/variable

Browse source 
video_core/{gl_rasterizer, gpu_thread}: Remove unused class variables where applicable
This commit is contained in:
bunnei 2019-03-30 19:59:45 -04:00 committed by GitHub
parent ba3d95e550 947d364dba
commit e199d1e14f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/video_core/gpu_thread.cpp
View file

@ -52,8 +52,8 @@ static void RunThread(VideoCore::RendererBase& renderer, Tegra::DmaPusher& dma_p
} }
ThreadManager::ThreadManager(VideoCore::RendererBase& renderer, Tegra::DmaPusher& dma_pusher) ThreadManager::ThreadManager(VideoCore::RendererBase& renderer, Tegra::DmaPusher& dma_pusher)
: renderer{renderer}, dma_pusher{dma_pusher}, thread{RunThread, std::ref(renderer), : renderer{renderer}, thread{RunThread, std::ref(renderer), std::ref(dma_pusher),
std::ref(dma_pusher), std::ref(state)} {} std::ref(state)} {}
ThreadManager::~ThreadManager() { ThreadManager::~ThreadManager() {
// Notify GPU thread that a shutdown is pending // Notify GPU thread that a shutdown is pending

3
src/video_core/gpu_thread.h
View file

@ -4,10 +4,8 @@
#pragma once #pragma once
#include <array>
#include <atomic> #include <atomic>
#include <condition_variable> #include <condition_variable>
#include <memory>
#include <mutex> #include <mutex>
#include <optional> #include <optional>
#include <thread> #include <thread>
@ -177,7 +175,6 @@ private:
private: private:
SynchState state; SynchState state;
VideoCore::RendererBase& renderer; VideoCore::RendererBase& renderer;
Tegra::DmaPusher& dma_pusher;
std::thread thread; std::thread thread;
std::thread::id thread_id; std::thread::id thread_id;
}; };

8
src/video_core/renderer_opengl/gl_rasterizer.cpp
View file

@ -100,11 +100,9 @@ struct FramebufferCacheKey {
} }
}; };
RasterizerOpenGL::RasterizerOpenGL(Core::Frontend::EmuWindow& window, Core::System& system, RasterizerOpenGL::RasterizerOpenGL(Core::System& system, ScreenInfo& info)
ScreenInfo& info) : res_cache{*this}, shader_cache{*this, system}, global_cache{*this}, system{system},
: res_cache{*this}, shader_cache{*this, system}, global_cache{*this}, screen_info{info}, buffer_cache(*this, STREAM_BUFFER_SIZE) {
emu_window{window}, system{system}, screen_info{info},
buffer_cache(*this, STREAM_BUFFER_SIZE) {
// Create sampler objects // Create sampler objects
for (std::size_t i = 0; i < texture_samplers.size(); ++i) { for (std::size_t i = 0; i < texture_samplers.size(); ++i) {
texture_samplers[i].Create(); texture_samplers[i].Create();

4
src/video_core/renderer_opengl/gl_rasterizer.h
View file

@ -50,8 +50,7 @@ struct FramebufferCacheKey;
class RasterizerOpenGL : public VideoCore::RasterizerInterface { class RasterizerOpenGL : public VideoCore::RasterizerInterface {
public: public:
explicit RasterizerOpenGL(Core::Frontend::EmuWindow& window, Core::System& system, explicit RasterizerOpenGL(Core::System& system, ScreenInfo& info);
ScreenInfo& info);
~RasterizerOpenGL() override; ~RasterizerOpenGL() override;
void DrawArrays() override; void DrawArrays() override;
@ -214,7 +213,6 @@ private:
ShaderCacheOpenGL shader_cache; ShaderCacheOpenGL shader_cache;
GlobalRegionCacheOpenGL global_cache; GlobalRegionCacheOpenGL global_cache;
Core::Frontend::EmuWindow& emu_window;
Core::System& system; Core::System& system;
ScreenInfo& screen_info; ScreenInfo& screen_info;

2
src/video_core/renderer_opengl/renderer_opengl.cpp
View file

@ -266,7 +266,7 @@ void RendererOpenGL::CreateRasterizer() {
} }
// Initialize sRGB Usage // Initialize sRGB Usage
OpenGLState::ClearsRGBUsed(); OpenGLState::ClearsRGBUsed();
rasterizer = std::make_unique<RasterizerOpenGL>(render_window, system, screen_info); rasterizer = std::make_unique<RasterizerOpenGL>(system, screen_info);
} }
void RendererOpenGL::ConfigureFramebufferTexture(TextureInfo& texture, void RendererOpenGL::ConfigureFramebufferTexture(TextureInfo& texture,