diff options
| author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2022-04-01 01:32:41 +0200 |
|---|---|---|
| committer | Fernando Sahmkow <fsahmkow27@gmail.com> | 2022-04-01 01:36:24 +0200 |
| commit | e9e671d101d6ca5e0dc19b13e3aba95af65dd5cc (patch) | |
| tree | 0bd69b24309bffd7b8a708b876762b43d0524485 /src/video_core | |
| parent | Merge pull request #8116 from ameerj/nvhost_ctrl_bad_param (diff) | |
| download | yuzu-e9e671d101d6ca5e0dc19b13e3aba95af65dd5cc.tar yuzu-e9e671d101d6ca5e0dc19b13e3aba95af65dd5cc.tar.gz yuzu-e9e671d101d6ca5e0dc19b13e3aba95af65dd5cc.tar.bz2 yuzu-e9e671d101d6ca5e0dc19b13e3aba95af65dd5cc.tar.lz yuzu-e9e671d101d6ca5e0dc19b13e3aba95af65dd5cc.tar.xz yuzu-e9e671d101d6ca5e0dc19b13e3aba95af65dd5cc.tar.zst yuzu-e9e671d101d6ca5e0dc19b13e3aba95af65dd5cc.zip | |
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_device.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/texture_cache/texture_cache.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/video_core/renderer_opengl/gl_device.cpp b/src/video_core/renderer_opengl/gl_device.cpp index 656dd7eb0..597301eeb 100644 --- a/src/video_core/renderer_opengl/gl_device.cpp +++ b/src/video_core/renderer_opengl/gl_device.cpp @@ -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; } diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index efc1c4525..8fef74117 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -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"); |