diff options
| -rw-r--r-- | src/renderergl1/tr_local.h | 20 | ||||
| -rw-r--r-- | src/renderergl2/tr_local.h | 20 |
2 files changed, 0 insertions, 40 deletions
diff --git a/src/renderergl1/tr_local.h b/src/renderergl1/tr_local.h index bfabca71..fcce54fc 100644 --- a/src/renderergl1/tr_local.h +++ b/src/renderergl1/tr_local.h @@ -42,10 +42,6 @@ typedef unsigned int glIndex_t; #define SHADERNUM_BITS 14 #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 { @@ -371,27 +367,11 @@ typedef struct shader_s { float clampTime; // time this shader is clamped to 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 - int shaderStates[MAX_STATES_PER_SHADER]; // index to valid shader states - struct shader_s *next; } 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, // as well as the locally generated scene information diff --git a/src/renderergl2/tr_local.h b/src/renderergl2/tr_local.h index bbeda0b4..26ac0339 100644 --- a/src/renderergl2/tr_local.h +++ b/src/renderergl2/tr_local.h @@ -48,10 +48,6 @@ typedef unsigned int glIndex_t; #define SHADERNUM_BITS 14 #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_VISCOUNTS 5 #define MAX_VBOS 4096 @@ -487,16 +483,8 @@ typedef struct shader_s { float clampTime; // time this shader is clamped to 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 - int shaderStates[MAX_STATES_PER_SHADER]; // index to valid shader states - struct shader_s *next; } shader_t; @@ -523,14 +511,6 @@ static ID_INLINE qboolean ShaderRequiresCPUDeforms(const shader_t * shader) 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 { ATTR_INDEX_POSITION = 0, |