Nuke SHADER_3D_(DYNAMIC_STATIC) distinction

SHADER_3D_DYNAMIC and SHADER_3D_STATIC were two options for implicitly
creating a shader from an image that lacks a text shader. Merge them
into a single SHADER_3D.

The only distinction between the two was using CGEN_IDENTITY vs.
CGEN_IDENTITY_LIGHTING. This only makes a difference if r_overbrightQ3
is on. But even for emulating Quake 3 the code was wrong: it requested
CGEN_IDENTITY_LIGHTING, which cancels overbright, for models. Models use
the light grid which *should* receive the overbright factor. Actual ioq3
uses CGEN_LIGHTING_DIFFUSE, which we no longer have, for those models.

Author: slipher

src/engine/renderer/tr_bsp.cpp

@@ -829,7 +829,7 @@ static shader_t* ShaderForShaderNum( int shaderNum ) {
 
 	dshader_t* dsh = &s_worldData.shaders[shaderNum];
 
-	shader_t* shader = R_FindShader( dsh->shader, shaderType_t::SHADER_3D_STATIC, RSF_DEFAULT );
+	shader_t* shader = R_FindShader( dsh->shader, shaderType_t::SHADER_3D, RSF_DEFAULT );
 
 	// If the shader had errors, just use default shader
 	if ( shader->defaultShader ) {
@@ -3271,7 +3271,7 @@ static void R_LoadFogs( lump_t *l, lump_t *brushesLump, lump_t *sidesLump )
 		}
 
 		// get information from the shader for fog parameters
-		shader = R_FindShader( fogs->shader, shaderType_t::SHADER_3D_DYNAMIC, RSF_DEFAULT );
+		shader = R_FindShader( fogs->shader, shaderType_t::SHADER_3D, RSF_DEFAULT );
 
 		out->fogParms = shader->fogParms;
 

src/engine/renderer/tr_local.h

@@ -1208,8 +1208,7 @@ enum class ssaoMode {
 	enum class shaderType_t
 	{
 	  SHADER_2D, // surface material: shader is for 2D rendering (like GUI elements)
-	  SHADER_3D_DYNAMIC, // surface material: shader is for cGen diffuseLighting lighting
-	  SHADER_3D_STATIC, // surface material: pre-lit triangle models
+	  SHADER_3D,
 	};
 
 	struct shader_t

src/engine/renderer/tr_model_iqm.cpp

@@ -881,7 +881,7 @@ bool R_LoadIQModel( model_t *mod, const void *buffer, int filesize,
 		}
 
 		surface->shader = R_FindShader( ( char* )IQMPtr(header, header->ofs_text + mesh->material),
-						shaderType_t::SHADER_3D_DYNAMIC, RSF_DEFAULT );
+						shaderType_t::SHADER_3D, RSF_DEFAULT );
 		if( surface->shader->defaultShader )
 			surface->shader = tr.defaultShader;
 		surface->data = IQModel;

src/engine/renderer/tr_model_md3.cpp

@@ -187,7 +187,7 @@ bool R_LoadMD3( model_t *mod, int lod, const void *buffer, const char *modName )
 
 		// only consider the first shader
 		md3Shader = ( md3Shader_t * )( ( byte * ) md3Surf + md3Surf->ofsShaders );
-		surf->shader = R_FindShader( md3Shader->name, shaderType_t::SHADER_3D_DYNAMIC, RSF_DEFAULT );
+		surf->shader = R_FindShader( md3Shader->name, shaderType_t::SHADER_3D, RSF_DEFAULT );
 
 		// swap all the triangles
 		surf->numTriangles = md3Surf->numTriangles;

src/engine/renderer/tr_model_md5.cpp

@@ -317,7 +317,7 @@ bool R_LoadMD5( model_t *mod, const char *buffer, const char *modName )
 		// lowercase the surface name so skin compares are faster
 
 		// register the shaders
-		sh = R_FindShader( surf->shader, shaderType_t::SHADER_3D_DYNAMIC, RSF_DEFAULT );
+		sh = R_FindShader( surf->shader, shaderType_t::SHADER_3D, RSF_DEFAULT );
 
 		if ( sh->defaultShader )
 		{

src/engine/renderer/tr_shader.cpp

@@ -5993,10 +5993,6 @@ shader_t       *R_FindShaderByName( const char *name )
 	// see if the shader is already loaded
 	for ( sh = shaderHashTable[ hash ]; sh; sh = sh->next )
 	{
-		// NOTE: if there was no shader or image available with the name strippedName
-		// then a default shader is created with type == SHADER_3D_DYNAMIC, so we
-		// have to check all default shaders otherwise for every call to R_FindShader
-		// with that same strippedName a new default shader is created.
 		if ( Q_stricmp( sh->name, strippedName ) == 0 )
 		{
 			// match found
@@ -6022,19 +6018,14 @@ Will always return a valid shader, but it might be the
 default shader if the real one can't be found.
 
 In the interest of not requiring an explicit shader text entry to
-be defined for every single image used in the game, three default
-shader behaviors can be auto-created for any image:
+be defined for every single image used in the game, two default
+shader behaviors can be auto-created for any image that does not
+have an explicit shader:
 
-If type == SHADER_2D, then the image will be used
-for 2D rendering unless an explicit shader is found
+If type == SHADER_2D, then the image will default to using vertex colors.
 
-If type == SHADER_3D_DYNAMIC, then the image will have
-dynamic diffuse lighting applied to it, as appropriate for most
-entity skin surfaces.
-
-If type == SHADER_3D_STATIC, then the image will use
-the vertex rgba modulate values, as appropriate for misc_model
-pre-lit surfaces.
+If type == SHADER_3D, then the renderer will choose appropriate precomputed
+lighting: lightmap, (precomputed) vertex or light grid.
 ===============
 */
 shader_t       *R_FindShader( const char *name, shaderType_t type, int flags )
@@ -6059,7 +6050,7 @@ shader_t       *R_FindShader( const char *name, shaderType_t type, int flags )
 	for ( sh = shaderHashTable[ hash ]; sh; sh = sh->next )
 	{
 		// NOTE: if there was no shader or image available with the name strippedName
-		// then a default shader is created with type == SHADER_3D_DYNAMIC, so we
+		// then a default shader is created with type == SHADER_3D, so we
 		// have to check all default shaders otherwise for every call to R_FindShader
 		// with that same strippedName a new default shader is created.
 		if ( ( sh->type == type || sh->defaultShader ) && !Q_stricmp( sh->name, strippedName ) )
@@ -6214,20 +6205,8 @@ shader_t       *R_FindShader( const char *name, shaderType_t type, int flags )
 				break;
 			}
 
-		case shaderType_t::SHADER_3D_DYNAMIC:
-			{
-				// dynamic colors at vertexes
-				stages[ 0 ].type = stageType_t::ST_COLLAPSE_DIFFUSEMAP;
-				stages[ 0 ].bundle[ 0 ].image[ 0 ] = image;
-				stages[ 0 ].active = true;
-				stages[ 0 ].rgbGen = colorGen_t::CGEN_IDENTITY_LIGHTING;
-				stages[ 0 ].stateBits = implicitStateBits;
-				break;
-			}
-
-		case shaderType_t::SHADER_3D_STATIC:
+		case shaderType_t::SHADER_3D:
 			{
-				// explicit colors at vertexes
 				stages[ 0 ].type = stageType_t::ST_COLLAPSE_DIFFUSEMAP;
 				stages[ 0 ].bundle[ 0 ].image[ 0 ] = image;
 				stages[ 0 ].active = true;
@@ -6349,8 +6328,7 @@ class ListShadersCmd : public Cmd::StaticCmd
 	{
 		static const std::unordered_map<shaderType_t, std::string> shaderTypeName = {
 			{ shaderType_t::SHADER_2D, "2D" },
-			{ shaderType_t::SHADER_3D_DYNAMIC, "3D_DYNAMIC" },
-			{ shaderType_t::SHADER_3D_STATIC, "3D_STATIC" },
+			{ shaderType_t::SHADER_3D, "3D" },
 		};
 
 		static const std::unordered_map<shaderSort_t, std::string> shaderSortName = {
@@ -6822,7 +6800,7 @@ static void CreateInternalShaders()
 
 	Q_strncpyz( shader.name, "<default>", sizeof( shader.name ) );
 
-	shader.type = shaderType_t::SHADER_3D_DYNAMIC;
+	shader.type = shaderType_t::SHADER_3D;
 	shader.noFog = true;
 	shader.fogShader = nullptr;
 	stages[ 0 ].type = stageType_t::ST_DIFFUSEMAP;
@@ -6833,7 +6811,7 @@ static void CreateInternalShaders()
 
 	Q_strncpyz( shader.name, "<fogEqual>", sizeof( shader.name ) );
 
-	shader.type = shaderType_t::SHADER_3D_DYNAMIC;
+	shader.type = shaderType_t::SHADER_3D;
 	shader.sort = Util::ordinal( shaderSort_t::SS_FOG );
 	stages[0].type = stageType_t::ST_FOGMAP;
 	for ( int i = 0; i < 5; i++ ) {
@@ -6845,7 +6823,7 @@ static void CreateInternalShaders()
 
 	Q_strncpyz( shader.name, "<fogLE>", sizeof( shader.name ) );
 
-	shader.type = shaderType_t::SHADER_3D_DYNAMIC;
+	shader.type = shaderType_t::SHADER_3D;
 	shader.sort = Util::ordinal( shaderSort_t::SS_FOG );
 	stages[0].type = stageType_t::ST_FOGMAP;
 	for ( int i = 0; i < 5; i++ ) {

src/engine/renderer/tr_skin.cpp

@@ -261,7 +261,7 @@ qhandle_t RE_RegisterSkin( const char *name )
 		Q_strncpyz( surf->name, surfName, sizeof( surf->name ) );
 
 		// RB: bspSurface_t does not have ::hash yet
-		surf->shader = R_FindShader( token, shaderType_t::SHADER_3D_DYNAMIC, RSF_DEFAULT );
+		surf->shader = R_FindShader( token, shaderType_t::SHADER_3D, RSF_DEFAULT );
 		skin->numSurfaces++;
 	}