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

chore: Use setActiveTextureUnit in render pipelines

Browse source
This commit is contained in:
Vsevolod Kremianskii 2021-01-07 09:27:44 +07:00
parent a5610b5a72
commit 9595fca7cb
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/scene/pipeline/control.cpp
View file

@ -82,7 +82,7 @@ void ControlRenderPipeline::render(const glm::ivec2 &offset) const {
Shaders::instance().activate(ShaderProgram::GUIGUI, locals);
glActiveTexture(GL_TEXTURE0);
setActiveTextureUnit(0);
_geometry.bindColorBuffer(0);
Quad::getDefault().renderTriangles();

14
src/scene/pipeline/world.cpp
View file

@ -118,7 +118,7 @@ void WorldRenderPipeline::drawGeometry() const {
int lightCount = static_cast<int>(_scene->shadowLights().size());
for (int i = 0; i < lightCount; ++i) {
glActiveTexture(GL_TEXTURE0 + TextureUniforms::shadowmap0 + i);
setActiveTextureUnit(TextureUniforms::shadowmap0 + i);
_shadows[i]->bindDepthBuffer();
}
withDepthTest([this]() { _scene->render(); });
@ -145,7 +145,7 @@ void WorldRenderPipeline::applyHorizontalBlur() const {
Shaders::instance().activate(ShaderProgram::GUIBlur, locals);
glActiveTexture(GL_TEXTURE0);
setActiveTextureUnit(0);
_geometry.bindColorBuffer(1);
withDepthTest([]() {
@ -175,7 +175,7 @@ void WorldRenderPipeline::applyVerticalBlur() const {
Shaders::instance().activate(ShaderProgram::GUIBlur, locals);
glActiveTexture(GL_TEXTURE0);
setActiveTextureUnit(0);
_horizontalBlur.bindColorBuffer(0);
withDepthTest([]() {
@ -199,19 +199,19 @@ void WorldRenderPipeline::drawResult() const {
Shaders::instance().activate(ShaderProgram::GUIBloom, locals);
glActiveTexture(GL_TEXTURE0);
setActiveTextureUnit(0);
_geometry.bindColorBuffer(0);
//_shadows[0]->bindDepthBuffer();
glActiveTexture(GL_TEXTURE0 + TextureUniforms::bloom);
setActiveTextureUnit(TextureUniforms::bloom);
_verticalBlur.bindColorBuffer(0);
Quad::getDefault().renderTriangles();
glActiveTexture(GL_TEXTURE0 + TextureUniforms::bloom);
setActiveTextureUnit(TextureUniforms::bloom);
_verticalBlur.unbindColorBuffer();
glActiveTexture(GL_TEXTURE0);
setActiveTextureUnit(0);
_geometry.unbindColorBuffer();
}