OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-19 13:40:49 +03:00
Code Activity

0032093: Visualization, TKOpenGl - loading texture in BGR format fails in OpenGL ES

Browse Source 
Graphic3d_TextureRoot::convertToCompatible() - fixed handling of
Image_Format_BGR and Image_Format_BGRA formats.

OpenGl_Texture - added error message for unsupported pixel format;
error messages have been extended by resource id.
OpenGl_Texture::InitCubeMap() now does not release cubemap
on mipmaps generation failure.

Image_PixMap::ImageFormatToString() - added method returning name of pixel format.
This commit is contained in:
kgv
2021-01-29 03:34:16 +03:00
committed by bugmaster
parent 961c002c46
commit 776302d46b
4 changed files with 124 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
src/Image/Image_PixMap.cxx
View File

@@ -20,6 +20,55 @@
#include <algorithm>
namespace
{
//! Structure defining image pixel format description.
struct Image_FormatInfo
{
const char* Name; //!< string representation
int Format; //!< enumeration name
unsigned int NbComponents; //!< number of components
unsigned int PixelSize; //!< bytes per pixel
Image_FormatInfo (Image_Format theFormat, const char* theName, unsigned int theNbComponents, Standard_Size thePixelSize)
: Name (theName), Format (theFormat), NbComponents (theNbComponents), PixelSize ((unsigned int )thePixelSize) {}
Image_FormatInfo (Image_CompressedFormat theFormat, const char* theName, unsigned int theNbComponents, Standard_Size thePixelSize)
: Name (theName), Format (theFormat), NbComponents (theNbComponents), PixelSize ((unsigned int )thePixelSize) {}
};
#define ImageFormatInfo(theName, theNbComponents, thePixelSize) \
Image_FormatInfo(Image_Format_##theName, #theName, theNbComponents, thePixelSize)
#define CompressedImageFormatInfo(theName, theNbComponents, thePixelSize) \
Image_FormatInfo(Image_CompressedFormat_##theName, #theName, theNbComponents, thePixelSize)
//! Table of image pixel formats.
static const Image_FormatInfo Image_Table_ImageFormats[Image_CompressedFormat_NB] =
{
ImageFormatInfo(UNKNOWN, 0, 1),
ImageFormatInfo(Gray, 1, 1),
ImageFormatInfo(Alpha, 1, 1),
ImageFormatInfo(RGB, 3, 3),
ImageFormatInfo(BGR, 3, 3),
ImageFormatInfo(RGB32, 3, 4),
ImageFormatInfo(BGR32, 3, 4),
ImageFormatInfo(RGBA, 4, 4),
ImageFormatInfo(BGRA, 4, 4),
ImageFormatInfo(GrayF, 1, sizeof(float)),
ImageFormatInfo(AlphaF, 1, sizeof(float)),
ImageFormatInfo(RGF, 2, sizeof(float) * 2),
ImageFormatInfo(RGBF, 3, sizeof(float) * 3),
ImageFormatInfo(BGRF, 3, sizeof(float) * 3),
ImageFormatInfo(RGBAF, 4, sizeof(float) * 4),
ImageFormatInfo(BGRAF, 4, sizeof(float) * 4),
CompressedImageFormatInfo(RGB_S3TC_DXT1, 3, 1), // DXT1 uses circa half a byte per pixel (64 bits per 4x4 block)
CompressedImageFormatInfo(RGBA_S3TC_DXT1, 4, 1),
CompressedImageFormatInfo(RGBA_S3TC_DXT3, 4, 1), // DXT3/5 uses circa 1 byte per pixel (128 bits per 4x4 block)
CompressedImageFormatInfo(RGBA_S3TC_DXT5, 4, 1)
};
}
IMPLEMENT_STANDARD_RTTIEXT(Image_PixMap,Standard_Transient)
// =======================================================================
@@ -32,6 +81,24 @@ const Handle(NCollection_BaseAllocator)& Image_PixMap::DefaultAllocator()
return THE_ALLOC;
}
// =======================================================================
// function : ImageFormatToString
// purpose :
// =======================================================================
Standard_CString Image_PixMap::ImageFormatToString (Image_Format theFormat)
{
return Image_Table_ImageFormats[theFormat].Name;
}
// =======================================================================
// function : ImageFormatToString
// purpose :
// =======================================================================
Standard_CString Image_PixMap::ImageFormatToString (Image_CompressedFormat theFormat)
{
return Image_Table_ImageFormats[theFormat].Name;
}
// =======================================================================
// function : Image_PixMap
// purpose :
@@ -57,35 +124,7 @@ Image_PixMap::~Image_PixMap()
// =======================================================================
Standard_Size Image_PixMap::SizePixelBytes (const Image_Format thePixelFormat)
{
switch (thePixelFormat)
{
case Image_Format_GrayF:
case Image_Format_AlphaF:
return sizeof(float);
case Image_Format_RGF:
return sizeof(float) * 2;
case Image_Format_RGBAF:
case Image_Format_BGRAF:
return sizeof(float) * 4;
case Image_Format_RGBF:
case Image_Format_BGRF:
return sizeof(float) * 3;
case Image_Format_RGBA:
case Image_Format_BGRA:
return 4;
case Image_Format_RGB32:
case Image_Format_BGR32:
return 4;
case Image_Format_RGB:
case Image_Format_BGR:
return 3;
case Image_Format_Gray:
case Image_Format_Alpha:
return 1;
case Image_Format_UNKNOWN:
return 1;
}
return 1;
return Image_Table_ImageFormats[thePixelFormat].PixelSize;
}
// =======================================================================

8
src/Image/Image_PixMap.hxx
View File

@@ -16,7 +16,7 @@
#ifndef _Image_PixMap_H__
#define _Image_PixMap_H__
#include <Image_Format.hxx>
#include <Image_CompressedFormat.hxx>
#include <Image_PixMapData.hxx>
#include <Standard_Transient.hxx>
#include <Quantity_ColorRGBA.hxx>
@@ -54,6 +54,12 @@ public:
//! Return default image data allocator.
Standard_EXPORT static const Handle(NCollection_BaseAllocator)& DefaultAllocator();
//! Return string representation of pixel format.
Standard_EXPORT static Standard_CString ImageFormatToString (Image_Format theFormat);
//! Return string representation of compressed pixel format.
Standard_EXPORT static Standard_CString ImageFormatToString (Image_CompressedFormat theFormat);
public: // high-level API
Image_Format Format() const { return myImgFormat; }