Remove OpenGL extensions.

wojciech-graj · Apr 29, 2023 · f34b9e1 · f34b9e1
1 parent 354f1ca
commit f34b9e1
Show file tree

Hide file tree

Showing 11 changed files with 114 additions and 56 deletions.
diff --git a/res/shader/earth.frag b/res/shader/earth.frag
@@ -1,20 +1,19 @@
 #version 410 core
-#extension GL_ARB_explicit_uniform_location : enable
 
 out vec4 frag_color;
 
 in vec2 uv;
 in vec3 pos;
 
-layout (location = 0) uniform sampler2D texture_day;
-layout (location = 1) uniform sampler2D texture_night;
-layout (location = 2) uniform sampler2D texture_specular;
-layout (location = 3) uniform sampler2D texture_clouds;
-layout (location = 4) uniform sampler1D texture_gradient;
-layout (location = 6) uniform vec3 sun_dir;
-layout (location = 7) uniform vec3 look_pos;
-layout (location = 8) uniform bool clouds;
-layout (location = 9) uniform bool lighting;
+uniform sampler2D texture_day;
+uniform sampler2D texture_night;
+uniform sampler2D texture_specular;
+uniform sampler2D texture_clouds;
+uniform sampler1D texture_gradient;
+uniform vec3 sun_dir;
+uniform vec3 look_pos;
+uniform bool clouds;
+uniform bool lighting;
 
 const float PI = 3.14159;
 const float TRANSITION_WIDTH = 0.1;

diff --git a/res/shader/earth.vert b/res/shader/earth.vert
@@ -1,12 +1,12 @@
 #version 410 core
-#extension GL_ARB_explicit_uniform_location : enable
+
 layout (location = 0) in vec3 in_pos;
 layout (location = 1) in vec2 in_uv;
 
 out vec3 pos;
 out vec2 uv;
 
