diff options
| author | cutealien <cutealien@dfc29bdd-3216-0410-991c-e03cc46cb475> | 2020-06-10 22:19:09 +0000 |
|---|---|---|
| committer | cutealien <cutealien@dfc29bdd-3216-0410-991c-e03cc46cb475> | 2020-06-10 22:19:09 +0000 |
| commit | cb62c685deb01746cb0803c0e319092e54fa3b3b (patch) | |
| tree | 7296142b13b29de0ddb85b54b0f8b5f3fde564cf /include/IImage.h | |
| parent | 3e26f3d7a952529ed70342e188b8b10a579673ed (diff) | |
| download | irrlicht-cb62c685deb01746cb0803c0e319092e54fa3b3b.tar.xz | |
Merging r6039 through r6072 from trunk to ogl-es branch.
Note: Not yet caught up with trunk.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6114 dfc29bdd-3216-0410-991c-e03cc46cb475
Diffstat (limited to 'include/IImage.h')
| -rw-r--r-- | include/IImage.h | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/include/IImage.h b/include/IImage.h index 0092d00..09c40f4 100644 --- a/include/IImage.h +++ b/include/IImage.h @@ -243,11 +243,11 @@ public: ++i;
if ( mipSize.Width == 1 && mipSize.Height == 1 && i < mipLevel)
return 0;
- }
+ }
return MipMapsData + dataSize;
}
-
+
return 0;
}
@@ -470,25 +470,29 @@ public: return imageSize;
}
+// Define to check for all compressed image formats cases in a switch
+#define IRR_CASE_IIMAGE_COMPRESSED_FORMAT\
+ case ECF_DXT1:\
+ case ECF_DXT2:\
+ case ECF_DXT3:\
+ case ECF_DXT4:\
+ case ECF_DXT5:\
+ case ECF_PVRTC_RGB2:\
+ case ECF_PVRTC_ARGB2:\
+ case ECF_PVRTC2_ARGB2:\
+ case ECF_PVRTC_RGB4:\
+ case ECF_PVRTC_ARGB4:\
+ case ECF_PVRTC2_ARGB4:\
+ case ECF_ETC1:\
+ case ECF_ETC2_RGB:\
+ case ECF_ETC2_ARGB:
+
//! check if this is compressed color format
static bool isCompressedFormat(const ECOLOR_FORMAT format)
{
switch(format)
{
- case ECF_DXT1:
- case ECF_DXT2:
- case ECF_DXT3:
- case ECF_DXT4:
- case ECF_DXT5:
- case ECF_PVRTC_RGB2:
- case ECF_PVRTC_ARGB2:
- case ECF_PVRTC2_ARGB2:
- case ECF_PVRTC_RGB4:
- case ECF_PVRTC_ARGB4:
- case ECF_PVRTC2_ARGB4:
- case ECF_ETC1:
- case ECF_ETC2_RGB:
- case ECF_ETC2_ARGB:
+ IRR_CASE_IIMAGE_COMPRESSED_FORMAT
return true;
default:
return false;
|