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

Merging r6426 through r6466 from trunk to ogl-es branch

Browse Source 
Note: Updated IShaderConstantSetCallBack not yet supported by ogl-es drivers


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6467 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2023-04-22 21:50:32 +00:00
parent e184e4aedb
commit 621bad3111
118 changed files with 12767 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/Irrlicht/COpenGLDriver.cpp
View File

@@ -805,10 +805,10 @@ IRenderTarget* COpenGLDriver::addRenderTarget()
}
// small helper function to create vertex buffer object adress offsets
static inline u8* buffer_offset(const long offset)
// small helper function to create vertex buffer object address offsets
static inline const GLvoid * buffer_offset(const size_t offset)
{
return ((u8*)0 + offset);
return (const GLvoid *)offset;
}
@@ -3728,6 +3728,10 @@ s32 COpenGLDriver::addShaderMaterial(const c8* vertexShaderProgram,
callback, baseMaterial, userData);
r->drop();
if (callback && nr >= 0)
callback->OnCreate(this, userData);
return nr;
}
@@ -3762,6 +3766,9 @@ s32 COpenGLDriver::addHighLevelShaderMaterial(
r->drop();
if (callback && nr >= 0)
callback->OnCreate(r, userData);
return nr;
}