MoNTE48
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge revisions r5428:r5432 from trunk to ogl-es. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5433 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2017-04-18 12:35:58 +00:00
parent 3ac8d2649a
commit 14aef903e5
6 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/IVideoDriver.h
View File

@ -250,8 +250,8 @@ namespace video
virtual bool beginScene(u16 clearFlag=(u16)(ECBF_COLOR|ECBF_DEPTH), SColor clearColor = SColor(255,0,0,0), f32 clearDepth = 1.f, u8 clearStencil = 0,
const SExposedVideoData& videoData=SExposedVideoData(), core::rect<s32>* sourceRect = 0) = 0;
//! Old beginScene implementation for downward compatibility. Can't clearn stencil buffer, but otherwise identical to other beginScene
_IRR_DEPRECATED_ bool beginScene(bool backBuffer, bool zBuffer, SColor color = SColor(255,0,0,0),
//! Alternative beginScene implementation. Can't clear stencil buffer, but otherwise identical to other beginScene
bool beginScene(bool backBuffer, bool zBuffer, SColor color = SColor(255,0,0,0),
const SExposedVideoData& videoData = SExposedVideoData(), core::rect<s32>* sourceRect = 0)
{
u16 flag = 0;
@ -621,9 +621,9 @@ namespace video
f32 clearDepth = 1.f, u8 clearStencil = 0) = 0;
//! Sets a new render target.
// Prefer to use the setRenderTarget function taking flags as parameter as this one can't clear the stencil buffer.
// It's still offered for backward compatibility.
_IRR_DEPRECATED_ bool setRenderTarget(ITexture* texture, bool clearBackBuffer, bool clearZBuffer, SColor color = SColor(255,0,0,0))
//! Prefer to use the setRenderTarget function taking flags as parameter as this one can't clear the stencil buffer.
//! It's still offered for backward compatibility.
bool setRenderTarget(ITexture* texture, bool clearBackBuffer, bool clearZBuffer, SColor color = SColor(255,0,0,0))
{
u16 flag = 0;

2
source/Irrlicht/CColladaFileLoader.cpp
View File

@ -1940,7 +1940,6 @@ void CColladaFileLoader::readPolygonSection(io::IXMLReaderUTF8* reader,
bool parsePolygonOK = false;
bool parseVcountOK = false;
u32 inputSemanticCount = 0;
bool unresolvedInput=false;
u32 maxOffset = 0;
core::array<SColladaInput> localInputs;
@ -2095,7 +2094,6 @@ void CColladaFileLoader::readPolygonSection(io::IXMLReaderUTF8* reader,
os::Printer::log("COLLADA Warning, polygon input source not found",
inp.Source.c_str(), ELL_DEBUG);
inp.Semantic=ECIS_COUNT; // for unknown
unresolvedInput=true;
}
else
{

4
source/Irrlicht/CGUIMeshViewer.cpp
View File

@ -153,8 +153,8 @@ void CGUIMeshViewer::draw()
scene::IMeshBuffer* mb = m->getMeshBuffer(i);
driver->drawVertexPrimitiveList(mb->getVertices(),
mb->getVertexCount(), mb->getIndices(),
mb->getIndexCount()/ 3, mb->getVertexType(),
scene::EPT_TRIANGLES, mb->getIndexType());
mb->getPrimitiveCount(), mb->getVertexType(),
mb->getPrimitiveType(), mb->getIndexType());
}
driver->setViewPort(oldViewPort);

2
source/Irrlicht/CImageLoaderDDS.cpp
View File

@ -732,7 +732,7 @@ IImage* CImageLoaderDDS::loadImage(io::IReadFile* file) const
#else
if (header.PixelFormat.Flags & DDPF_RGB) // Uncompressed formats
{
u32 byteCount = header.PixelFormat.RGBBitCount / 8;
// u32 byteCount = header.PixelFormat.RGBBitCount / 8;
if( header.Flags & DDSD_PITCH )
dataSize = header.PitchOrLinearSize * header.Height * header.Depth * (header.PixelFormat.RGBBitCount / 8);

7
source/Irrlicht/CImageLoaderWAL.cpp
View File

@ -196,8 +196,6 @@ IImage* CImageLoaderWAL2::loadImage(irr::io::IReadFile* file) const
}
u32 rawtexsize = header.width * header.height;
u8 *rawtex = new u8 [ rawtexsize ];
file->seek ( header.mipmap[0] );
@ -213,8 +211,9 @@ IImage* CImageLoaderWAL2::loadImage(irr::io::IReadFile* file) const
case ECF_A8R8G8B8:
CColorConverter::convert8BitTo32Bit(rawtex, (u8*)image->getData(), header.width, header.height, (u8*) pal + 768, 0, false);
break;
default:
break;
default:
// Assuming there are no other color formats (I found no information about this format)
break;
}
delete [] rawtex;

3
source/Irrlicht/CZipReader.cpp
View File

@ -718,7 +718,8 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
File->read(pcData, decryptedSize);
}
bz_stream bz_ctx={0};
bz_stream bz_ctx;
memset(&bz_ctx, 0, sizeof(bz_ctx));
/* use BZIP2's default memory allocation
bz_ctx->bzalloc = NULL;
bz_ctx->bzfree = NULL;