mirror of
https://git.eden-emu.dev/eden-emu/eden.git
synced 2026-08-25 00:40:32 +00:00
[TEST] Presync + CR workaround removal from QCOM
This commit is contained in:
@@ -1033,7 +1033,6 @@ void BufferCache<P>::BindHostGraphicsUniformBuffers(size_t stage) {
|
||||
|
||||
template <class P>
|
||||
void BufferCache<P>::BindHostGraphicsUniformBuffer(size_t stage, u32 index, u32 binding_index, bool needs_bind) {
|
||||
++channel_state->uniform_cache_shots[0];
|
||||
const Binding& binding = channel_state->uniform_buffers[stage][index];
|
||||
const DAddr device_addr = binding.device_addr;
|
||||
const u32 size = (std::min)(binding.size, (*channel_state->uniform_buffer_sizes)[stage][index]);
|
||||
@@ -1052,8 +1051,12 @@ void BufferCache<P>::BindHostGraphicsUniformBuffer(size_t stage, u32 index, u32
|
||||
return alignment > 1 && (offset % alignment) != 0;
|
||||
}
|
||||
}();
|
||||
|
||||
const bool cached_buffer_is_current =
|
||||
has_host_buffer && !memory_tracker.IsRegionCpuModified(device_addr, size);
|
||||
const bool use_fast_buffer = needs_alignment_stream
|
||||
|| (has_host_buffer && size <= channel_state->uniform_buffer_skip_cache_size
|
||||
|| (has_host_buffer && !cached_buffer_is_current
|
||||
&& size <= channel_state->uniform_buffer_skip_cache_size
|
||||
&& !memory_tracker.IsRegionGpuModified(device_addr, size));
|
||||
if (use_fast_buffer) {
|
||||
if constexpr (IS_OPENGL) {
|
||||
@@ -1080,7 +1083,7 @@ void BufferCache<P>::BindHostGraphicsUniformBuffer(size_t stage, u32 index, u32
|
||||
device_memory.ReadBlockUnsafe(device_addr, span.data(), size);
|
||||
return;
|
||||
}
|
||||
// Classic cached path
|
||||
++channel_state->uniform_cache_shots[0];
|
||||
if (SynchronizeBuffer(buffer, device_addr, size)) {
|
||||
++channel_state->uniform_cache_hits[0];
|
||||
}
|
||||
|
||||
@@ -235,11 +235,23 @@ public:
|
||||
return;
|
||||
}
|
||||
PauseCounter();
|
||||
const auto driver_id = device.GetDriverID();
|
||||
if (driver_id == VK_DRIVER_ID_QUALCOMM_PROPRIETARY ||
|
||||
driver_id == VK_DRIVER_ID_ARM_PROPRIETARY || driver_id == VK_DRIVER_ID_MESA_TURNIP) {
|
||||
pending_sync.clear();
|
||||
if (!CanResolveHostQueries()) {
|
||||
sync_values_stash.clear();
|
||||
scheduler.RequestOutsideRenderPassOperationContext();
|
||||
scheduler.Record([buffer = *accumulation_buffer](vk::CommandBuffer cmdbuf) {
|
||||
cmdbuf.FillBuffer(buffer, 0, 8, 0);
|
||||
});
|
||||
std::function<void()> func([this] {
|
||||
amend_value = 0;
|
||||
accumulation_value = 0;
|
||||
});
|
||||
rasterizer->SyncOperation(std::move(func));
|
||||
AbandonCurrentQuery();
|
||||
num_slots_used = 0;
|
||||
first_accumulation_checkpoint = (std::numeric_limits<size_t>::max)();
|
||||
last_accumulation_checkpoint = 0;
|
||||
accumulation_since_last_sync = false;
|
||||
pending_sync.clear();
|
||||
return;
|
||||
}
|
||||
sync_values_stash.clear();
|
||||
@@ -406,6 +418,12 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
bool CanResolveHostQueries() const {
|
||||
const auto driver_id = device.GetDriverID();
|
||||
return driver_id != VK_DRIVER_ID_ARM_PROPRIETARY &&
|
||||
driver_id != VK_DRIVER_ID_MESA_TURNIP;
|
||||
}
|
||||
|
||||
template <typename Func>
|
||||
void ApplyBankOp(VideoCommon::HostQueryBase* query, Func&& func) {
|
||||
size_t size_slots = query->size_slots;
|
||||
@@ -1518,10 +1536,10 @@ bool QueryCacheRuntime::HostConditionalRenderingCompareValues(VideoCommon::Looku
|
||||
return false;
|
||||
}
|
||||
|
||||
auto driver_id = impl->device.GetDriverID();
|
||||
const auto driver_id = impl->device.GetDriverID();
|
||||
const bool is_gpu_high = Settings::IsGPULevelHigh();
|
||||
|
||||
if ((!is_gpu_high && driver_id == VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS) || driver_id == VK_DRIVER_ID_QUALCOMM_PROPRIETARY || driver_id == VK_DRIVER_ID_ARM_PROPRIETARY || driver_id == VK_DRIVER_ID_MESA_TURNIP) {
|
||||
if (!is_gpu_high && driver_id == VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS) {
|
||||
EndHostConditionalRendering();
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user