diff options
| -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() { | |||
| 282 | 282 | ||
| 283 | u64 Device::GetCurrentDedicatedVideoMemory() const { | 283 | u64 Device::GetCurrentDedicatedVideoMemory() const { |
| 284 | GLint cur_avail_mem_kb = 0; | 284 | GLint cur_avail_mem_kb = 0; |
| 285 | glGetIntegerv(GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX, &cur_avail_mem_kb); | 285 | glGetIntegerv(GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX, &cur_avail_mem_kb); |
| 286 | return static_cast<u64>(cur_avail_mem_kb) * 1_KiB; | 286 | return static_cast<u64>(cur_avail_mem_kb) * 1_KiB; |
| 287 | } | 287 | } |
| 288 | 288 | ||
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 | |||
| 1080 | Image& overlap = slot_images[overlap_id]; | 1080 | Image& overlap = slot_images[overlap_id]; |
| 1081 | if (True(overlap.flags & ImageFlagBits::GpuModified)) { | 1081 | if (True(overlap.flags & ImageFlagBits::GpuModified)) { |
| 1082 | new_image.flags |= ImageFlagBits::GpuModified; | 1082 | new_image.flags |= ImageFlagBits::GpuModified; |
| 1083 | new_image.modification_tick = | ||
| 1084 | std::max(overlap.modification_tick, new_image.modification_tick); | ||
| 1085 | } | 1083 | } |
| 1086 | if (overlap.info.num_samples != new_image.info.num_samples) { | 1084 | if (overlap.info.num_samples != new_image.info.num_samples) { |
| 1087 | LOG_WARNING(HW_GPU, "Copying between images with different samples is not implemented"); | 1085 | LOG_WARNING(HW_GPU, "Copying between images with different samples is not implemented"); |