Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 08:37:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7745 from jherico/mac_texture_fix

Browse source 
Fixing texture storage allocation on OSX/GL 4.1
This commit is contained in:
Brad Hefta-Gaub 2016-04-22 17:07:12 -07:00
commit f1f9c6740d
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/gpu/src/gpu/GLBackendTexture.cpp
View file

@ -243,7 +243,7 @@ void GLBackend::GLTexture::allocateStorage() {
glTexStorage2D(_target, usedMipLevels(), texelFormat.internalFormat, dimensions.x, dimensions.y); glTexStorage2D(_target, usedMipLevels(), texelFormat.internalFormat, dimensions.x, dimensions.y);
(void)CHECK_GL_ERROR(); (void)CHECK_GL_ERROR();
} else { } else {
for (uint16_t l = _minMip; l < _maxMip; l++) { for (uint16_t l = _minMip; l <= _maxMip; l++) {
// Get the mip level dimensions, accounting for the downgrade level // Get the mip level dimensions, accounting for the downgrade level
Vec3u dimensions = _gpuTexture.evalMipDimensions(l); Vec3u dimensions = _gpuTexture.evalMipDimensions(l);
for (GLenum target : getFaceTargets()) { for (GLenum target : getFaceTargets()) {

3
libraries/gpu/src/gpu/GLBackendTextureTransfer.h
View file

@ -6,11 +6,14 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
#include <QtGlobal>
#include <QSharedPointer> #include <QSharedPointer>
#include <GenericQueueThread.h> #include <GenericQueueThread.h>
#include "GLBackendShared.h" #include "GLBackendShared.h"
#ifdef Q_OS_WIN
#define THREADED_TEXTURE_TRANSFER #define THREADED_TEXTURE_TRANSFER
#endif
class OffscreenGLCanvas; class OffscreenGLCanvas;

1
libraries/shared/src/GPUIdent.cpp
View file

@ -45,6 +45,7 @@ GPUIdent* GPUIdent::ensureQuery(const QString& vendor, const QString& renderer)
CGLDescribeRenderer(rendererInfo, j, kCGLRPVideoMemoryMegabytes, &deviceVRAM); CGLDescribeRenderer(rendererInfo, j, kCGLRPVideoMemoryMegabytes, &deviceVRAM);
if (deviceVRAM > bestVRAM) { if (deviceVRAM > bestVRAM) {
bestVRAM = deviceVRAM; bestVRAM = deviceVRAM;
_isValid = true;
} }
} }
} }