wbrawner/reone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

perf: Set sampler uniforms once at program initialization

Browse source
This commit is contained in:
Vsevolod Kremianskii 2020-11-14 07:40:02 +07:00
parent 49ca2e139e
commit 969b9fa8c0
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/render/pipeline/world.cpp
View file

@ -141,12 +141,12 @@ void WorldRenderPipeline::render() const {
glActiveTexture(GL_TEXTURE0);
_geometry.bindColorBuffer(0);
glActiveTexture(GL_TEXTURE0 + locals.textures.bloom);
glActiveTexture(GL_TEXTURE0 + TextureUniforms::bloom);
_verticalBlur.bindColorBuffer(0);
Quad::getDefault().renderTriangles();
glActiveTexture(GL_TEXTURE + locals.textures.bloom);
glActiveTexture(GL_TEXTURE + TextureUniforms::bloom);
_verticalBlur.unbindColorBuffer();
glActiveTexture(GL_TEXTURE0);

19
src/render/shaders.cpp
View file

@ -330,6 +330,20 @@ void Shaders::initGL() {
initProgram(ShaderProgram::GUIWhite, ShaderName::VertexGUI, ShaderName::FragmentWhite);
initProgram(ShaderProgram::ModelWhite, ShaderName::VertexModel, ShaderName::FragmentWhite);
initProgram(ShaderProgram::ModelModel, ShaderName::VertexModel, ShaderName::FragmentModel);
for (auto &program : _programs) {
glUseProgram(program.second);
_activeOrdinal = program.second;
setUniform("uEnvmap", TextureUniforms::envmap);
setUniform("uLightmap", TextureUniforms::lightmap);
setUniform("uBumpyShiny", TextureUniforms::bumpyShiny);
setUniform("uBumpmap", TextureUniforms::bumpmap);
setUniform("uBloom", TextureUniforms::bloom);
_activeOrdinal = 0;
glUseProgram(0);
}
}
void Shaders::initShader(ShaderName name, unsigned int type, const char *source) {
@ -434,11 +448,6 @@ void Shaders::setLocalUniforms(const LocalUniforms &locals) {
setUniform("uLightingEnabled", locals.features.lightingEnabled);
setUniform("uSelfIllumEnabled", locals.features.selfIllumEnabled);
setUniform("uDiscardEnabled", locals.features.discardEnabled);
setUniform("uLightmap", locals.textures.lightmap);
setUniform("uEnvmap", locals.textures.envmap);
setUniform("uBumpyShiny", locals.textures.bumpyShiny);
setUniform("uBumpmap", locals.textures.bumpmap);
setUniform("uBloom", locals.textures.bloom);
if (locals.features.skeletalEnabled) {
setUniform("uAbsTransform", locals.skeletal.absTransform);

1
src/render/shaders.h
View file

@ -90,7 +90,6 @@ struct GaussianBlurUniforms {
struct LocalUniforms {
FeatureUniforms features;
TextureUniforms textures;
SkeletalUniforms skeletal;
LightingUniforms lighting;
GaussianBlurUniforms blur;