From c6f22df8e57182d0671eb85481f46fc81e95d275 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Wed, 25 May 2016 23:56:52 +0300 Subject: [core] s/operator bool/created()/ in {GL,TexturePool}Holder Prevents confusing usage of GL holder objects. --- src/mbgl/geometry/buffer.hpp | 6 +++--- src/mbgl/geometry/glyph_atlas.cpp | 4 ++-- src/mbgl/geometry/line_atlas.cpp | 2 +- src/mbgl/geometry/vao.cpp | 4 +++- src/mbgl/geometry/vao.hpp | 4 ++-- src/mbgl/gl/gl_object_store.cpp | 24 ++++++++++++------------ src/mbgl/gl/gl_object_store.hpp | 4 ++-- src/mbgl/renderer/frame_history.cpp | 4 ++-- src/mbgl/shader/shader.cpp | 2 +- src/mbgl/sprite/sprite_atlas.cpp | 2 +- 10 files changed, 29 insertions(+), 27 deletions(-) diff --git a/src/mbgl/geometry/buffer.hpp b/src/mbgl/geometry/buffer.hpp index e8e2788f51..80fde61702 100644 --- a/src/mbgl/geometry/buffer.hpp +++ b/src/mbgl/geometry/buffer.hpp @@ -36,7 +36,7 @@ public: // Transfers this buffer to the GPU and binds the buffer to the GL context. void bind(gl::GLObjectStore& glObjectStore) { - if (buffer) { + if (buffer.created()) { MBGL_CHECK_ERROR(glBindBuffer(bufferType, getID())); } else { buffer.create(glObjectStore); @@ -65,7 +65,7 @@ public: // Uploads the buffer to the GPU to be available when we need it. inline void upload(gl::GLObjectStore& glObjectStore) { - if (!buffer) { + if (!buffer.created()) { bind(glObjectStore); } } @@ -73,7 +73,7 @@ public: protected: // increase the buffer size by at least /required/ bytes. inline void *addElement() { - if (buffer) { + if (buffer.created()) { throw std::runtime_error("Can't add elements after buffer was bound to GPU"); } if (length < pos + itemSize) { diff --git a/src/mbgl/geometry/glyph_atlas.cpp b/src/mbgl/geometry/glyph_atlas.cpp index fd43fb8c18..1b0f4bc7e4 100644 --- a/src/mbgl/geometry/glyph_atlas.cpp +++ b/src/mbgl/geometry/glyph_atlas.cpp @@ -144,7 +144,7 @@ void GlyphAtlas::removeGlyphs(uintptr_t tileUID) { void GlyphAtlas::upload(gl::GLObjectStore& glObjectStore) { if (dirty) { - const bool first = !texture; + const bool first = !texture.created(); bind(glObjectStore); std::lock_guard lock(mtx); @@ -184,7 +184,7 @@ void GlyphAtlas::upload(gl::GLObjectStore& glObjectStore) { } void GlyphAtlas::bind(gl::GLObjectStore& glObjectStore) { - if (!texture) { + if (!texture.created()) { texture.create(glObjectStore); MBGL_CHECK_ERROR(glBindTexture(GL_TEXTURE_2D, texture.getID())); #ifndef GL_ES_VERSION_2_0 diff --git a/src/mbgl/geometry/line_atlas.cpp b/src/mbgl/geometry/line_atlas.cpp index 1213b8d778..614e3280c7 100644 --- a/src/mbgl/geometry/line_atlas.cpp +++ b/src/mbgl/geometry/line_atlas.cpp @@ -129,7 +129,7 @@ void LineAtlas::upload(gl::GLObjectStore& glObjectStore) { void LineAtlas::bind(gl::GLObjectStore& glObjectStore) { bool first = false; - if (!texture) { + if (!texture.created()) { texture.create(glObjectStore); MBGL_CHECK_ERROR(glBindTexture(GL_TEXTURE_2D, texture.getID())); MBGL_CHECK_ERROR(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR)); diff --git a/src/mbgl/geometry/vao.cpp b/src/mbgl/geometry/vao.cpp index 8239604264..c438fbd2e6 100644 --- a/src/mbgl/geometry/vao.cpp +++ b/src/mbgl/geometry/vao.cpp @@ -26,7 +26,9 @@ void VertexArrayObject::bindVertexArrayObject(gl::GLObjectStore& glObjectStore) return; } - if (!vao) vao.create(glObjectStore); + if (!vao.created()) { + vao.create(glObjectStore); + } MBGL_CHECK_ERROR(gl::BindVertexArray(vao.getID())); } diff --git a/src/mbgl/geometry/vao.hpp b/src/mbgl/geometry/vao.hpp index 8e9e417c1c..8bc3750590 100644 --- a/src/mbgl/geometry/vao.hpp +++ b/src/mbgl/geometry/vao.hpp @@ -24,7 +24,7 @@ public: if (bound_shader == 0) { vertexBuffer.bind(glObjectStore); shader.bind(offset); - if (vao) { + if (vao.created()) { storeBinding(shader, vertexBuffer.getID(), 0, offset); } } else { @@ -39,7 +39,7 @@ public: vertexBuffer.bind(glObjectStore); elementsBuffer.bind(glObjectStore); shader.bind(offset); - if (vao) { + if (vao.created()) { storeBinding(shader, vertexBuffer.getID(), elementsBuffer.getID(), offset); } } else { diff --git a/src/mbgl/gl/gl_object_store.cpp b/src/mbgl/gl/gl_object_store.cpp index 9646fb328e..040109d011 100644 --- a/src/mbgl/gl/gl_object_store.cpp +++ b/src/mbgl/gl/gl_object_store.cpp @@ -6,61 +6,61 @@ namespace mbgl { namespace gl { void ProgramHolder::create(GLObjectStore& objectStore_) { - if (id) return; + if (created()) return; objectStore = &objectStore_; id = MBGL_CHECK_ERROR(glCreateProgram()); } void ProgramHolder::reset() { - if (!id) return; + if (!created()) return; objectStore->abandonedPrograms.push_back(id); id = 0; } void ShaderHolder::create(GLObjectStore& objectStore_) { - if (id) return; + if (created()) return; objectStore = &objectStore_; id = MBGL_CHECK_ERROR(glCreateShader(type)); } void ShaderHolder::reset() { - if (!id) return; + if (!created()) return; objectStore->abandonedShaders.push_back(id); id = 0; } void BufferHolder::create(GLObjectStore& objectStore_) { - if (id) return; + if (created()) return; objectStore = &objectStore_; MBGL_CHECK_ERROR(glGenBuffers(1, &id)); } void BufferHolder::reset() { - if (!id) return; + if (!created()) return; objectStore->abandonedBuffers.push_back(id); id = 0; } void TextureHolder::create(GLObjectStore& objectStore_) { - if (id) return; + if (created()) return; objectStore = &objectStore_; MBGL_CHECK_ERROR(glGenTextures(1, &id)); } void TextureHolder::reset() { - if (!id) return; + if (!created()) return; objectStore->abandonedTextures.push_back(id); id = 0; } void TexturePoolHolder::create(GLObjectStore& objectStore_) { - if (bool()) return; + if (created()) return; objectStore = &objectStore_; MBGL_CHECK_ERROR(glGenTextures(TextureMax, ids.data())); } void TexturePoolHolder::reset() { - if (!bool()) return; + if (!created()) return; for (GLuint& id : ids) { if (id == 0) continue; objectStore->abandonedTextures.push_back(id); @@ -69,13 +69,13 @@ void TexturePoolHolder::reset() { } void VAOHolder::create(GLObjectStore& objectStore_) { - if (id) return; + if (created()) return; objectStore = &objectStore_; MBGL_CHECK_ERROR(gl::GenVertexArrays(1, &id)); } void VAOHolder::reset() { - if (!id) return; + if (!created()) return; objectStore->abandonedVAOs.push_back(id); id = 0; } diff --git a/src/mbgl/gl/gl_object_store.hpp b/src/mbgl/gl/gl_object_store.hpp index 9e0575046a..2527bbf332 100644 --- a/src/mbgl/gl/gl_object_store.hpp +++ b/src/mbgl/gl/gl_object_store.hpp @@ -41,7 +41,7 @@ public: GLHolder(GLHolder&& o) noexcept : id(o.id), objectStore(o.objectStore) { o.id = 0; } GLHolder& operator=(GLHolder&& o) noexcept { id = o.id; objectStore = o.objectStore; o.id = 0; return *this; } - explicit operator bool() const { return id; } + bool created() const { return id; } GLuint getID() const { return id; } protected: @@ -110,7 +110,7 @@ public: TexturePoolHolder(TexturePoolHolder&& o) noexcept : ids(std::move(o.ids)), objectStore(o.objectStore) { o.ids.fill(0); } TexturePoolHolder& operator=(TexturePoolHolder&& o) noexcept { ids = std::move(o.ids); objectStore = o.objectStore; o.ids.fill(0); return *this; } - explicit operator bool() const { return std::any_of(ids.begin(), ids.end(), [](int id) { return id; }); } + bool created() const { return std::any_of(ids.begin(), ids.end(), [](int id) { return id; }); } const std::array& getIDs() const { return ids; } const GLuint& operator[](size_t pos) { return ids[pos]; } diff --git a/src/mbgl/renderer/frame_history.cpp b/src/mbgl/renderer/frame_history.cpp index eb125201f4..74856ec87e 100644 --- a/src/mbgl/renderer/frame_history.cpp +++ b/src/mbgl/renderer/frame_history.cpp @@ -60,7 +60,7 @@ bool FrameHistory::needsAnimation(const Duration& duration) const { void FrameHistory::upload(gl::GLObjectStore& glObjectStore) { if (changed) { - const bool first = !texture; + const bool first = !texture.created(); bind(glObjectStore); if (first) { @@ -95,7 +95,7 @@ void FrameHistory::upload(gl::GLObjectStore& glObjectStore) { } void FrameHistory::bind(gl::GLObjectStore& glObjectStore) { - if (!texture) { + if (!texture.created()) { texture.create(glObjectStore); MBGL_CHECK_ERROR(glBindTexture(GL_TEXTURE_2D, texture.getID())); #ifndef GL_ES_VERSION_2_0 diff --git a/src/mbgl/shader/shader.cpp b/src/mbgl/shader/shader.cpp index 8216de5b4d..b0536cda94 100644 --- a/src/mbgl/shader/shader.cpp +++ b/src/mbgl/shader/shader.cpp @@ -86,7 +86,7 @@ bool Shader::compileShader(gl::ShaderHolder& shader, const GLchar *source[]) { } Shader::~Shader() { - if (program) { + if (program.created()) { MBGL_CHECK_ERROR(glDetachShader(program.getID(), vertexShader.getID())); MBGL_CHECK_ERROR(glDetachShader(program.getID(), fragmentShader.getID())); } diff --git a/src/mbgl/sprite/sprite_atlas.cpp b/src/mbgl/sprite/sprite_atlas.cpp index 26777abc82..6595d7137d 100644 --- a/src/mbgl/sprite/sprite_atlas.cpp +++ b/src/mbgl/sprite/sprite_atlas.cpp @@ -184,7 +184,7 @@ void SpriteAtlas::bind(bool linear, gl::GLObjectStore& glObjectStore) { return; // Empty atlas } - if (!texture) { + if (!texture.created()) { texture.create(glObjectStore); MBGL_CHECK_ERROR(glBindTexture(GL_TEXTURE_2D, texture.getID())); #ifndef GL_ES_VERSION_2_0 -- cgit v1.2.1