Merge branch 'master' into specialized-shaders-2

wheremyfoodat · May 12, 2024 · 4e9f824 · 4e9f824
2 parents 842943f + 79bfb67
commit 4e9f824
Showing 1 changed file with 68 additions and 26 deletions.
diff --git a/third_party/opengl/opengl.hpp b/third_party/opengl/opengl.hpp
@@ -430,36 +430,36 @@ namespace OpenGL {
         glDispatchCompute(groupsX, groupsY, groupsZ);
     }
 
-    struct VertexBuffer {
-        GLuint m_handle = 0;
+	struct VertexBuffer {
+		GLuint m_handle = 0;
 
-        void create() {
-            if (m_handle == 0) {
-                glGenBuffers(1, &m_handle);
-            }
-        }
+		void create() {
+			if (m_handle == 0) {
+				glGenBuffers(1, &m_handle);
+			}
+		}
 
-        void createFixedSize(GLsizei size, GLenum usage = GL_DYNAMIC_DRAW) {
-            create();
-            bind();
-            glBufferData(GL_ARRAY_BUFFER, size, nullptr, usage);
-        }
+		void createFixedSize(GLsizei size, GLenum usage = GL_DYNAMIC_DRAW) {
+			create();
+			bind();
+			glBufferData(GL_ARRAY_BUFFER, size, nullptr, usage);
+		}
 
-        VertexBuffer(bool shouldCreate = false) {
-            if (shouldCreate) {
-                create();
-            }
-        }
+		VertexBuffer(bool shouldCreate = false) {
+			if (shouldCreate) {
+				create();
+			}
+		}
 
 #ifdef OPENGL_DESTRUCTORS
-        ~VertexBuffer() { free(); }
-#endif  
-        GLuint handle() const { return m_handle; }
-        bool exists() const { return m_handle != 0; }
-        void bind() const { glBindBuffer(GL_ARRAY_BUFFER, m_handle); }
-        void free() { glDeleteBuffers(1, &m_handle); }
+		~VertexBuffer() { free(); }
+#endif
+		GLuint handle() const { return m_handle; }
+		bool exists() const { return m_handle != 0; }
+		void bind() const { glBindBuffer(GL_ARRAY_BUFFER, m_handle); }
+		void free() { glDeleteBuffers(1, &m_handle); }
 
-        // Reallocates the buffer on every call. Prefer the sub version if possible.
+		// Reallocates the buffer on every call. Prefer the sub version if possible.
 		template <typename VertType>
 		void bufferVerts(VertType* vertices, int vertCount, GLenum usage = GL_DYNAMIC_DRAW) {
 			glBufferData(GL_ARRAY_BUFFER, sizeof(VertType) * vertCount, vertices, usage);
@@ -471,7 +471,7 @@ namespace OpenGL {
 			glBufferSubData(GL_ARRAY_BUFFER, offset, sizeof(VertType) * vertCount, vertices);
 		}
 
-        // If C++20 is available, add overloads that take std::span instead of raw pointers
+		// If C++20 is available, add overloads that take std::span instead of raw pointers
 #ifdef OPENGL_HAVE_CPP20
 		template <typename VertType>
 		void bufferVerts(std::span<const VertType> vertices, GLenum usage = GL_DYNAMIC_DRAW) {
@@ -485,6 +485,48 @@ namespace OpenGL {
 #endif
 	};
 
+	struct UniformBuffer {
+		GLuint m_handle = 0;
+
+		void create() {
+			if (m_handle == 0) {
+				glGenBuffers(1, &m_handle);
+			}
+		}
+
+		void createFixedSize(GLsizei size, GLenum usage = GL_DYNAMIC_DRAW) {
+			create();
+			bind();
+			glBufferData(GL_UNIFORM_BUFFER, size, nullptr, usage);
+		}
+
+		UniformBuffer(bool shouldCreate = false) {
+			if (shouldCreate) {
+				create();
+			}
+		}
+
+#ifdef OPENGL_DESTRUCTORS
+		~UniformBuffer() { free(); }
+#endif
+		GLuint handle() const { return m_handle; }
+		bool exists() const { return m_handle != 0; }
+		void bind() const { glBindBuffer(GL_UNIFORM_BUFFER, m_handle); }
+		void free() { glDeleteBuffers(1, &m_handle); }
+
+		// Reallocates the buffer on every call. Prefer the sub version if possible.
+		template <typename UniformType>
+		void buffer(const UniformType& uniformData, GLenum usage = GL_DYNAMIC_DRAW) {
+			glBufferData(GL_UNIFORM_BUFFER, sizeof(uniformData), &uniformData, usage);
+		}
+
+		// Only use if you used createFixedSize
+		template <typename UniformType>
+		void bufferSub(const UniformType& uniformData, int vertCount, GLintptr offset = 0) {
+			glBufferSubData(GL_UNIFORM_BUFFER, offset, sizeof(uniformData), &uniformData);
+		}
+	};
+
     enum DepthFunc {
         Never = GL_NEVER,       // Depth test never passes
         Always = GL_ALWAYS,     // Depth test always passes
@@ -693,4 +735,4 @@ namespace OpenGL {
 
     using Rect = Rectangle<GLuint>;
 
-}  // end namespace OpenGL
+}  // end namespace OpenGL