zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-23 11:51:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed some unused code from GLES2

Browse source
This commit is contained in:
Emile Belanger 2021-04-27 19:59:10 +01:00
parent b57085c49e
commit 53e9be1e10
4 changed files with 6 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/common/rendering/gles/gles_shaderprogram.cpp
View file

@ -288,51 +288,7 @@ void FPresentShader::Bind()
mShader->Bind(); mShader->Bind();
} }
/////////////////////////////////////////////////////////////////////////////
void FPresent3DCheckerShader::Bind()
{
if (!mShader)
{
Init("shaders/pp/present_checker3d.fp", "shaders_gles/pp/presentChecker3d");
}
mShader->Bind();
}
void FPresent3DColumnShader::Bind()
{
if (!mShader)
{
Init("shaders/pp/present_column3d.fp", "shaders_gles/pp/presentColumn3d");
}
mShader->Bind();
}
void FPresent3DRowShader::Bind()
{
if (!mShader)
{
Init("shaders/pp/present_row3d.fp", "shaders_gles/pp/presentRow3d");
}
mShader->Bind();
}
/////////////////////////////////////////////////////////////////////////////
void FShadowMapShader::Bind()
{
if (!mShader)
{
FString prolog = Uniforms.CreateDeclaration("Uniforms", ShadowMapUniforms::Desc());
mShader.reset(new FShaderProgram());
mShader->Compile(FShaderProgram::Vertex, "shaders_gles/pp/screenquad.vp", "", 430);
mShader->Compile(FShaderProgram::Fragment, "shaders_gles/pp/shadowmap.fp", prolog, 430);
mShader->Link("shaders/glsl/shadowmap");
mShader->SetUniformBufferLocation(Uniforms.BindingPoint(), "Uniforms");
Uniforms.Init();
}
mShader->Bind();
}
} }

28
src/common/rendering/gles/gles_shaderprogram.h
View file

@ -71,33 +71,5 @@ public:
}; };
class FPresent3DCheckerShader : public FPresentShaderBase
{
public:
void Bind() override;
};
class FPresent3DColumnShader : public FPresentShaderBase
{
public:
void Bind() override;
};
class FPresent3DRowShader : public FPresentShaderBase
{
public:
void Bind() override;
};
class FShadowMapShader
{
public:
void Bind();
ShaderUniforms<ShadowMapUniforms, POSTPROCESS_BINDINGPOINT> Uniforms;
private:
std::unique_ptr<FShaderProgram> mShader;
};
} }

2
src/common/rendering/hwrenderer/data/shaderuniforms.h
View file

@ -164,8 +164,6 @@ private:
ShaderUniforms &operator=(const ShaderUniforms &) = delete; ShaderUniforms &operator=(const ShaderUniforms &) = delete;
IDataBuffer *mBuffer = nullptr; IDataBuffer *mBuffer = nullptr;
}; };

10
wadsrc/static/shaders_gles/Uniform usage notes.txt
View file

@ -46,17 +46,16 @@ uTextureMode
uPalLightLevels uPalLightLevels
0xFF = 0xFF =
31 0r 0 or 1 32 0r 0 or 1
0xF0 = 0xFF00 =
gl_fogmode : gl_fogmode :
(USES 2) (USES 2)
0, "$OPTVAL_OFF" 0, "$OPTVAL_OFF"
1, "$OPTVAL_STANDARD" 1, "$OPTVAL_STANDARD"
2, "$OPTVAL_RADIAL" 2, "$OPTVAL_RADIAL"
0xFF0000
0xF00 =
gl_lightmode: gl_lightmode:
(USES 16, 5) (USES 16, 5)
0, "$OPTVAL_STANDARD" 0, "$OPTVAL_STANDARD"
@ -69,6 +68,9 @@ gl_lightmode:
16, "$OPTVAL_VANILLA" 16, "$OPTVAL_VANILLA"
uTextureAddColor.a -> blendflags uTextureAddColor.a -> blendflags
0x7 = 0x7 =
(USES all) (USES all)