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

Merging r6250 through r6254 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 19:14:39 +00:00
parent 21302d038a
commit ee3579015b
275 changed files with 4166 additions and 3846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/Irrlicht/COpenGLCoreTexture.h
View File

@@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_OGLCORE_TEXTURE_H_INCLUDED__
#define __C_OGLCORE_TEXTURE_H_INCLUDED__
#ifndef IRR_C_OGLCORE_TEXTURE_H_INCLUDED
#define IRR_C_OGLCORE_TEXTURE_H_INCLUDED
#include "IrrCompileConfig.h"
@@ -54,7 +54,7 @@ public:
TextureName(0), InternalFormat(GL_RGBA), PixelFormat(GL_RGBA), PixelType(GL_UNSIGNED_BYTE), Converter(0), LockReadOnly(false), LockImage(0), LockLayer(0),
KeepImage(false), MipLevelStored(0), LegacyAutoGenerateMipMaps(false)
{
_IRR_DEBUG_BREAK_IF(images.size() == 0)
IRR_DEBUG_BREAK_IF(images.size() == 0)
DriverType = Driver->getDriverType();
TextureType = TextureTypeIrrToGL(Type);
@@ -234,7 +234,7 @@ public:
Images[i]->drop();
}
virtual void* lock(E_TEXTURE_LOCK_MODE mode = ETLM_READ_WRITE, u32 mipmapLevel=0, u32 layer = 0, E_TEXTURE_LOCK_FLAGS lockFlags = ETLF_FLIP_Y_UP_RTT) _IRR_OVERRIDE_
virtual void* lock(E_TEXTURE_LOCK_MODE mode = ETLM_READ_WRITE, u32 mipmapLevel=0, u32 layer = 0, E_TEXTURE_LOCK_FLAGS lockFlags = ETLF_FLIP_Y_UP_RTT) IRR_OVERRIDE
{
if (LockImage)
return getLockImageData(MipLevelStored);
@@ -248,7 +248,7 @@ public:
if (KeepImage)
{
_IRR_DEBUG_BREAK_IF(LockLayer > Images.size())
IRR_DEBUG_BREAK_IF(LockLayer > Images.size())
if ( mipmapLevel == 0 || (Images[LockLayer] && Images[LockLayer]->getMipMapsData(mipmapLevel)) )
{
@@ -278,7 +278,7 @@ public:
if (tmpTextureType == GL_TEXTURE_CUBE_MAP)
{
_IRR_DEBUG_BREAK_IF(layer > 5)
IRR_DEBUG_BREAK_IF(layer > 5)
tmpTextureType = GL_TEXTURE_CUBE_MAP_POSITIVE_X + layer;
}
@@ -376,7 +376,7 @@ public:
return (LockImage) ? getLockImageData(MipLevelStored) : 0;
}
virtual void unlock() _IRR_OVERRIDE_
virtual void unlock() IRR_OVERRIDE
{
if (!LockImage)
return;
@@ -398,7 +398,7 @@ public:
LockLayer = 0;
}
virtual void regenerateMipMapLevels(void* data = 0, u32 layer = 0) _IRR_OVERRIDE_
virtual void regenerateMipMapLevels(void* data = 0, u32 layer = 0) IRR_OVERRIDE
{
if (!HasMipMaps || LegacyAutoGenerateMipMaps || (Size.Width <= 1 && Size.Height <= 1))
return;
@@ -574,7 +574,7 @@ protected:
if (tmpTextureType == GL_TEXTURE_CUBE_MAP)
{
_IRR_DEBUG_BREAK_IF(layer > 5)
IRR_DEBUG_BREAK_IF(layer > 5)
tmpTextureType = GL_TEXTURE_CUBE_MAP_POSITIVE_X + layer;
}