Merging r6426 through r6466 from trunk to ogl-es branch
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:
@@ -4654,6 +4654,9 @@ s32 CBurningVideoDriver::addShaderMaterial(const c8* vertexShaderProgram,
|
||||
|
||||
shader->drop();
|
||||
|
||||
if (callback && materialID >= 0)
|
||||
callback->OnCreate(shader, userData);
|
||||
|
||||
return materialID;
|
||||
}
|
||||
|
||||
@@ -4691,6 +4694,9 @@ s32 CBurningVideoDriver::addHighLevelShaderMaterial(
|
||||
|
||||
shader->drop();
|
||||
|
||||
if (callback && materialID >= 0)
|
||||
callback->OnCreate(shader, userData);
|
||||
|
||||
return materialID;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user