summaryrefslogtreecommitdiff
path: root/src/video_core/renderer_opengl
diff options
context:
space:
mode:
authorGravatar Fernando Sahmkow2023-12-31 20:55:15 +0100
committerGravatar Liam2024-01-18 21:12:30 -0500
commit590d9b7e1d875e0403fb87cfcd4a8d52c50e2b81 (patch)
treeb9eb43c5a4af892d5fda77fac241099c166c2380 /src/video_core/renderer_opengl
parentSMMU: Fix software rendering and cleanup (diff)
downloadyuzu-590d9b7e1d875e0403fb87cfcd4a8d52c50e2b81.tar.gz
yuzu-590d9b7e1d875e0403fb87cfcd4a8d52c50e2b81.tar.xz
yuzu-590d9b7e1d875e0403fb87cfcd4a8d52c50e2b81.zip
Core: Clang format and other small issues.
Diffstat (limited to 'src/video_core/renderer_opengl')
-rw-r--r--src/video_core/renderer_opengl/gl_buffer_cache.h3
-rw-r--r--src/video_core/renderer_opengl/gl_query_cache.cpp3
-rw-r--r--src/video_core/renderer_opengl/gl_query_cache.h5
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.h6
4 files changed, 9 insertions, 8 deletions
diff --git a/src/video_core/renderer_opengl/gl_buffer_cache.h b/src/video_core/renderer_opengl/gl_buffer_cache.h
index e6ad030cb..af34c272b 100644
--- a/src/video_core/renderer_opengl/gl_buffer_cache.h
+++ b/src/video_core/renderer_opengl/gl_buffer_cache.h
@@ -20,8 +20,7 @@ class BufferCacheRuntime;
20 20
21class Buffer : public VideoCommon::BufferBase { 21class Buffer : public VideoCommon::BufferBase {
22public: 22public:
23 explicit Buffer(BufferCacheRuntime&, DAddr cpu_addr, 23 explicit Buffer(BufferCacheRuntime&, DAddr cpu_addr, u64 size_bytes);
24 u64 size_bytes);
25 explicit Buffer(BufferCacheRuntime&, VideoCommon::NullBufferParams); 24 explicit Buffer(BufferCacheRuntime&, VideoCommon::NullBufferParams);
26 25
27 void ImmediateUpload(size_t offset, std::span<const u8> data) noexcept; 26 void ImmediateUpload(size_t offset, std::span<const u8> data) noexcept;
diff --git a/src/video_core/renderer_opengl/gl_query_cache.cpp b/src/video_core/renderer_opengl/gl_query_cache.cpp
index 567292e1c..2147d587f 100644
--- a/src/video_core/renderer_opengl/gl_query_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_query_cache.cpp
@@ -35,7 +35,8 @@ constexpr GLenum GetTarget(VideoCore::QueryType type) {
35 35
36} // Anonymous namespace 36} // Anonymous namespace
37 37
38QueryCache::QueryCache(RasterizerOpenGL& rasterizer_, Tegra::MaxwellDeviceMemoryManager& device_memory_) 38QueryCache::QueryCache(RasterizerOpenGL& rasterizer_,
39 Tegra::MaxwellDeviceMemoryManager& device_memory_)
39 : QueryCacheLegacy(rasterizer_, device_memory_), gl_rasterizer{rasterizer_} { 40 : QueryCacheLegacy(rasterizer_, device_memory_), gl_rasterizer{rasterizer_} {
40 EnableCounters(); 41 EnableCounters();
41} 42}
diff --git a/src/video_core/renderer_opengl/gl_query_cache.h b/src/video_core/renderer_opengl/gl_query_cache.h
index 04a1b39c9..38118f355 100644
--- a/src/video_core/renderer_opengl/gl_query_cache.h
+++ b/src/video_core/renderer_opengl/gl_query_cache.h
@@ -8,10 +8,10 @@
8#include <vector> 8#include <vector>
9 9
10#include "common/common_types.h" 10#include "common/common_types.h"
11#include "video_core/host1x/gpu_device_memory_manager.h"
11#include "video_core/query_cache.h" 12#include "video_core/query_cache.h"
12#include "video_core/rasterizer_interface.h" 13#include "video_core/rasterizer_interface.h"
13#include "video_core/renderer_opengl/gl_resource_manager.h" 14#include "video_core/renderer_opengl/gl_resource_manager.h"
14#include "video_core/host1x/gpu_device_memory_manager.h"
15 15
16namespace Core { 16namespace Core {
17class System; 17class System;
@@ -29,7 +29,8 @@ using CounterStream = VideoCommon::CounterStreamBase<QueryCache, HostCounter>;
29class QueryCache final 29class QueryCache final
30 : public VideoCommon::QueryCacheLegacy<QueryCache, CachedQuery, CounterStream, HostCounter> { 30 : public VideoCommon::QueryCacheLegacy<QueryCache, CachedQuery, CounterStream, HostCounter> {
31public: 31public:
32 explicit QueryCache(RasterizerOpenGL& rasterizer_, Tegra::MaxwellDeviceMemoryManager& device_memory_); 32 explicit QueryCache(RasterizerOpenGL& rasterizer_,
33 Tegra::MaxwellDeviceMemoryManager& device_memory_);
33 ~QueryCache(); 34 ~QueryCache();
34 35
35 OGLQuery AllocateQuery(VideoCore::QueryType type); 36 OGLQuery AllocateQuery(VideoCore::QueryType type);
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h
index f197774ed..34aa73526 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.h
+++ b/src/video_core/renderer_opengl/gl_rasterizer.h
@@ -75,9 +75,9 @@ class RasterizerOpenGL : public VideoCore::RasterizerInterface,
75 protected VideoCommon::ChannelSetupCaches<VideoCommon::ChannelInfo> { 75 protected VideoCommon::ChannelSetupCaches<VideoCommon::ChannelInfo> {
76public: 76public:
77 explicit RasterizerOpenGL(Core::Frontend::EmuWindow& emu_window_, Tegra::GPU& gpu_, 77 explicit RasterizerOpenGL(Core::Frontend::EmuWindow& emu_window_, Tegra::GPU& gpu_,
78 Tegra::MaxwellDeviceMemoryManager& device_memory_, const Device& device_, 78 Tegra::MaxwellDeviceMemoryManager& device_memory_,
79 ScreenInfo& screen_info_, ProgramManager& program_manager_, 79 const Device& device_, ScreenInfo& screen_info_,
80 StateTracker& state_tracker_); 80 ProgramManager& program_manager_, StateTracker& state_tracker_);
81 ~RasterizerOpenGL() override; 81 ~RasterizerOpenGL() override;
82 82
83 void Draw(bool is_indexed, u32 instance_count) override; 83 void Draw(bool is_indexed, u32 instance_count) override;