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

Merging r6383 through r6403 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6404 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2022-05-15 16:02:08 +00:00
parent ec38b153da
commit ddc14ea87e
57 changed files with 337 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/Irrlicht/COpenGLCoreTexture.h
View File

@@ -411,7 +411,7 @@ public:
u32 width = Size.Width;
u32 height = Size.Height;
u8* tmpData = static_cast<u8*>(data);
u32 dataSize = 0;
size_t dataSize = 0;
u32 level = 0;
do
@@ -612,7 +612,7 @@ protected:
}
else
{
u32 dataSize = IImage::getDataSizeFromFormat(ColorFormat, width, height);
GLsizei dataSize = (GLsizei)IImage::getDataSizeFromFormat(ColorFormat, width, height);
switch (TextureType)
{
@@ -651,7 +651,7 @@ protected:
GLint InternalFormat;
GLenum PixelFormat;
GLenum PixelType;
void (*Converter)(const void*, s32, void*);
void (*Converter)(const void*, u32, void*);
bool LockReadOnly;
IImage* LockImage;