OpenPunk/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-12-26 05:10:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7636 from vonchenplus/buffer_queue_query

Browse Source 
core:hle:service:nvflinger Implement few type in bufferqueue query method
This commit is contained in:
bunnei 2022-01-04 11:28:49 -08:00 committed by GitHub
commit afb06b1495
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/hle/service/nvflinger/buffer_queue.cpp
View File

@ -186,6 +186,10 @@ u32 BufferQueue::Query(QueryType type) {
case QueryType::NativeWindowWidth: case QueryType::NativeWindowWidth:
case QueryType::NativeWindowHeight: case QueryType::NativeWindowHeight:
break; break;
case QueryType::NativeWindowMinUndequeuedBuffers:
return 0;
case QueryType::NativeWindowConsumerUsageBits:
return 0;
} }
UNIMPLEMENTED_MSG("Unimplemented query type={}", type); UNIMPLEMENTED_MSG("Unimplemented query type={}", type);
return 0; return 0;

5
src/core/hle/service/nvflinger/buffer_queue.h
View File

@ -57,6 +57,11 @@ public:
NativeWindowWidth = 0, NativeWindowWidth = 0,
NativeWindowHeight = 1, NativeWindowHeight = 1,
NativeWindowFormat = 2, 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_, explicit BufferQueue(Kernel::KernelCore& kernel, u32 id_, u64 layer_id_,

3
src/core/hle/service/nvflinger/nvflinger.cpp
View File

@ -100,9 +100,6 @@ std::optional<u64> NVFlinger::OpenDisplay(std::string_view name) {
LOG_DEBUG(Service, "Opening \"{}\" display", name); LOG_DEBUG(Service, "Opening \"{}\" display", name);
// TODO(Subv): Currently we only support the Default display.
ASSERT(name == "Default");
const auto itr = const auto itr =
std::find_if(displays.begin(), displays.end(), std::find_if(displays.begin(), displays.end(),
[&](const VI::Display& display) { return display.GetName() == name; }); [&](const VI::Display& display) { return display.GetName() == name; });

1
src/video_core/gpu.cpp
View File

@ -17,7 +17,6 @@
#include "core/frontend/emu_window.h" #include "core/frontend/emu_window.h"
#include "core/hardware_interrupt_manager.h" #include "core/hardware_interrupt_manager.h"
#include "core/hle/service/nvdrv/nvdata.h" #include "core/hle/service/nvdrv/nvdata.h"
#include "core/hle/service/nvflinger/buffer_queue.h"
#include "core/perf_stats.h" #include "core/perf_stats.h"
#include "video_core/cdma_pusher.h" #include "video_core/cdma_pusher.h"
#include "video_core/dma_pusher.h" #include "video_core/dma_pusher.h"