From dc5cfa8d287757dede737553b6f1f8521971c6e2 Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow <fsahmkow27@gmail.com>
Date: Sun, 5 Jan 2020 12:08:39 -0400
Subject: [PATCH] Shader_IR: Address Feedback
---
src/video_core/guest_driver.cpp | 7 ++--
src/video_core/guest_driver.h | 2 +-
src/video_core/shader/const_buffer_locker.h | 1 -
src/video_core/shader/decode.cpp | 42 ++++++++++++---------
4 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/src/video_core/guest_driver.cpp b/src/video_core/guest_driver.cpp
index 55b9bd021..1ded52905 100644
--- a/src/video_core/guest_driver.cpp
+++ b/src/video_core/guest_driver.cpp
@@ -1,8 +1,9 @@
-// Copyright 2019 yuzu Emulator Project
+// Copyright 2020 yuzu Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include <algorithm>
+#include <climits>
#include "video_core/guest_driver.h"
@@ -12,13 +13,13 @@ void GuestDriverProfile::DeduceTextureHandlerSize(std::vector<u32>&& bound_offse
if (texture_handler_size_deduced) {
return;
}
- std::size_t size = bound_offsets.size();
+ const std::size_t size = bound_offsets.size();
if (size < 2) {
return;
}
std::sort(bound_offsets.begin(), bound_offsets.end(),
[](const u32& a, const u32& b) { return a < b; });
- u32 min_val = 0xFFFFFFFF; // set to highest possible 32 bit integer;
+ u32 min_val = UINT_MAX;
for (std::size_t i = 1; i < size; i++) {
if (bound_offsets[i] == bound_offsets[i - 1]) {
continue;
diff --git a/src/video_core/guest_driver.h b/src/video_core/guest_driver.h
index 7687a0434..e08588ee9 100644
--- a/src/video_core/guest_driver.h
+++ b/src/video_core/guest_driver.h
@@ -1,4 +1,4 @@
-// Copyright 2019 yuzu Emulator Project
+// Copyright 2020 yuzu Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
diff --git a/src/video_core/shader/const_buffer_locker.h b/src/video_core/shader/const_buffer_locker.h
index f26cce2ce..c7b72fa5e 100644
--- a/src/video_core/shader/const_buffer_locker.h
+++ b/src/video_core/shader/const_buffer_locker.h
@@ -53,7 +53,6 @@ public:
void InsertBindlessSampler(u32 buffer, u32 offset, Tegra::Engines::SamplerDescriptor sampler);
/// Set the bound buffer for this locker.
-
void SetBoundBuffer(u32 buffer);
/// Checks keys and samplers against engine's current const buffers. Returns true if they are
diff --git a/src/video_core/shader/decode.cpp b/src/video_core/shader/decode.cpp
index aed35a9b8..c702c7629 100644
--- a/src/video_core/shader/decode.cpp
+++ b/src/video_core/shader/decode.cpp
@@ -315,25 +315,33 @@ u32 ShaderIR::DecodeInstr(NodeBlock& bb, u32 pc) {
return pc + 1;
}
-void ShaderIR::PostDecode() {
- // Deduce texture handler size if needed
- auto* gpu_driver = locker.AccessGuestDriverProfile();
- if (gpu_driver) {
- if (!gpu_driver->TextureHandlerSizeKnown() && used_samplers.size() > 1) {
- u32 count{};
- std::vector<u32> bound_offsets;
- for (const auto& sampler : used_samplers) {
- if (sampler.IsBindless()) {
- continue;
- }
- count++;
- bound_offsets.emplace_back(sampler.GetOffset());
- }
- if (count > 1) {
- gpu_driver->DeduceTextureHandlerSize(std::move(bound_offsets));
- }
+void DeduceTextureHandlerSize(VideoCore::GuestDriverProfile* gpu_driver,
+ std::list<Sampler>& used_samplers) {
+ if (gpu_driver == nullptr) {
+ LOG_CRITICAL(HW_GPU, "GPU Driver profile has not been created yet");
+ return;
+ }
+ if (gpu_driver->TextureHandlerSizeKnown() || used_samplers.size() <= 1) {
+ return;
+ }
+ u32 count{};
+ std::vector<u32> bound_offsets;
+ for (const auto& sampler : used_samplers) {
+ if (sampler.IsBindless()) {
+ continue;
}
+ count++;
+ bound_offsets.emplace_back(sampler.GetOffset());
+ }
+ if (count > 1) {
+ gpu_driver->DeduceTextureHandlerSize(std::move(bound_offsets));
}
}
+void ShaderIR::PostDecode() {
+ // Deduce texture handler size if needed
+ auto* gpu_driver = locker.AccessGuestDriverProfile();
+ DeduceTextureHandlerSize(gpu_driver, used_samplers);
+}
+
} // namespace VideoCommon::Shader