Browse Source

Even more error fixes

My clang isn't this strict so I do not get these errors
Forrest Mark X 2 months ago
committed by crueter
parent
commit
82d6f379c8
  1. 6
      src/video_core/texture_cache/texture_cache.h
  2. 2
      src/video_core/texture_cache/texture_cache_base.h

6
src/video_core/texture_cache/texture_cache.h

@ -1431,7 +1431,7 @@ u32 TextureCache<P>::GetAdaptiveBatchSize(const PendingUnswizzle& task, size_t q
}
template <class P>
u32 TextureCache<P>::GetAdaptiveChunkSize(const PendingUnswizzle& task, size_t queue_size) const {
size_t TextureCache<P>::GetAdaptiveChunkSize(const PendingUnswizzle &task, size_t queue_size) const {
const size_t base_chunk = swizzle_chunk_size;
if (base_chunk == 0)
return 0;
@ -1490,8 +1490,8 @@ void TextureCache<P>::TickAsyncUnswizzle() {
if (swizzle_chunk_size == 0) {
copy_amount = remaining;
} else {
const u32 dynamic_chunk = GetAdaptiveChunkSize(task, unswizzle_queue.size());
copy_amount = std::min<size_t>(dynamic_chunk, remaining);
const size_t dynamic_chunk = GetAdaptiveChunkSize(task, unswizzle_queue.size());
copy_amount = (std::min)(dynamic_chunk, remaining);
}
if (remaining > swizzle_chunk_size) {

2
src/video_core/texture_cache/texture_cache_base.h

@ -420,7 +420,7 @@ private:
void TickAsyncDecode();
u32 GetAdaptiveBatchSize(const PendingUnswizzle& task, size_t queue_size) const;
u32 GetAdaptiveChunkSize(const PendingUnswizzle &task, size_t queue_size) const;
size_t GetAdaptiveChunkSize(const PendingUnswizzle &task, size_t queue_size) const;
void EnforceSamplerBudget();
void TrimInactiveSamplers(size_t budget);

Loading…
Cancel
Save