immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix resetting bound textures

dev
Tomasz Kapuściński 2021-12-14 21:50:26 +01:00
parent 2583f6fe36
commit 11bfcc6d53
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/graphics/opengl/gl33objectrenderer.cpp
View File

@ -141,10 +141,10 @@ void CGL33ObjectRenderer::CGL33ObjectRenderer::Begin()
//glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); //glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
glActiveTexture(GL_TEXTURE10); glActiveTexture(GL_TEXTURE10);
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, m_whiteTexture);
glActiveTexture(GL_TEXTURE11); glActiveTexture(GL_TEXTURE11);
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, m_whiteTexture);
glActiveTexture(GL_TEXTURE12); glActiveTexture(GL_TEXTURE12);
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
@ -158,6 +158,19 @@ void CGL33ObjectRenderer::CGL33ObjectRenderer::Begin()
void CGL33ObjectRenderer::CGL33ObjectRenderer::End() void CGL33ObjectRenderer::CGL33ObjectRenderer::End()
{ {
glActiveTexture(GL_TEXTURE10);
glBindTexture(GL_TEXTURE_2D, 0);
glActiveTexture(GL_TEXTURE11);
glBindTexture(GL_TEXTURE_2D, 0);
glActiveTexture(GL_TEXTURE12);
glBindTexture(GL_TEXTURE_2D, 0);
m_primaryTexture = 0;
m_secondaryTexture = 0;
m_shadowMap = 0;
m_device->Restore(); m_device->Restore();
glDepthMask(GL_TRUE); glDepthMask(GL_TRUE);

4
src/graphics/opengl/gl33renderers.cpp
View File

@ -339,10 +339,10 @@ void CGL33TerrainRenderer::Begin()
glDisable(GL_BLEND); glDisable(GL_BLEND);
glActiveTexture(GL_TEXTURE10); glActiveTexture(GL_TEXTURE10);
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, m_whiteTexture);
glActiveTexture(GL_TEXTURE11); glActiveTexture(GL_TEXTURE11);
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, m_whiteTexture);
glActiveTexture(GL_TEXTURE12); glActiveTexture(GL_TEXTURE12);
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);