From be178e9e0988a81076bc091bf38a45ee9a53ccf7 Mon Sep 17 00:00:00 2001 From: samcake Date: Thu, 7 Apr 2016 23:44:28 -0700 Subject: [PATCH] fixing warnings --- libraries/gpu/src/gpu/GLBackend.h | 8 +++++--- libraries/gpu/src/gpu/GLBackendTexture.cpp | 1 - 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libraries/gpu/src/gpu/GLBackend.h b/libraries/gpu/src/gpu/GLBackend.h index 29256a322f..aabd84fbfb 100644 --- a/libraries/gpu/src/gpu/GLBackend.h +++ b/libraries/gpu/src/gpu/GLBackend.h @@ -76,9 +76,11 @@ public: class GLTexture : public GPUObject { public: + // The public gl texture object + GLuint _texture{ 0 }; + const Stamp _storageStamp; Stamp _contentStamp { 0 }; - GLuint _texture{ 0 }; const GLenum _target; GLTexture(const gpu::Texture& gpuTexture); @@ -124,11 +126,11 @@ public: static const size_t CUBE_NUM_FACES = 6; static const GLenum CUBE_FACE_LAYOUT[6]; - + private: // at creation the true texture is created in GL // it becomes public only when ready. - GLuint _privateTexture; + GLuint _privateTexture{ 0 }; void setSize(GLuint size); void setVirtualSize(GLuint size); diff --git a/libraries/gpu/src/gpu/GLBackendTexture.cpp b/libraries/gpu/src/gpu/GLBackendTexture.cpp index b0b68c6a2c..8da6b6d300 100755 --- a/libraries/gpu/src/gpu/GLBackendTexture.cpp +++ b/libraries/gpu/src/gpu/GLBackendTexture.cpp @@ -49,7 +49,6 @@ const GLenum GLBackend::GLTexture::CUBE_FACE_LAYOUT[6] = { // Create the texture and allocate storage GLBackend::GLTexture::GLTexture(const Texture& texture) : _storageStamp(texture.getStamp()), - _privateTexture(0), _target(gpuToGLTextureType(texture)), _size(0), _virtualSize(0),