Browse Source
Merge pull request #8128 from FernandoS27/gc-fixes
GPU Garbage Collection: Fix regressions.
pull/15/merge
Fernando S
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
1 additions and
3 deletions
-
src/video_core/renderer_opengl/gl_device.cpp
-
src/video_core/texture_cache/texture_cache.h
|
|
|
@ -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"); |
|
|
|
|
