Skip to content

Commit 2a4c16e

Browse files
committed
NUKE some unused stuff
1 parent 4a1e331 commit 2a4c16e

2 files changed

Lines changed: 0 additions & 40 deletions

File tree

src/engine/renderer/tr_local.h

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ static inline void halfToFloat( const f16vec4_t in, vec4_t out )
165165
#define SMP_FRAMES 2
166166

167167
#define MAX_SHADERS ( 1 << 12 )
168-
#define SHADERS_MASK ( MAX_SHADERS - 1 )
169168

170169
#define MAX_SHADER_TABLES 1024
171170
#define MAX_SHADER_STAGES 16
@@ -353,7 +352,6 @@ enum class ssaoMode {
353352
};
354353

355354
#define REF_CUBEMAP_SIZE 32
356-
#define REF_CUBEMAP_STORE_SIZE 1024
357355

358356
#define REF_COLORGRADE_SLOTS 4
359357
#define REF_COLORGRADEMAP_SIZE 16
@@ -967,8 +965,6 @@ enum class ssaoMode {
967965
};
968966

969967
#define MAX_SHADER_DEFORMS 3
970-
#define MAX_SHADER_DEFORM_STEPS 4
971-
#define MAX_SHADER_DEFORM_PARMS ( MAX_SHADER_DEFORMS * MAX_SHADER_DEFORM_STEPS )
972968
struct deformStage_t
973969
{
974970
deform_t deformation; // vertex coordinate modification type
@@ -1469,23 +1465,12 @@ enum class ssaoMode {
14691465
shader_t *shader;
14701466
};
14711467

1472-
//----(SA) modified
1473-
#define MAX_PART_MODELS 5
1474-
1475-
struct skinModel_t
1476-
{
1477-
char type[ MAX_QPATH ]; // md3_lower, md3_lbelt, md3_rbelt, etc.
1478-
char model[ MAX_QPATH ]; // lower.md3, belt1.md3, etc.
1479-
int hash;
1480-
};
1481-
14821468
struct skin_t
14831469
{
14841470
char name[ MAX_QPATH ]; // game path, including extension
14851471
int numSurfaces;
14861472
int numModels;
14871473
skinSurface_t *surfaces[ MD3_MAX_SURFACES ];
1488-
skinModel_t *models[ MAX_PART_MODELS ];
14891474
};
14901475

14911476
//----(SA) end
@@ -3170,10 +3155,8 @@ inline bool checkGLErrors()
31703155
====================================================================
31713156
*/
31723157
void GL_Bind( image_t *image );
3173-
void GL_BindNearestCubeMap( int unit, const vec3_t xyz );
31743158
void GL_Unbind( image_t *image );
31753159
GLuint64 BindAnimatedImage( int unit, const textureBundle_t *bundle );
3176-
void GL_TextureFilter( image_t *image, filterType_t filterType );
31773160
void GL_BindProgram( ShaderProgramDescriptor* program );
31783161
GLuint64 GL_BindToTMU( int unit, image_t *image );
31793162
void GL_BindNullProgram();
@@ -3238,9 +3221,6 @@ inline bool checkGLErrors()
32383221

32393222
bool R_GetModeInfo( int *width, int *height, int mode );
32403223

3241-
// https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=516
3242-
const void *RB_TakeScreenshotCmd( const void *data );
3243-
32443224
void R_InitSkins();
32453225
skin_t *R_GetSkinByHandle( qhandle_t hSkin );
32463226

@@ -3670,7 +3650,6 @@ void GLimp_LogComment_( std::string comment );
36703650
void RE_ClearScene();
36713651
void RE_AddRefEntityToScene( const refEntity_t *ent );
36723652

3673-
void RE_AddPolyToSceneQ3A( qhandle_t hShader, int numVerts, const polyVert_t *verts, int num );
36743653
void RE_AddPolyToSceneET( qhandle_t hShader, int numVerts, const polyVert_t *verts );
36753654
void RE_AddPolysToScene( qhandle_t hShader, int numVerts, const polyVert_t *verts, int numPolys );
36763655

@@ -4003,7 +3982,6 @@ void GLimp_LogComment_( std::string comment );
40033982

40043983

40053984
// video stuff
4006-
const void *RB_TakeVideoFrameCmd( const void *data );
40073985
void RE_TakeVideoFrame( int width, int height, byte *captureBuffer, byte *encodeBuffer, bool motionJpeg );
40083986

40093987
// cubemap reflections stuff

src/engine/renderer/tr_skin.cpp

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ qhandle_t RE_RegisterSkin( const char *name )
165165
qhandle_t hSkin;
166166
skin_t *skin;
167167
skinSurface_t *surf;
168-
skinModel_t *model; //----(SA) added
169168
const char *text_p;
170169
const char *token;
171170
char surfName[ MAX_QPATH ];
@@ -226,7 +225,6 @@ qhandle_t RE_RegisterSkin( const char *name )
226225
tr.skins[ hSkin ] = skin;
227226
Q_strncpyz( skin->name, name, sizeof( skin->name ) );
228227
skin->numSurfaces = 0;
229-
skin->numModels = 0; //----(SA) added
230228

231229
//----(SA) end
232230

@@ -256,22 +254,6 @@ qhandle_t RE_RegisterSkin( const char *name )
256254
continue;
257255
}
258256

259-
if ( !Q_strnicmp( token, "md3_", 4 ) )
260-
{
261-
// this is specifying a model
262-
model = skin->models[ skin->numModels ] = (skinModel_t*) ri.Hunk_Alloc( sizeof( *skin->models[ 0 ] ), ha_pref::h_low );
263-
Q_strncpyz( model->type, token, sizeof( model->type ) );
264-
model->hash = Com_HashKey( model->type, sizeof( model->type ) );
265-
266-
// get the model name
267-
token = CommaParse( &text_p );
268-
269-
Q_strncpyz( model->model, token, sizeof( model->model ) );
270-
271-
skin->numModels++;
272-
continue;
273-
}
274-
275257
// parse the shader name
276258
token = CommaParse( &text_p );
277259

0 commit comments

Comments
 (0)