reformat: remove redundant qualifiers

gl/buffer.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "buffer.h"
 
-GLenum gl::buffer::glenum_target(gl::buffer::targets target)
+GLenum gl::buffer::glenum_target(targets target)
 {
 	static GLenum mapping[13] =
     {

gl/pbo.cpp

@@ -54,12 +54,12 @@ bool gl::pbo::is_busy()
 void* gl::pbo::map(GLuint mode, targets target)
 {
 	bind(target);
-	return glMapBuffer(buffer::glenum_target(target), mode);
+	return glMapBuffer(glenum_target(target), mode);
 }
 
 void gl::pbo::unmap(targets target)
 {
 	bind(target);
-	glUnmapBuffer(buffer::glenum_target(target));
+	glUnmapBuffer(glenum_target(target));
 	sync.emplace();
 }

gl/postfx.cpp

@@ -12,7 +12,7 @@ gl::postfx::postfx(const std::string &s) : postfx(shader("postfx_" + s + ".frag"
 gl::postfx::postfx(const shader &s)
 {
     if (!vertex)
-        vertex = std::make_shared<gl::shader>("quad.vert");
+        vertex = std::make_shared<shader>("quad.vert");
     if (!vao)
         vao = std::make_shared<gl::vao>();
 

gl/postfx.h

@@ -10,9 +10,9 @@ namespace gl
     class postfx
     {
     private:
-        gl::program program;
-        static std::shared_ptr<gl::shader> vertex;
-        static std::shared_ptr<gl::vao> vao;
+        program program;
+        static std::shared_ptr<shader> vertex;
+        static std::shared_ptr<vao> vao;
 
     public:
         postfx(const std::string &s);

gl/shader.cpp

@@ -226,7 +226,7 @@ void gl::shader::parse_texture_entries(std::string &str)
         {
             if (name.empty())
                 log_error("empty name");
-            else if (conf.id >= gl::MAX_TEXTURES)
+            else if (conf.id >= MAX_TEXTURES)
                 log_error("invalid texture binding: " + std::to_string(conf.id));
             else
                 texture_conf.emplace(std::make_pair(name, conf));
@@ -283,7 +283,7 @@ void gl::shader::parse_param_entries(std::string &str)
         {
             if (name.empty())
                 log_error("empty name");
-            else if (conf.location >= gl::MAX_PARAMS)
+            else if (conf.location >= MAX_PARAMS)
                 log_error("invalid param binding: " + std::to_string(conf.location));
             else if (conf.offset > 3)
                 log_error("invalid offset: " + std::to_string(conf.offset));
@@ -346,9 +346,9 @@ void gl::program::init()
         glUniform1i(loc, e.id);
     }
 
-    glUniform1i(glGetUniformLocation(*this, "shadowmap"), gl::SHADOW_TEX);
-    glUniform1i(glGetUniformLocation(*this, "envmap"), gl::ENV_TEX);
-    glUniform1i(glGetUniformLocation(*this, "headlightmap"), gl::HEADLIGHT_TEX);
+    glUniform1i(glGetUniformLocation(*this, "shadowmap"), SHADOW_TEX);
+    glUniform1i(glGetUniformLocation(*this, "envmap"), ENV_TEX);
+    glUniform1i(glGetUniformLocation(*this, "headlightmap"), HEADLIGHT_TEX);
 
 	GLuint index;
 
@@ -370,14 +370,14 @@ gl::program::program()
     **this = glCreateProgram();
 }
 
-gl::program::program(std::vector<std::reference_wrapper<const gl::shader>> shaders) : program()
+gl::program::program(std::vector<std::reference_wrapper<const shader>> shaders) : program()
 {
-    for (const gl::shader &s : shaders)
+    for (const shader &s : shaders)
         attach(s);
     link();
 }
 
-void gl::program::attach(const gl::shader &s)
+void gl::program::attach(const shader &s)
 {
     for (auto it : s.texture_conf)
         texture_conf.emplace(std::make_pair(it.first, std::move(it.second)));

gl/shader.h

@@ -85,7 +85,7 @@ namespace gl
     {
     public:
         program();
-        program(std::vector<std::reference_wrapper<const gl::shader>>);
+        program(std::vector<std::reference_wrapper<const shader>>);
         ~program();
 
         using bindable::bind;

gl/ubo.cpp

@@ -3,17 +3,17 @@
 
 gl::ubo::ubo(size_t size, int idx, GLenum hint)
 {
-    allocate(buffer::UNIFORM_BUFFER, size, hint);
+    allocate(UNIFORM_BUFFER, size, hint);
     index = idx;
     bind_uniform();
 }
 
 void gl::ubo::bind_uniform()
 {
-    bind_base(buffer::UNIFORM_BUFFER, index);
+    bind_base(UNIFORM_BUFFER, index);
 }
 
 void gl::ubo::update(const uint8_t *data, int offset, GLsizeiptr size)
 {
-    upload(buffer::UNIFORM_BUFFER, data, offset, size);
+    upload(UNIFORM_BUFFER, data, offset, size);
 }

gl/vao.cpp

@@ -20,7 +20,7 @@ gl::vao::~vao()
 	glDeleteVertexArrays(1, *this);
 }
 
-void gl::vao::setup_attrib(gl::buffer &buffer, int attrib, int size, int type, int stride, int offset)
+void gl::vao::setup_attrib(buffer &buffer, int attrib, int size, int type, int stride, int offset)
 {
 	if (use_vao) {
 		bind();
@@ -61,7 +61,7 @@ void gl::vao::bind()
 	}
 	else {
 		for (attrib_params &param : params) {
-			param.buffer.bind(gl::buffer::ARRAY_BUFFER);
+			param.buffer.bind(buffer::ARRAY_BUFFER);
 			glVertexAttribPointer(param.attrib, param.size, param.type, GL_FALSE, param.stride, reinterpret_cast<void*>(param.offset));
 			glEnableVertexAttribArray(param.attrib);
 		}
@@ -70,9 +70,9 @@ void gl::vao::bind()
 			glDisableVertexAttribArray(i);
 
 		if (ebo)
-			ebo->bind(gl::buffer::ELEMENT_ARRAY_BUFFER);
+			ebo->bind(buffer::ELEMENT_ARRAY_BUFFER);
 		else
-			gl::buffer::unbind(gl::buffer::ELEMENT_ARRAY_BUFFER);
+			buffer::unbind(buffer::ELEMENT_ARRAY_BUFFER);
 	}
 }
 

gl/vao.h

@@ -10,7 +10,7 @@ namespace gl
     {
 		struct attrib_params {
 			// TBD: should be shared_ptr? (when buffer is destroyed by owner VAO could still potentially exist)
-			gl::buffer &buffer;
+			buffer &buffer;
 
 			int attrib;
 			int size;