Minor tweaks

diff --git a/source/backends/opengl/batch_backend.cpp b/source/backends/opengl/batch_backend.cpp
index f44d6b82e273f13fe54735e146d5be3c626ec58a..d80c11cc84fef0d5926041cd925c1e45b5d2ca49 100644 (file)
--- a/source/backends/opengl/batch_backend.cpp
+++ b/source/backends/opengl/batch_backend.cpp
@@ -5,7 +5,7 @@ namespace Msp {
 namespace GL {
 
 OpenGLBatch::OpenGLBatch(PrimitiveType t):
-       gl_prim_type(GL::get_gl_primitive_type(t)),
+       gl_prim_type(get_gl_primitive_type(t)),
        gl_index_type(GL_UNSIGNED_SHORT)
 { }
 

diff --git a/source/backends/opengl/pixelformat_backend.cpp b/source/backends/opengl/pixelformat_backend.cpp
index ee1a2070a251ff1f858f0e5634bd57188d208433..7e2a61ea536655ee8b5f33031f18ef57abe8ce59 100644 (file)
--- a/source/backends/opengl/pixelformat_backend.cpp
+++ b/source/backends/opengl/pixelformat_backend.cpp
@@ -65,7 +65,7 @@ void require_pixelformat(PixelFormat pf)
        }
 }
 
-GLenum get_gl_components(PixelComponents comp)
+unsigned get_gl_components(PixelComponents comp)
 {
        switch(comp)
        {
@@ -79,7 +79,7 @@ GLenum get_gl_components(PixelComponents comp)
        }
 }
 
-GLenum get_gl_pixelformat(PixelFormat pf)
+unsigned get_gl_pixelformat(PixelFormat pf)
 {
        switch(pf)
        {

diff --git a/source/backends/opengl/sampler_backend.cpp b/source/backends/opengl/sampler_backend.cpp
index 915dda68f5db14bd67ea996217f810296dd8486f..85d278d3a1a1da75d4d098ea1aeb6457a5ae18c1 100644 (file)
--- a/source/backends/opengl/sampler_backend.cpp
+++ b/source/backends/opengl/sampler_backend.cpp
@@ -60,7 +60,7 @@ void OpenGLSampler::update(unsigned mask) const
 void OpenGLSampler::set_debug_name(const string &name)
 {
 #ifdef DEBUG
-       if(id && KHR_debug)
+       if(KHR_debug)
                glObjectLabel(GL_SAMPLER, id, name.size(), name.c_str());
 #else
        (void)name;