From 5a91116c069047162c63b596869e1ccff8d479d0 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Fri, 23 Sep 2016 11:16:31 -0700 Subject: [PATCH] Fix debug build, fix typo in available texture memory calculation --- libraries/gpu-gl/src/gpu/gl/GLTexture.cpp | 2 +- libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/gpu-gl/src/gpu/gl/GLTexture.cpp b/libraries/gpu-gl/src/gpu/gl/GLTexture.cpp index 94d645378b..56ff4166ea 100644 --- a/libraries/gpu-gl/src/gpu/gl/GLTexture.cpp +++ b/libraries/gpu-gl/src/gpu/gl/GLTexture.cpp @@ -124,7 +124,7 @@ float GLTexture::getMemoryPressure() { // Allow 50% of all available GPU memory to be consumed by textures // FIXME overly conservative? - availableTextureMemory = (totalGpuMemory > 2); + availableTextureMemory = (totalGpuMemory >> 1); } // Return the consumed texture memory divided by the available texture memory. diff --git a/libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp b/libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp index 2489f79c0b..6733475c01 100644 --- a/libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp +++ b/libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp @@ -517,8 +517,8 @@ void GL45Texture::updateMips() { } void GL45Texture::derez() { - assert(_sparseInfo._sparse); - assert(_minMip < _sparseInfo._maxSparseLevel); + assert(_sparseInfo.sparse); + assert(_minMip < _sparseInfo.maxSparseLevel); assert(_minMip < _maxMip); assert(_transferrable); stripToMip(_minMip + 1);