mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-21 17:43:22 +02:00
GPU Garbage Collection: Fix regressions.
This commit is contained in:
parent
078a6cb0cb
commit
e9e671d101
@ -282,7 +282,7 @@ void main() {
|
||||
|
||||
u64 Device::GetCurrentDedicatedVideoMemory() const {
|
||||
GLint cur_avail_mem_kb = 0;
|
||||
glGetIntegerv(GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX, &cur_avail_mem_kb);
|
||||
glGetIntegerv(GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX, &cur_avail_mem_kb);
|
||||
return static_cast<u64>(cur_avail_mem_kb) * 1_KiB;
|
||||
}
|
||||
|
||||
|
@ -1080,8 +1080,6 @@ ImageId TextureCache<P>::JoinImages(const ImageInfo& info, GPUVAddr gpu_addr, VA
|
||||
Image& overlap = slot_images[overlap_id];
|
||||
if (True(overlap.flags & ImageFlagBits::GpuModified)) {
|
||||
new_image.flags |= ImageFlagBits::GpuModified;
|
||||
new_image.modification_tick =
|
||||
std::max(overlap.modification_tick, new_image.modification_tick);
|
||||
}
|
||||
if (overlap.info.num_samples != new_image.info.num_samples) {
|
||||
LOG_WARNING(HW_GPU, "Copying between images with different samples is not implemented");
|
||||
|
Loading…
Reference in New Issue
Block a user