Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 10:29:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Switched back to R11G11B10 for HDR cube maps because of sometimes wrong hue shifts with RGB9E5

Browse source
This commit is contained in:
Olivier Prat 2017-09-18 10:58:38 +02:00
parent b8065d46ce
commit 037550f176
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libraries/image/src/image/Image.cpp
View file

@ -213,10 +213,14 @@ uint32 packR11G11B10F(const glm::vec3& color) {
// Denormalize else unpacking gives high and incorrect values // Denormalize else unpacking gives high and incorrect values
// See https://www.khronos.org/opengl/wiki/Small_Float_Formats for this min value // See https://www.khronos.org/opengl/wiki/Small_Float_Formats for this min value
static const auto minValue = 6.10e-5f; static const auto minValue = 6.10e-5f;
static const auto maxValue = 6.50e4f;
glm::vec3 ucolor; glm::vec3 ucolor;
ucolor.r = denormalize(color.r, minValue); ucolor.r = denormalize(color.r, minValue);
ucolor.g = denormalize(color.g, minValue); ucolor.g = denormalize(color.g, minValue);
ucolor.b = denormalize(color.b, minValue); ucolor.b = denormalize(color.b, minValue);
ucolor.r = std::min(ucolor.r, maxValue);
ucolor.g = std::min(ucolor.g, maxValue);
ucolor.b = std::min(ucolor.b, maxValue);
return glm::packF2x11_1x10(ucolor); return glm::packF2x11_1x10(ucolor);
} }
@ -1072,15 +1076,27 @@ const CubeLayout CubeLayout::CUBEMAP_LAYOUTS[] = {
}; };
const int CubeLayout::NUM_CUBEMAP_LAYOUTS = sizeof(CubeLayout::CUBEMAP_LAYOUTS) / sizeof(CubeLayout); const int CubeLayout::NUM_CUBEMAP_LAYOUTS = sizeof(CubeLayout::CUBEMAP_LAYOUTS) / sizeof(CubeLayout);
//#define DEBUG_COLOR_PACKING
QImage convertToHDRFormat(QImage srcImage, gpu::Element format) { QImage convertToHDRFormat(QImage srcImage, gpu::Element format) {
QImage hdrImage(srcImage.width(), srcImage.height(), (QImage::Format)QIMAGE_HDR_FORMAT); QImage hdrImage(srcImage.width(), srcImage.height(), (QImage::Format)QIMAGE_HDR_FORMAT);
std::function<uint32(const glm::vec3&)> packFunc; std::function<uint32(const glm::vec3&)> packFunc;
#ifdef DEBUG_COLOR_PACKING
std::function<glm::vec3(uint32)> unpackFunc;
#endif
switch (format.getSemantic()) { switch (format.getSemantic()) {
case gpu::R11G11B10: case gpu::R11G11B10:
packFunc = packR11G11B10F; packFunc = packR11G11B10F;
#ifdef DEBUG_COLOR_PACKING
unpackFunc = glm::unpackF2x11_1x10;
#endif
break; break;
case gpu::RGB9E5: case gpu::RGB9E5:
packFunc = glm::packF3x9_E1x5; packFunc = glm::packF3x9_E1x5;
#ifdef DEBUG_COLOR_PACKING
unpackFunc = glm::unpackF3x9_E1x5;
#endif
break; break;
default: default:
qCWarning(imagelogging) << "Unsupported HDR format"; qCWarning(imagelogging) << "Unsupported HDR format";
@ -1105,6 +1121,10 @@ QImage convertToHDRFormat(QImage srcImage, gpu::Element format) {
color.g = powf(color.g, 2.2f); color.g = powf(color.g, 2.2f);
color.b = powf(color.b, 2.2f); color.b = powf(color.b, 2.2f);
*hdrLineIt = packFunc(color); *hdrLineIt = packFunc(color);
#ifdef DEBUG_COLOR_PACKING
glm::vec3 ucolor = unpackFunc(*hdrLineIt);
assert(glm::distance(color, ucolor) <= 5e-2);
#endif
++srcLineIt; ++srcLineIt;
++hdrLineIt; ++hdrLineIt;
} }
@ -1119,7 +1139,7 @@ gpu::TexturePointer TextureUsage::processCubeTextureColorFromImage(const QImage&
if ((srcImage.width() > 0) && (srcImage.height() > 0)) { if ((srcImage.width() > 0) && (srcImage.height() > 0)) {
QImage image = processSourceImage(srcImage, true); QImage image = processSourceImage(srcImage, true);
const auto cubeMapHDRFormat = gpu::Element::COLOR_RGB9E5; const auto cubeMapHDRFormat = gpu::Element::COLOR_R11G11B10;
gpu::Element formatMip; gpu::Element formatMip;
gpu::Element formatGPU; gpu::Element formatGPU;
if (isCubeTexturesCompressionEnabled()) { if (isCubeTexturesCompressionEnabled()) {