fixing warnings

This commit is contained in:
samcake 2016-04-07 23:44:28 -07:00
parent 04e71df3bc
commit be178e9e09
2 changed files with 5 additions and 4 deletions

View file

@ -76,9 +76,11 @@ public:
class GLTexture : public GPUObject { class GLTexture : public GPUObject {
public: public:
// The public gl texture object
GLuint _texture{ 0 };
const Stamp _storageStamp; const Stamp _storageStamp;
Stamp _contentStamp { 0 }; Stamp _contentStamp { 0 };
GLuint _texture{ 0 };
const GLenum _target; const GLenum _target;
GLTexture(const gpu::Texture& gpuTexture); GLTexture(const gpu::Texture& gpuTexture);
@ -124,11 +126,11 @@ public:
static const size_t CUBE_NUM_FACES = 6; static const size_t CUBE_NUM_FACES = 6;
static const GLenum CUBE_FACE_LAYOUT[6]; static const GLenum CUBE_FACE_LAYOUT[6];
private: private:
// at creation the true texture is created in GL // at creation the true texture is created in GL
// it becomes public only when ready. // it becomes public only when ready.
GLuint _privateTexture; GLuint _privateTexture{ 0 };
void setSize(GLuint size); void setSize(GLuint size);
void setVirtualSize(GLuint size); void setVirtualSize(GLuint size);

View file

@ -49,7 +49,6 @@ const GLenum GLBackend::GLTexture::CUBE_FACE_LAYOUT[6] = {
// Create the texture and allocate storage // Create the texture and allocate storage
GLBackend::GLTexture::GLTexture(const Texture& texture) : GLBackend::GLTexture::GLTexture(const Texture& texture) :
_storageStamp(texture.getStamp()), _storageStamp(texture.getStamp()),
_privateTexture(0),
_target(gpuToGLTextureType(texture)), _target(gpuToGLTextureType(texture)),
_size(0), _size(0),
_virtualSize(0), _virtualSize(0),