minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2024-11-16 23:40:25 +01:00
Code Issues Projects Releases Wiki Activity

Fix: r6469 broke fixed function materials when shader materials where created but not used

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6489 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien 2023-05-08 14:15:49 +00:00
parent 9ce63bc7d3
commit 2a04d747d1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/Irrlicht/COpenGLSLMaterialRenderer.cpp
View File

@ -573,10 +573,14 @@ void COpenGLSLMaterialRenderer::startUseProgram()
void COpenGLSLMaterialRenderer::stopUseProgram() void COpenGLSLMaterialRenderer::stopUseProgram()
{ {
// Not going to reset irrGlUseProgram/extGlUseProgramObject as it shouldn't really matter // Necessary as fixed function pipeline breaks if programs are not reset to 0
if (Program)
Driver->extGlUseProgramObject(0);
if (Program2)
Driver->irrGlUseProgram(0);
// Force reset of material to ensure OnSetMaterial will be called or we can miss // Force reset of material to ensure OnSetMaterial will be called or we can miss
// the next UseProgram call // the next UseProgram call as stopUseProgram can be called from anywhere
Driver->DoResetRenderStates(); Driver->DoResetRenderStates();
} }

2
tests/tests-last-passed-at.txt
View File

@ -1,4 +1,4 @@
Tests finished. 72 tests of 72 passed. Tests finished. 72 tests of 72 passed.
Compiled as DEBUG Compiled as DEBUG
Test suite pass at GMT Sun May 07 14:26:39 2023 Test suite pass at GMT Mon May 08 14:14:47 2023