Merge pull request #1664 from heinezen/feature/shader_update_optimize

Vectorize uniform inputs
SFTtech · Aug 2, 2024 · 99e355e · 99e355e
2 parents 7785b44 + e57f865
commit 99e355e
Show file tree

Hide file tree

Showing 14 changed files with 395 additions and 355 deletions.
diff --git a/libopenage/renderer/opengl/context.cpp b/libopenage/renderer/opengl/context.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2023 the openage authors. See copying.md for legal info.
+// Copyright 2015-2024 the openage authors. See copying.md for legal info.
 
 #include <array>
 #include <epoxy/gl.h>
@@ -74,6 +74,8 @@ gl_context_spec GlContext::find_spec() {
 	caps.max_texture_slots = temp;
 	glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &temp);
 	caps.max_vertex_attributes = temp;
+	glGetIntegerv(GL_MAX_UNIFORM_LOCATIONS, &temp);
+	caps.max_uniform_locations = temp;
 	glGetIntegerv(GL_MAX_UNIFORM_BUFFER_BINDINGS, &temp);
 	caps.max_uniform_buffer_bindings = temp;
 

diff --git a/libopenage/renderer/opengl/context.h b/libopenage/renderer/opengl/context.h
@@ -24,6 +24,8 @@ struct gl_context_spec {
 	size_t max_texture_slots;
 	/// The maximum size of a single dimension of a texture.
 	size_t max_texture_size;
+	/// The maximum number of uniform locations per shader.
+	size_t max_uniform_locations;
 	/// The maximum number of binding points for uniform blocks
 	/// in a single shader.
 	size_t max_uniform_buffer_bindings;

diff --git a/libopenage/renderer/opengl/lookup.h b/libopenage/renderer/opengl/lookup.h
@@ -33,6 +33,10 @@ static constexpr auto GL_UNIFORM_TYPE_SIZE = datastructure::create_const_map<GLe
 	std::pair(GL_FLOAT_VEC2, 8),
 	std::pair(GL_FLOAT_VEC3, 12),
 	std::pair(GL_FLOAT_VEC4, 16),
+	std::pair(GL_DOUBLE, 8),
+	std::pair(GL_DOUBLE_VEC2, 16),
+	std::pair(GL_DOUBLE_VEC3, 24),
+	std::pair(GL_DOUBLE_VEC4, 32),
 	std::pair(GL_INT, 4),
 	std::pair(GL_INT_VEC2, 8),
 	std::pair(GL_INT_VEC3, 12),
@@ -137,7 +141,7 @@ static constexpr auto GL_PRIMITIVE = datastructure::create_const_map<resources::
 	std::pair(resources::vertex_primitive_t::POINTS, GL_POINTS),
 	std::pair(resources::vertex_primitive_t::LINES, GL_LINES),
 	std::pair(resources::vertex_primitive_t::LINE_STRIP, GL_LINE_STRIP),
-    std::pair(resources::vertex_primitive_t::LINE_LOOP, GL_LINE_LOOP),
+	std::pair(resources::vertex_primitive_t::LINE_LOOP, GL_LINE_LOOP),
 	std::pair(resources::vertex_primitive_t::TRIANGLES, GL_TRIANGLES),
 	std::pair(resources::vertex_primitive_t::TRIANGLE_STRIP, GL_TRIANGLE_STRIP),
 	std::pair(resources::vertex_primitive_t::TRIANGLE_FAN, GL_TRIANGLE_FAN));

diff --git a/libopenage/renderer/opengl/shader_data.h b/libopenage/renderer/opengl/shader_data.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include <optional>
 #include <string>
 #include <unordered_map>
 
@@ -22,6 +23,13 @@ struct GlUniform {
 	 * NOT the same as the uniform index.
 	 */
 	GLuint location;
+
+	/**
+	 * Only used for sampler uniforms.
+	 *
+	 * Texture unit to which the sampler is bound.
+	 */
+	std::optional<GLuint> tex_unit;
 };
 
 /**