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

FIxing warnigns

Browse source
This commit is contained in:
samcake 2016-03-27 09:35:13 -07:00
parent c182330b6e
commit 5a3896b1de
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/gpu/src/gpu/GLBackend.h
View file

@ -74,19 +74,20 @@ public:
static GLuint getBufferID(const Buffer& buffer); static GLuint getBufferID(const Buffer& buffer);
class GLTexture : public GPUObject { class GLTexture : public GPUObject {
GLuint _size;
public: public:
Stamp _storageStamp; Stamp _storageStamp;
Stamp _contentStamp; Stamp _contentStamp;
GLuint _texture; GLuint _texture;
GLenum _target; GLenum _target;
GLTexture();
~GLTexture();
void setSize(GLuint size); void setSize(GLuint size);
GLuint size() const { return _size; } GLuint size() const { return _size; }
GLTexture(); private:
~GLTexture(); GLuint _size;
}; };
static GLTexture* syncGPUObject(const Texture& texture); static GLTexture* syncGPUObject(const Texture& texture);
static GLuint getTextureID(const TexturePointer& texture, bool sync = true); static GLuint getTextureID(const TexturePointer& texture, bool sync = true);

7
libraries/render/src/render/EngineStats.cpp
View file

@ -20,16 +20,9 @@ void EngineStats::run(const SceneContextPointer& sceneContext, const RenderConte
quint64 msecsElapsed = _frameTimer.restart(); quint64 msecsElapsed = _frameTimer.restart();
double frequency = 1000.0 / msecsElapsed; double frequency = 1000.0 / msecsElapsed;
// Update the stats // Update the stats
auto config = std::static_pointer_cast<Config>(renderContext->jobConfig); auto config = std::static_pointer_cast<Config>(renderContext->jobConfig);
quint32 textureCPUCount{ 0 };
quint32 textureGPUCount{ 0 };
qint64 textureCPUMemoryUsage{ 0 };
qint64 textureGPUMemoryUsage{ 0 };
config->bufferCPUCount = gpu::Buffer::getBufferCPUCount(); config->bufferCPUCount = gpu::Buffer::getBufferCPUCount();
config->bufferGPUCount = gpu::Buffer::getBufferGPUCount(); config->bufferGPUCount = gpu::Buffer::getBufferGPUCount();
config->bufferCPUMemoryUsage = gpu::Buffer::getBufferCPUMemoryUsage(); config->bufferCPUMemoryUsage = gpu::Buffer::getBufferCPUMemoryUsage();