zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-30 07:41:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

- remove dead code

Browse source
This commit is contained in:
Magnus Norddahl 2019-02-21 21:23:44 +01:00
parent 478ef05a0a
commit c606346ae3
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/rendering/gl/shaders/gl_shader.cpp
View file

@ -539,7 +539,6 @@ bool FShader::Load(const char * name, const char * vert_prog_lump, const char *
muTimer.Init(hShader, "timer");
lights_index = glGetUniformLocation(hShader, "lights");
fakevb_index = glGetUniformLocation(hShader, "fakeVB");
modelmatrix_index = glGetUniformLocation(hShader, "ModelMatrix");
texturematrix_index = glGetUniformLocation(hShader, "TextureMatrix");
normalmodelmatrix_index = glGetUniformLocation(hShader, "NormalModelMatrix");

15
src/rendering/gl/shaders/gl_shader.h
View file

@ -264,10 +264,6 @@ class FShader
int normalmodelmatrix_index;
int texturematrix_index;
public:
int fakevb_index;
private:
int currentglowstate = 0;
int currentgradientstate = 0;
int currentsplitstate = 0;
@ -287,10 +283,6 @@ public:
bool Load(const char * name, const char * vert_prog_lump, const char * fragprog, const char * fragprog2, const char * light_fragprog, const char *defines);
void SetColormapColor(float r, float g, float b, float r1, float g1, float b1);
void SetGlowParams(float *topcolors, float topheight, float *bottomcolors, float bottomheight);
void SetLightRange(int start, int end, int forceadd);
bool Bind();
unsigned int GetHandle() const { return hShader; }
};
@ -306,15 +298,16 @@ public:
FShaderManager();
~FShaderManager();
void SetActiveShader(FShader *sh);
FShader *GetActiveShader() const { return mActiveShader; }
FShader *BindEffect(int effect, EPassType passType);
FShader *Get(unsigned int eff, bool alphateston, EPassType passType);
private:
void SetActiveShader(FShader *sh);
FShader *mActiveShader = nullptr;
TArray<FShaderCollection*> mPassShaders;
friend class FShader;
};
class FShaderCollection