MD3: Use explicit uniform locations

Author: andrei-drexler

Quake/gl_shaders.c

@@ -368,8 +368,6 @@ void GL_CreateShaders (void)
 				for (poseverttype = 0; poseverttype < 3; poseverttype++) 
 					glprogs.alias[oit][mode][alphatest][poseverttype] =
 					GL_CreateProgram (alias_vertex_shader, alias_fragment_shader, "alias|OIT %d; MODE %d; ALPHATEST %d; POSEVERTTYPE %d", oit, mode, alphatest, poseverttype);
-	glprogs.alias_numverts_loc = GL_GetUniformLocationFunc (glprogs.alias[0][0][0][2], "u_numVerts");
-	glprogs.alias_numposes_loc = GL_GetUniformLocationFunc (glprogs.alias[0][0][0][2], "u_numPoses");
 
 	glprogs.debug3d = GL_CreateProgram (debug3d_vertex_shader, debug3d_fragment_shader, "debug3d");
 

Quake/gl_shaders.h

@@ -1095,8 +1095,8 @@ ALIAS_INSTANCE_BUFFER
 "#elif POSEVERTTYPE == 2 \n"
 "	layout (location = 0) in vec2 in_uv;\n"
 "\n"
-"	uniform int u_numVerts;\n"
-"	uniform int u_numPoses;\n"
+"	layout(location=0) uniform int NumVerts;\n"
+"	layout(location=1) uniform int NumPoses;\n"
 "\n"
 "	layout (std430, binding = 2) restrict readonly buffer PoseData\n"
 "	{\n"
@@ -1105,9 +1105,9 @@ ALIAS_INSTANCE_BUFFER
 "\n"
 "	PoseVertex GetPoseVertex (uint pose)\n"
 "	{\n"
-"		uint safePose = clamp(pose, 0u, uint(u_numPoses - 1));\n"
+"		uint safePose = clamp(pose, 0u, uint(NumPoses - 1));\n"
 "\n"
-"		int index = int(safePose) * u_numVerts + gl_VertexID;\n"
+"		int index = int(safePose) * NumVerts + gl_VertexID;\n"
 "		uvec2 data = PackedPosNor[index];\n"
 "		PoseVertex ret;\n"
 "		ret.pos = vec3((ivec3(data.xxy >> uvec3(0, 16, 0)) & 65535) - 32768);\n"

Quake/glquake.h

@@ -534,8 +534,6 @@ typedef struct glprogs_s {
 	GLuint		skycubemap[2][2];	// [anim][dither]
 	GLuint		skyboxside[2];		// [dither]
 	GLuint		alias[2][3][2][3];	// [OIT][mode:standard/dithered/noperspective][alpha test][poseverttype]
-	GLint		alias_numverts_loc;
-	GLint		alias_numposes_loc;
 	GLuint		sprites[2];			// [dither]
 	GLuint		particles[2][2];	// [OIT][dither]
 	GLuint		debug3d;

Quake/r_alias.c

@@ -409,8 +409,8 @@ void R_FlushAliasInstances (qboolean showtris)
 		GL_BindBuffersRange (GL_SHADER_STORAGE_BUFFER, 1, 2, buffers, offsets, sizes);
 
 		if (poseverttype == PV_MD3) {
-			GL_Uniform1iFunc (glprogs.alias_numverts_loc, hdr->numverts_vbo);
-			GL_Uniform1iFunc (glprogs.alias_numposes_loc, hdr->numposes);
+			GL_Uniform1iFunc (0, hdr->numverts_vbo);
+			GL_Uniform1iFunc (1, hdr->numposes);
 		}
 		GL_BindTextures (0, 2, textures);
 		GL_DrawElementsInstancedFunc (GL_TRIANGLES, hdr->numindexes, GL_UNSIGNED_SHORT, (void*)hdr->eboofs, ibuf.count);
@@ -463,8 +463,8 @@ void R_FlushAliasInstances (qboolean showtris)
 			GL_BindBuffersRange (GL_SHADER_STORAGE_BUFFER, 1, 2, buffers, offsets, sizes);
 
 			if (poseverttype == PV_MD3) {
-				GL_Uniform1iFunc (glprogs.alias_numverts_loc, hdr->numverts_vbo);
-				GL_Uniform1iFunc (glprogs.alias_numposes_loc, hdr->numposes);
+				GL_Uniform1iFunc (0, hdr->numverts_vbo);
+				GL_Uniform1iFunc (1, hdr->numposes);
 			}
 			GL_BindTextures (0, 2, textures);
 			GL_DrawElementsInstancedFunc (GL_TRIANGLES, hdr->numindexes, GL_UNSIGNED_SHORT, (void*)hdr->eboofs, ibuf.count);