diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2020-01-08 15:28:29 +0100 |
---|---|---|
committer | FernandoS27 <fsahmkow27@gmail.com> | 2020-01-24 21:43:30 +0100 |
commit | b97608ca646962a6f5a217b9477bdd86eed5e48f (patch) | |
tree | 28f43af9ca1f3dc4b97542a6bdaab95af687e036 /src | |
parent | Shader_IR: Address Feedback (diff) | |
download | yuzu-b97608ca646962a6f5a217b9477bdd86eed5e48f.tar yuzu-b97608ca646962a6f5a217b9477bdd86eed5e48f.tar.gz yuzu-b97608ca646962a6f5a217b9477bdd86eed5e48f.tar.bz2 yuzu-b97608ca646962a6f5a217b9477bdd86eed5e48f.tar.lz yuzu-b97608ca646962a6f5a217b9477bdd86eed5e48f.tar.xz yuzu-b97608ca646962a6f5a217b9477bdd86eed5e48f.tar.zst yuzu-b97608ca646962a6f5a217b9477bdd86eed5e48f.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/video_core/engines/const_buffer_engine_interface.h | 1 | ||||
-rw-r--r-- | src/video_core/engines/kepler_compute.cpp | 4 | ||||
-rw-r--r-- | src/video_core/engines/kepler_compute.h | 2 | ||||
-rw-r--r-- | src/video_core/engines/maxwell_3d.cpp | 4 | ||||
-rw-r--r-- | src/video_core/engines/maxwell_3d.h | 2 | ||||
-rw-r--r-- | src/video_core/rasterizer_interface.h | 4 | ||||
-rw-r--r-- | src/video_core/shader/const_buffer_locker.h | 2 |
7 files changed, 18 insertions, 1 deletions
diff --git a/src/video_core/engines/const_buffer_engine_interface.h b/src/video_core/engines/const_buffer_engine_interface.h index c29156e34..d56a47710 100644 --- a/src/video_core/engines/const_buffer_engine_interface.h +++ b/src/video_core/engines/const_buffer_engine_interface.h @@ -109,6 +109,7 @@ public: virtual u32 GetBoundBuffer() const = 0; virtual VideoCore::GuestDriverProfile& AccessGuestDriverProfile() = 0; + virtual const VideoCore::GuestDriverProfile& AccessGuestDriverProfile() const = 0; }; } // namespace Tegra::Engines diff --git a/src/video_core/engines/kepler_compute.cpp b/src/video_core/engines/kepler_compute.cpp index f177ae938..4b824aa4e 100644 --- a/src/video_core/engines/kepler_compute.cpp +++ b/src/video_core/engines/kepler_compute.cpp @@ -98,6 +98,10 @@ VideoCore::GuestDriverProfile& KeplerCompute::AccessGuestDriverProfile() { return rasterizer.AccessGuestDriverProfile(); } +const VideoCore::GuestDriverProfile& KeplerCompute::AccessGuestDriverProfile() const { + return rasterizer.AccessGuestDriverProfile(); +} + void KeplerCompute::ProcessLaunch() { const GPUVAddr launch_desc_loc = regs.launch_desc_loc.Address(); memory_manager.ReadBlockUnsafe(launch_desc_loc, &launch_description, diff --git a/src/video_core/engines/kepler_compute.h b/src/video_core/engines/kepler_compute.h index 99c82a9af..eeb79c56f 100644 --- a/src/video_core/engines/kepler_compute.h +++ b/src/video_core/engines/kepler_compute.h @@ -220,6 +220,8 @@ public: VideoCore::GuestDriverProfile& AccessGuestDriverProfile() override; + const VideoCore::GuestDriverProfile& AccessGuestDriverProfile() const override; + private: Core::System& system; VideoCore::RasterizerInterface& rasterizer; diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp index 8167864c0..7cea146f0 100644 --- a/src/video_core/engines/maxwell_3d.cpp +++ b/src/video_core/engines/maxwell_3d.cpp @@ -788,4 +788,8 @@ VideoCore::GuestDriverProfile& Maxwell3D::AccessGuestDriverProfile() { return rasterizer.AccessGuestDriverProfile(); } +const VideoCore::GuestDriverProfile& Maxwell3D::AccessGuestDriverProfile() const { + return rasterizer.AccessGuestDriverProfile(); +} + } // namespace Tegra::Engines diff --git a/src/video_core/engines/maxwell_3d.h b/src/video_core/engines/maxwell_3d.h index 08ef95410..8808bbf76 100644 --- a/src/video_core/engines/maxwell_3d.h +++ b/src/video_core/engines/maxwell_3d.h @@ -1308,6 +1308,8 @@ public: VideoCore::GuestDriverProfile& AccessGuestDriverProfile() override; + const VideoCore::GuestDriverProfile& AccessGuestDriverProfile() const override; + /// Memory for macro code - it's undetermined how big this is, however 1MB is much larger than /// we've seen used. using MacroMemory = std::array<u32, 0x40000>; diff --git a/src/video_core/rasterizer_interface.h b/src/video_core/rasterizer_interface.h index 149f79af3..1b0cc56f1 100644 --- a/src/video_core/rasterizer_interface.h +++ b/src/video_core/rasterizer_interface.h @@ -84,6 +84,10 @@ public: return guest_driver_profile; } + const GuestDriverProfile& AccessGuestDriverProfile() const { + return guest_driver_profile; + } + private: GuestDriverProfile guest_driver_profile{}; }; diff --git a/src/video_core/shader/const_buffer_locker.h b/src/video_core/shader/const_buffer_locker.h index c7b72fa5e..f5655ac64 100644 --- a/src/video_core/shader/const_buffer_locker.h +++ b/src/video_core/shader/const_buffer_locker.h @@ -81,7 +81,7 @@ public: return bound_buffer; } - VideoCore::GuestDriverProfile* AccessGuestDriverProfile() { + VideoCore::GuestDriverProfile* AccessGuestDriverProfile() const { if (engine) { return &(engine->AccessGuestDriverProfile()); } |