-layout (location = 5) uniform mat4 transform;
+uniform mat4 transform;
 
 void main()
 {

diff --git a/res/shader/satellite.frag b/res/shader/satellite.frag
@@ -1,5 +1,4 @@
 #version 410 core
-#extension GL_ARB_explicit_uniform_location : enable
 
 out vec4 frag_color;
 

diff --git a/res/shader/satellite.vert b/res/shader/satellite.vert
@@ -1,11 +1,10 @@
 #version 410 core
-#extension GL_ARB_explicit_uniform_location : enable
 
 layout (location = 0) in vec3 in_pos;
 layout (location = 1) in vec3 in_color;
 
-layout (location = 0) uniform mat4 transform;
-layout (location = 1) uniform float scl;
+uniform mat4 transform;
+uniform float scl;
 
 out vec3 color;
 

diff --git a/res/shader/sky.frag b/res/shader/sky.frag
@@ -1,11 +1,10 @@
 #version 410 core
-#extension GL_ARB_explicit_uniform_location : enable
 
 out vec4 frag_color;
 
 in vec2 uv;
 
-layout (location = 0) uniform sampler2D texture_sky;
+uniform sampler2D texture_sky;
 
 void main()
 {

diff --git a/res/shader/sky.vert b/res/shader/sky.vert
@@ -1,12 +1,11 @@
 #version 410 core
-#extension GL_ARB_explicit_uniform_location : enable
 
 layout (location = 0) in vec3 in_pos;
 layout (location = 1) in vec2 in_uv;
 
 out vec2 uv;
 
-layout (location = 1) uniform mat4 transform;
+uniform mat4 transform;
 
 void main()
 {

diff --git a/src/entity/earth.c b/src/entity/earth.c
@@ -33,17 +33,18 @@ enum LayoutLoc {
 	LOCL_ATEXCOORD,
 };
 
-enum UniformLoc {
-	LOCU_TEXTURE_DAY = 0,
-	LOCU_TEXTURE_NIGHT,
-	LOCU_TEXTURE_SPECULAR,
-	LOCU_TEXTURE_CLOUDS,
-	LOCU_TEXTURE_GRADIENT,
-	LOCU_TRANSFORM,
-	LOCU_SUN_DIR,
-	LOCU_LOOK_POS,
-	LOCU_CLOUDS,
-	LOCU_LIGHTING,
+enum UniformIdx {
+	U_TEXTURE_DAY = 0,
+	U_TEXTURE_NIGHT,
+	U_TEXTURE_SPECULAR,
+	U_TEXTURE_CLOUDS,
+	U_TEXTURE_GRADIENT,
+	U_TRANSFORM,
+	U_SUN_DIR,
+	U_LOOK_POS,
+	U_CLOUDS,
+	U_LIGHTING,
+	N_UNIFORMS,
 };
 
 extern const unsigned char res_shader_earth_vert[];
@@ -73,6 +74,39 @@ static struct Texture texture_specular;
 static struct Texture texture_clouds;
 static struct Texture texture_gradient;
 
+static struct ShaderAttr uniforms[] = {
+	[U_TEXTURE_DAY] = {
+		.name = "texture_day",
+	},
+	[U_TEXTURE_NIGHT] = {
+		.name = "texture_night",
+	},
+	[U_TEXTURE_SPECULAR] = {
+		.name = "texture_specular",
+	},
+	[U_TEXTURE_CLOUDS] = {
+		.name = "texture_clouds",
+	},
+	[U_TEXTURE_GRADIENT] = {
+		.name = "texture_gradient",
+	},
+	[U_TRANSFORM] = {
+		.name = "transform",
+	},
+	[U_SUN_DIR] = {
+		.name = "sun_dir",
+	},
+	[U_LOOK_POS] = {
+		.name = "look_pos",
+	},
+	[U_CLOUDS] = {
+		.name = "clouds",
+	},
+	[U_LIGHTING] = {
+		.name = "lighting",
+	},
+};
+
 void earth_init(void)
 {
 	icosphere_generate(3, &obj_earth.verts, &obj_earth.faces, &obj_earth.uv, &obj_earth.n_verts, &obj_earth.n_faces);
@@ -85,7 +119,8 @@ void earth_init(void)
 	shader_init(&shader, (const char *)res_shader_earth_vert, res_shader_earth_vert_len, (const char *)res_shader_earth_frag, res_shader_earth_frag_len, 2, (struct ShaderAttr[]){
 																					{ LOCL_APOS, "in_pos" },
 																					{ LOCL_ATEXCOORD, "in_uv" },
-																				});
+																				},
+		N_UNIFORMS, uniforms);
 
 	texture_init_from_image(&texture_day, res_texture_earth_daymap_jpg, res_texture_earth_daymap_jpg_len, GL_TEXTURE0, GL_TEXTURE_2D);
 	texture_init_from_image(&texture_night, res_texture_earth_nightmap_jpg, res_texture_earth_nightmap_jpg_len, GL_TEXTURE1, GL_TEXTURE_2D);
@@ -123,16 +158,16 @@ void earth_render(void)
 	camera_mvp_generate(&e_camera, &model.model_mat, transform);
 
 	shader_bind(&shader);
-	glUniform3fv(LOCU_SUN_DIR, 1, e_phys.sun_dir);
-	glUniform1i(LOCU_TEXTURE_DAY, 0);
-	glUniform1i(LOCU_TEXTURE_NIGHT, 1);
-	glUniform1i(LOCU_TEXTURE_SPECULAR, 2);
-	glUniform1i(LOCU_TEXTURE_CLOUDS, 3);
-	glUniform1i(LOCU_TEXTURE_GRADIENT, 4);
-	glUniform3fv(LOCU_LOOK_POS, 1, e_camera.pos);
-	glUniformMatrix4fv(LOCU_TRANSFORM, 1, GL_FALSE, (const GLfloat *)&transform);
-	glUniform1i(LOCU_CLOUDS, es_clouds);
-	glUniform1i(LOCU_LIGHTING, es_lighting);
+	glUniform3fv(uniforms[U_SUN_DIR].index, 1, e_phys.sun_dir);
+	glUniform1i(uniforms[U_TEXTURE_DAY].index, 0);
+	glUniform1i(uniforms[U_TEXTURE_NIGHT].index, 1);
+	glUniform1i(uniforms[U_TEXTURE_SPECULAR].index, 2);
+	glUniform1i(uniforms[U_TEXTURE_CLOUDS].index, 3);
+	glUniform1i(uniforms[U_TEXTURE_GRADIENT].index, 4);
+	glUniform3fv(uniforms[U_LOOK_POS].index, 1, e_camera.pos);
+	glUniformMatrix4fv(uniforms[U_TRANSFORM].index, 1, GL_FALSE, (const GLfloat *)&transform);
+	glUniform1i(uniforms[U_CLOUDS].index, es_clouds);
+	glUniform1i(uniforms[U_LIGHTING].index, es_lighting);
 
 	glDrawElements(GL_TRIANGLES, obj_earth.n_faces * 3, GL_UNSIGNED_INT, (GLvoid *)0);
 }
diff --git a/src/entity/satellite.c b/src/entity/satellite.c
@@ -55,9 +55,10 @@ enum LayoutLoc {
 	LOCL_COLOR,
 };
 
-enum UniformLoc {
-	LOCU_TRANSFORM = 0u,
-	LOCU_SCALE,
+enum UniformIdx {
+	U_TRANSFORM = 0u,
+	U_SCALE,
+	N_UNIFORMS,
 };
 
 enum DLMultiLoc {
@@ -88,6 +89,15 @@ static struct BO vbo_orbit_colors;
 
 static struct Shader shader;
 
+static struct ShaderAttr uniforms[] = {
+	[U_TRANSFORM] = {
+		.name = "transform",
+	},
+	[U_SCALE] = {
+		.name = "scl",
+	}
+};
+
 static mat4 transform;
 
 static size_t n_satellites_sync = 0;
@@ -153,7 +163,8 @@ void satellite_init(void)
 	shader_init(&shader, (const char *)res_shader_satellite_vert, res_shader_satellite_vert_len, (const char *)res_shader_satellite_frag, res_shader_satellite_frag_len, 2, (struct ShaderAttr[]){
 																							{ LOCL_APOS, "in_pos" },
 																							{ LOCL_COLOR, "in_color" },
-																						});
+																						},
+		N_UNIFORMS, uniforms);
 
 	alloc_orbit_arrays();
 
@@ -474,8 +485,8 @@ void satellites_render(void)
 	if (satellites_renderable) {
 		shader_bind(&shader);
 		camera_mvp_generate(&e_camera, &e_phys.teme_to_world, transform);
-		glUniformMatrix4fv(LOCU_TRANSFORM, 1, GL_FALSE, (const GLfloat *)&transform);
-		glUniform1f(LOCU_SCALE, es_satellite_scale);
+		glUniformMatrix4fv(uniforms[U_TRANSFORM].index, 1, GL_FALSE, (const GLfloat *)&transform);
+		glUniform1f(uniforms[U_SCALE].index, es_satellite_scale);
 
 		vao_bind(&vao_satellites);
 		glEnable(GL_VERTEX_PROGRAM_POINT_SIZE);

diff --git a/src/entity/sky.c b/src/entity/sky.c
@@ -32,9 +32,10 @@ enum LayoutLoc {
 	LOCL_ATEXCOORD,
 };
 
-enum UniformLoc {
-	LOCU_TEXTURE = 0u,
-	LOCU_TRANSFORM,
+enum UniformIdx {
+	U_TEXTURE = 0u,
+	U_TRANSFORM,
+	N_UNIFORMS,
 };
 
 extern const unsigned char res_shader_sky_vert[];
@@ -51,6 +52,15 @@ static struct Model model;
 static struct Shader shader;
 static struct Texture texture;
 
+static struct ShaderAttr uniforms[] = {
+	[U_TEXTURE] = {
+		.name = "texture_sky",
+	},
+	[U_TRANSFORM] = {
+		.name = "transform",
+	},
+};
+
 void sky_init(void)
 {
 	icosphere_generate(1, &obj.verts, &obj.faces, &obj.uv, &obj.n_verts, &obj.n_faces);
@@ -64,7 +74,8 @@ void sky_init(void)
 	shader_init(&shader, (const char *)res_shader_sky_vert, res_shader_sky_vert_len, (const char *)res_shader_sky_frag, res_shader_sky_frag_len, 2, (struct ShaderAttr[]){
 																				{ LOCL_APOS, "in_pos" },
 																				{ LOCL_ATEXCOORD, "in_uv" },
-																			});
+																			},
+		N_UNIFORMS, uniforms);
 
 	texture_init_from_image(&texture, res_texture_stars_jpg, res_texture_stars_jpg_len, GL_TEXTURE0, GL_TEXTURE_2D);
 
@@ -92,8 +103,8 @@ void sky_render(void)
 	camera_mvp_generate(&e_camera, &model.model_mat, transform);
 
 	shader_bind(&shader);
-	glUniform1i(LOCU_TEXTURE, 0);
-	glUniformMatrix4fv(LOCU_TRANSFORM, 1, GL_FALSE, (const GLfloat *)&transform);
+	glUniform1i(uniforms[U_TEXTURE].index, 0);
+	glUniformMatrix4fv(uniforms[U_TRANSFORM].index, 1, GL_FALSE, (const GLfloat *)&transform);
 
 	glDrawElements(GL_TRIANGLES, obj.n_faces * 3, GL_UNSIGNED_INT, (GLvoid *)0);
 }
diff --git a/src/gfx/shader.c b/src/gfx/shader.c
@@ -33,7 +33,7 @@ GLint shader_compile(const char *str, unsigned int len, GLenum type)
 	return handle;
 }
 
-void shader_init(struct Shader *shader, const char *vs, unsigned int vs_len, const char *fs, unsigned int fs_len, size_t n_vertex_attr, struct ShaderAttr vertex_attr[])
+void shader_init(struct Shader *shader, const char *vs, unsigned int vs_len, const char *fs, unsigned int fs_len, size_t n_vertex_attr, struct ShaderAttr vertex_attr[], size_t n_uniforms, struct ShaderAttr uniforms[])
 {
 	GLuint vs_handle = shader_compile(vs, vs_len, GL_VERTEX_SHADER);
 	GLuint fs_handle = shader_compile(fs, fs_len, GL_FRAGMENT_SHADER);
@@ -52,6 +52,12 @@ void shader_init(struct Shader *shader, const char *vs, unsigned int vs_len, con
 	glGetProgramiv(shader->handle, GL_LINK_STATUS, &linked);
 	gfx_error_check(linked, glGetProgramInfoLog, shader->handle, "Failed to link shaders.");
 
+	for (i = 0; i < n_uniforms; i++) {
+		GLint loc = glGetUniformLocation(shader->handle, uniforms[i].name);
+		error_check(loc != -1, "Failed to locate uniform %s in shader.", uniforms[i].name);
+		uniforms[i].index = loc;
+	}
+
 	glDetachShader(shader->handle, vs_handle);
 	glDetachShader(shader->handle, fs_handle);
 

diff --git a/src/gfx/shader.h b/src/gfx/shader.h
@@ -26,7 +26,7 @@ struct Shader {
 	GLuint handle;
 };
 
-void shader_init(struct Shader *shader, const char *vs, unsigned int vs_len, const char *fs, unsigned int fs_len, size_t n_vertex_attr, struct ShaderAttr vertex_attr[]);
+void shader_init(struct Shader *shader, const char *vs, unsigned int vs_len, const char *fs, unsigned int fs_len, size_t n_vertex_attr, struct ShaderAttr vertex_attr[], size_t n_uniforms, struct ShaderAttr uniforms[]);
 void shader_deinit(struct Shader *shader);
 void shader_bind(struct Shader *shader);