luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Merging r6468 through r6476 from trunk to ogl-es branch

Browse Source 
Note: Not yet using latest changes to IMaterialRendererServices in ES2 driver


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6477 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2023-04-27 19:51:22 +00:00
parent dd16d578d8
commit 23ebdbe978
22 changed files with 195 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/Irrlicht/COpenGLDriver.cpp
View File

@@ -3730,7 +3730,9 @@ s32 COpenGLDriver::addShaderMaterial(const c8* vertexShaderProgram,
r->drop();
if (callback && nr >= 0)
{
callback->OnCreate(this, userData);
}
return nr;
}
@@ -3767,7 +3769,11 @@ s32 COpenGLDriver::addHighLevelShaderMaterial(
r->drop();
if (callback && nr >= 0)
{
r->startUseProgram();
callback->OnCreate(r, userData);
r->stopUseProgram();
}
return nr;
}