summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2022-01-04 20:28:49 +0100
committerGitHub <noreply@github.com>2022-01-04 20:28:49 +0100
commitafb06b149505b21af976d3d1e24186b8260ee018 (patch)
tree9776b690684a4fc3914662b33414c18eca5f1c6b
parentMerge pull request #7670 from ameerj/vsync-block (diff)
parentRemove invalid assertion statement (diff)
downloadyuzu-afb06b149505b21af976d3d1e24186b8260ee018.tar
yuzu-afb06b149505b21af976d3d1e24186b8260ee018.tar.gz
yuzu-afb06b149505b21af976d3d1e24186b8260ee018.tar.bz2
yuzu-afb06b149505b21af976d3d1e24186b8260ee018.tar.lz
yuzu-afb06b149505b21af976d3d1e24186b8260ee018.tar.xz
yuzu-afb06b149505b21af976d3d1e24186b8260ee018.tar.zst
yuzu-afb06b149505b21af976d3d1e24186b8260ee018.zip
-rw-r--r--src/core/hle/service/nvflinger/buffer_queue.cpp4
-rw-r--r--src/core/hle/service/nvflinger/buffer_queue.h5
-rw-r--r--src/core/hle/service/nvflinger/nvflinger.cpp3
-rw-r--r--src/video_core/gpu.cpp1
4 files changed, 9 insertions, 4 deletions
diff --git a/src/core/hle/service/nvflinger/buffer_queue.cpp b/src/core/hle/service/nvflinger/buffer_queue.cpp
index b4c3a6099..5fead6d1b 100644
--- a/src/core/hle/service/nvflinger/buffer_queue.cpp
+++ b/src/core/hle/service/nvflinger/buffer_queue.cpp
@@ -186,6 +186,10 @@ u32 BufferQueue::Query(QueryType type) {
case QueryType::NativeWindowWidth:
case QueryType::NativeWindowHeight:
break;
+ case QueryType::NativeWindowMinUndequeuedBuffers:
+ return 0;
+ case QueryType::NativeWindowConsumerUsageBits:
+ return 0;
}
UNIMPLEMENTED_MSG("Unimplemented query type={}", type);
return 0;
diff --git a/src/core/hle/service/nvflinger/buffer_queue.h b/src/core/hle/service/nvflinger/buffer_queue.h
index 7b7baeaea..f2a579133 100644
--- a/src/core/hle/service/nvflinger/buffer_queue.h
+++ b/src/core/hle/service/nvflinger/buffer_queue.h
@@ -57,6 +57,11 @@ public:
NativeWindowWidth = 0,
NativeWindowHeight = 1,
NativeWindowFormat = 2,
+ /// The minimum number of buffers that must remain un-dequeued after a buffer has been
+ /// queued
+ NativeWindowMinUndequeuedBuffers = 3,
+ /// The consumer gralloc usage bits currently set by the consumer
+ NativeWindowConsumerUsageBits = 10,
};
explicit BufferQueue(Kernel::KernelCore& kernel, u32 id_, u64 layer_id_,
diff --git a/src/core/hle/service/nvflinger/nvflinger.cpp b/src/core/hle/service/nvflinger/nvflinger.cpp
index a22811ec1..01e69de30 100644
--- a/src/core/hle/service/nvflinger/nvflinger.cpp
+++ b/src/core/hle/service/nvflinger/nvflinger.cpp
@@ -100,9 +100,6 @@ std::optional<u64> NVFlinger::OpenDisplay(std::string_view name) {
LOG_DEBUG(Service, "Opening \"{}\" display", name);
- // TODO(Subv): Currently we only support the Default display.
- ASSERT(name == "Default");
-
const auto itr =
std::find_if(displays.begin(), displays.end(),
[&](const VI::Display& display) { return display.GetName() == name; });
diff --git a/src/video_core/gpu.cpp b/src/video_core/gpu.cpp
index 44fda27ef..705765c99 100644
--- a/src/video_core/gpu.cpp
+++ b/src/video_core/gpu.cpp
@@ -17,7 +17,6 @@
#include "core/frontend/emu_window.h"
#include "core/hardware_interrupt_manager.h"
#include "core/hle/service/nvdrv/nvdata.h"
-#include "core/hle/service/nvflinger/buffer_queue.h"
#include "core/perf_stats.h"
#include "video_core/cdma_pusher.h"
#include "video_core/dma_pusher.h"