early-access version 2629
This commit is contained in:
parent
b437dc9ae8
commit
5f1f8d48e7
3 changed files with 2 additions and 4 deletions
|
@ -1,7 +1,7 @@
|
||||||
yuzu emulator early access
|
yuzu emulator early access
|
||||||
=============
|
=============
|
||||||
|
|
||||||
This is the source code for early-access 2626.
|
This is the source code for early-access 2629.
|
||||||
|
|
||||||
## Legal Notice
|
## Legal Notice
|
||||||
|
|
||||||
|
|
|
@ -282,7 +282,7 @@ void main() {
|
||||||
|
|
||||||
u64 Device::GetCurrentDedicatedVideoMemory() const {
|
u64 Device::GetCurrentDedicatedVideoMemory() const {
|
||||||
GLint cur_avail_mem_kb = 0;
|
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;
|
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];
|
Image& overlap = slot_images[overlap_id];
|
||||||
if (True(overlap.flags & ImageFlagBits::GpuModified)) {
|
if (True(overlap.flags & ImageFlagBits::GpuModified)) {
|
||||||
new_image.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) {
|
if (overlap.info.num_samples != new_image.info.num_samples) {
|
||||||
LOG_WARNING(HW_GPU, "Copying between images with different samples is not implemented");
|
LOG_WARNING(HW_GPU, "Copying between images with different samples is not implemented");
|
||||||
|
|
Loading…
Reference in a new issue