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

Merging r6186 through r6192 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6193 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-02-21 16:37:56 +00:00
parent 1f7c1830cb
commit 3a54e8d6b8
10 changed files with 71 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/Irrlicht/IBurningShader.cpp
View File

@@ -29,11 +29,13 @@ void IBurningShader::constructor_IBurningShader(CBurningVideoDriver* driver)
setDebugName("IBurningShader");
#endif
#if defined(ENV64BIT)
if (((unsigned long long)&scan & 15) || ((unsigned long long)&line & 15))
{
os::Printer::log("BurningVideo Shader not 16 byte aligned", ELL_ERROR);
_IRR_DEBUG_BREAK_IF(1);
}
#endif
Interlaced.enable = 0;
Interlaced.bypass = 1;
@@ -96,6 +98,7 @@ IBurningShader::IBurningShader(
{
constructor_IBurningShader(driver);
BaseMaterial = baseMaterial;
UserData = userData;
CallBack = callback;
if (CallBack)
CallBack->grab();