Various OpenGL fixes

Author: Sploder12

src/include/sndx/platform/windows.h

@@ -12,7 +12,7 @@
 #define UNDEF_LEANMEAN
 #endif
 
-#include <Windows.h>
+#include <windows.h>
 
 #ifdef UNDEF_MINMAX
 #undef NOMINMAX

src/include/sndx/render/gl/shader.hpp

@@ -43,6 +43,8 @@ namespace sndx::render {
 	private:
 		GLuint m_id{0};
 
+		friend class ShaderProgram;
+
 	public:
 		constexpr Shader() noexcept = default;
 
@@ -77,7 +79,7 @@ namespace sndx::render {
 	protected:
 		void destroy() {
 			if (m_id != 0) {
-				glDeleteShader(std::exchange(id, 0));
+				glDeleteShader(std::exchange(m_id, 0));
 			}
 		}
 
@@ -132,18 +134,18 @@ namespace sndx::render {
 
 		template <class T>
 		explicit ShaderProgram(T& shaders) :
-			id(glCreateProgram()), uniformCache{} {
+			m_id(glCreateProgram()), uniformCache{} {
 
-			for (auto shader : shaders) {
-				glAttachShader(id, shader.id);
+			for (const auto& shader : shaders) {
+				glAttachShader(m_id, shader.m_id);
 			}
 
-			glLinkProgram(id);
+			glLinkProgram(m_id);
 
 			auto err = checkErr();
 
-			for (auto shader : shaders) {
-				glDetachShader(id, shader.id);
+			for (const auto& shader : shaders) {
+				glDetachShader(m_id, shader.m_id);
 			}
 
 			if (err.has_value()) [[unlikely]] {
@@ -152,7 +154,7 @@ namespace sndx::render {
 		}
 
 		void use() const {
-			glUseProgram(id);
+			glUseProgram(m_id);
 		}
 
 		[[nodiscard]]
@@ -162,7 +164,7 @@ namespace sndx::render {
 				return it->second;
 			}
 
-			auto ret = glGetUniformLocation(id, uid.c_str());
+			auto ret = glGetUniformLocation(m_id, uid.c_str());
 			uniformCache.emplace(uid, ret);
 			return ret;
 		}
@@ -289,21 +291,13 @@ namespace sndx::render {
 				shaders[i] = std::move(shdr.value());
 			}
 			else {
-				for (; i > 0; --i) {
-					shaders[i - 1].destroy();
-				}
 				return {};
 			}
 
 			++i;
 		}
 
 		auto out = ShaderProgram(shaders);
-
-		for (auto& shader : shaders) {
-			shader.destroy();
-		}
-
 		return out;
 	}
 }

src/include/sndx/render/gl/texture.hpp

@@ -51,17 +51,20 @@ namespace sndx::render {
 		GLenum m_target{GL_TEXTURE_2D};
 
 	public:
+
+		explicit Texture2D() = default;
+
 		Texture2D(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void* data, GLint mipmaps = 0) :
 			m_width(width), m_height(height), m_target(target) {
 
 			glGenTextures(1, &m_id);
 			glBindTexture(m_target, m_id);
-			glTexImage2D(m_target, mipmaps, internalFormat, m_width, m_height, 0, format, type, data);
+			glTexImage2D(m_target, mipmaps, internalFormat, GLsizei(m_width), GLsizei(m_height), 0, format, type, data);
 		}
 
 		Texture2D(const ImageData& image, GLint mipmaps = 0, bool compress = true) :
 			Texture2D(GL_TEXTURE_2D, formatFromChannels(image.channels(), compress),
-				image.width(), image.height(), formatFromChannels(image.channels(), false), GL_UNSIGNED_BYTE, image.data()) { }
+				GLsizei(image.width()), GLsizei(image.height()), formatFromChannels(image.channels(), false), GL_UNSIGNED_BYTE, image.data()) { }
 
 		Texture2D(const Texture2D&) = delete;
 		Texture2D(Texture2D&& other) noexcept :

src/include/sndx/render/gl/vao.hpp

@@ -10,7 +10,7 @@ namespace sndx::render {
 		GLuint m_id = 0;
 
 		void destroy() noexcept {
-			glDeleteVertexArrays(&m_id);
+			glDeleteVertexArrays(1, &m_id);
 			curIdx = 0;
 			m_id = 0;
 		}
@@ -48,15 +48,15 @@ namespace sndx::render {
 		template <class... Layout>
 		void bindLayout(TypedVBO<Layout...>& vbo, GLuint divisor = 0) {
 			bind();
-			vbo.bind();
+			vbo.bind(GL_ARRAY_BUFFER);
 			curIdx += VboLayout<Layout...>::vertexAttribPointer(curIdx, divisor);
 		}
 
 		void resetLayout() {
 			if (m_id != 0) {
 				bind();
 				for (size_t i = 0; i < curIdx; ++i) {
-					glDisableVertexAttribArray(i);
+					glDisableVertexAttribArray(GLuint(i));
 				}
 				curIdx = 0;
 			}
@@ -66,7 +66,7 @@ namespace sndx::render {
 			if (m_id != 0) {
 				destroy();
 			}
-			glGenVertexArrays(1, &m_idx);
+			glGenVertexArrays(1, &m_id);
 		}
 	};
 }