Browse Source

skip 1st 2nd dispatches extended to linux. vk_staging_buffer_pool.cpp clamp moved to buffer_cache.h

xbzk 3 weeks ago
parent
commit
b1b6bc0f31
  1. 8
      src/video_core/buffer_cache/buffer_cache.h
  2. 2
      src/video_core/renderer_vulkan/vk_rasterizer.cpp
  3. 2
      src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp

8
src/video_core/buffer_cache/buffer_cache.h

@ -1572,11 +1572,11 @@ void BufferCache<P>::MappedUploadMemory([[maybe_unused]] Buffer& buffer,
[[maybe_unused]] u64 total_size_bytes,
[[maybe_unused]] std::span<BufferCopy> copies) {
if constexpr (USE_MEMORY_MAPS) {
auto upload_staging = runtime.UploadStagingBuffer(total_size_bytes);
constexpr u64 MAX_STAGING_SIZE = 2_GiB;
auto upload_staging = runtime.UploadStagingBuffer((std::min)(total_size_bytes, MAX_STAGING_SIZE));
if (upload_staging.mapped_span.size() < total_size_bytes) return;
//auto upload_staging = runtime.UploadStagingBuffer(total_size_bytes);
const std::span<u8> staging_pointer = upload_staging.mapped_span;
if (staging_pointer.size() < total_size_bytes) {
return;
}
for (BufferCopy& copy : copies) {
u8* const src_pointer = staging_pointer.data() + copy.src_offset;
const DAddr device_addr = buffer.CpuAddr() + copy.dst_offset;

2
src/video_core/renderer_vulkan/vk_rasterizer.cpp

@ -500,7 +500,7 @@ void RasterizerVulkan::Clear(u32 layer_count) {
}
void RasterizerVulkan::DispatchCompute() {
#ifdef ANDROID
#if defined(ANDROID) || defined(__linux__)
static u32 dispatch_count = 0;
if (dispatch_count < 2) {
dispatch_count++;

2
src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp

@ -181,7 +181,7 @@ std::optional<StagingBufferRef> StagingBufferPool::TryGetReservedBuffer(size_t s
StagingBufferRef StagingBufferPool::CreateStagingBuffer(size_t size, MemoryUsage usage,
bool deferred) {
const u32 log2 = (std::min)(Common::Log2Ceil64(size), 31U);
const u32 log2 = Common::Log2Ceil64(size);
VkBufferCreateInfo buffer_ci = {
.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,
.pNext = nullptr,

Loading…
Cancel
Save