zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-28 18:00:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed the unused SurfaceShader class.

Browse source
This commit is contained in:
Christoph Oelckers 2020-05-31 11:47:19 +02:00
parent 9ec66bafa1
commit d752e33909
4 changed files with 0 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
source/glbackend/gl_shader.cpp
View file

@ -181,24 +181,3 @@ bool PolymostShader::Load(const char * name, const char * vert_prog, const char
return true; return true;
} }
//==========================================================================
//
//
//
//==========================================================================
bool SurfaceShader::Load(const char* name, const char* vert_prog, const char* frag_prog)
{
if (!FShader::Load(name, vert_prog, frag_prog)) return false;
glUseProgram(hShader);
int SamplerLoc;
SamplerLoc = glGetUniformLocation(hShader, "s_texture");
glUniform1i(SamplerLoc, 0);
SamplerLoc = glGetUniformLocation(hShader, "s_palette");
glUniform1i(SamplerLoc, 1);
glUseProgram(0);
return true;
}

7
source/glbackend/gl_shader.h
View file

@ -63,10 +63,3 @@ public:
virtual bool Load(const char * name, const char * vert_prog_lump, const char * fragprog); //, const char * fragprog2, const char *defines); virtual bool Load(const char * name, const char * vert_prog_lump, const char * fragprog); //, const char * fragprog2, const char *defines);
}; };
class SurfaceShader : public FShader
{
public:
SurfaceShader() = default;
virtual bool Load(const char* name, const char* vert_prog_lump, const char* fragprog); //, const char * fragprog2, const char *defines);
};

11
source/glbackend/glbackend.cpp
View file

@ -145,8 +145,6 @@ void GLInstance::Deinit()
#endif #endif
if (polymostShader) delete polymostShader; if (polymostShader) delete polymostShader;
polymostShader = nullptr; polymostShader = nullptr;
if (surfaceShader) delete surfaceShader;
surfaceShader = nullptr;
activeShader = nullptr; activeShader = nullptr;
palmanager.DeleteAll(); palmanager.DeleteAll();
lastPalswapIndex = -1; lastPalswapIndex = -1;
@ -255,15 +253,6 @@ void GLInstance::SetPolymostShader()
} }
} }
void GLInstance::SetSurfaceShader()
{
if (activeShader != surfaceShader)
{
surfaceShader->Bind();
activeShader = surfaceShader;
}
}
void GLInstance::SetPalette(int index) void GLInstance::SetPalette(int index)
{ {
palmanager.BindPalette(index); palmanager.BindPalette(index);

3
source/glbackend/glbackend.h
View file

@ -14,7 +14,6 @@
class FShader; class FShader;
class PolymostShader; class PolymostShader;
class SurfaceShader;
class FGameTexture; class FGameTexture;
class GLInstance; class GLInstance;
class F2DDrawer; class F2DDrawer;
@ -122,7 +121,6 @@ class GLInstance
PolymostRenderState renderState; PolymostRenderState renderState;
FShader* activeShader; FShader* activeShader;
PolymostShader* polymostShader; PolymostShader* polymostShader;
SurfaceShader* surfaceShader;
public: public:
@ -172,7 +170,6 @@ public:
} }
void SetPolymostShader(); void SetPolymostShader();
void SetSurfaceShader();
void SetPalette(int palette); void SetPalette(int palette);
void ReadPixels(int w, int h, uint8_t* buffer); void ReadPixels(int w, int h, uint8_t* buffer);