okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unused shader state code from tr_local.h

Browse source
This commit is contained in:
Zack Middleton 2013-11-02 02:35:59 -05:00
parent 0f30dad10a
commit 6bd52de44e
2 changed files with 0 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

20
code/renderergl1/tr_local.h
View file

@ -41,10 +41,6 @@ typedef unsigned int glIndex_t;
#define SHADERNUM_BITS 14 #define SHADERNUM_BITS 14
#define MAX_SHADERS (1<<SHADERNUM_BITS) #define MAX_SHADERS (1<<SHADERNUM_BITS)
//#define MAX_SHADER_STATES 2048
#define MAX_STATES_PER_SHADER 32
#define MAX_STATE_NAME 32
typedef struct dlight_s { typedef struct dlight_s {
@ -370,27 +366,11 @@ typedef struct shader_s {
float clampTime; // time this shader is clamped to float clampTime; // time this shader is clamped to
float timeOffset; // current time offset for this shader float timeOffset; // current time offset for this shader
int numStates; // if non-zero this is a state shader
struct shader_s *currentShader; // current state if this is a state shader
struct shader_s *parentShader; // current state if this is a state shader
int currentState; // current state index for cycle purposes
long expireTime; // time in milliseconds this expires
struct shader_s *remappedShader; // current shader this one is remapped too struct shader_s *remappedShader; // current shader this one is remapped too
int shaderStates[MAX_STATES_PER_SHADER]; // index to valid shader states
struct shader_s *next; struct shader_s *next;
} shader_t; } shader_t;
typedef struct shaderState_s {
char shaderName[MAX_QPATH]; // name of shader this state belongs to
char name[MAX_STATE_NAME]; // name of this state
char stateShader[MAX_QPATH]; // shader this name invokes
int cycleTime; // time this cycle lasts, <= 0 is forever
shader_t *shader;
} shaderState_t;
// trRefdef_t holds everything that comes in refdef_t, // trRefdef_t holds everything that comes in refdef_t,
// as well as the locally generated scene information // as well as the locally generated scene information

20
code/renderergl2/tr_local.h
View file

@ -47,10 +47,6 @@ typedef unsigned int glIndex_t;
#define SHADERNUM_BITS 14 #define SHADERNUM_BITS 14
#define MAX_SHADERS (1<<SHADERNUM_BITS) #define MAX_SHADERS (1<<SHADERNUM_BITS)
//#define MAX_SHADER_STATES 2048
#define MAX_STATES_PER_SHADER 32
#define MAX_STATE_NAME 32
#define MAX_FBOS 64 #define MAX_FBOS 64
#define MAX_VISCOUNTS 5 #define MAX_VISCOUNTS 5
#define MAX_VBOS 4096 #define MAX_VBOS 4096
@ -486,16 +482,8 @@ typedef struct shader_s {
float clampTime; // time this shader is clamped to float clampTime; // time this shader is clamped to
float timeOffset; // current time offset for this shader float timeOffset; // current time offset for this shader
int numStates; // if non-zero this is a state shader
struct shader_s *currentShader; // current state if this is a state shader
struct shader_s *parentShader; // current state if this is a state shader
int currentState; // current state index for cycle purposes
long expireTime; // time in milliseconds this expires
struct shader_s *remappedShader; // current shader this one is remapped too struct shader_s *remappedShader; // current shader this one is remapped too
int shaderStates[MAX_STATES_PER_SHADER]; // index to valid shader states
struct shader_s *next; struct shader_s *next;
} shader_t; } shader_t;
@ -522,14 +510,6 @@ static ID_INLINE qboolean ShaderRequiresCPUDeforms(const shader_t * shader)
return qfalse; return qfalse;
} }
typedef struct shaderState_s {
char shaderName[MAX_QPATH]; // name of shader this state belongs to
char name[MAX_STATE_NAME]; // name of this state
char stateShader[MAX_QPATH]; // shader this name invokes
int cycleTime; // time this cycle lasts, <= 0 is forever
shader_t *shader;
} shaderState_t;
enum enum
{ {
ATTR_INDEX_POSITION = 0, ATTR_INDEX_POSITION = 0,