Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-16 16:36:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12854 from birarda/bug/hdr-format-static

Browse source 
fix skybox bake assert on HDR_FORMAT static order initialization
This commit is contained in:
Clément Brisset 2018-06-12 17:19:27 -07:00 committed by GitHub
commit 91d7990d7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,9 @@ bool DEV_DECIMATE_TEXTURES = false;
std::atomic<size_t> DECIMATED_TEXTURE_COUNT{ 0 };
std::atomic<size_t> RECTIFIED_TEXTURE_COUNT{ 0 };
static const auto HDR_FORMAT = gpu::Element::COLOR_R11G11B10;
// we use a ref here to work around static order initialization
// possibly causing the element not to be constructed yet
static const auto& HDR_FORMAT = gpu::Element::COLOR_R11G11B10;
static std::atomic<bool> compressColorTextures { false };
static std::atomic<bool> compressNormalTextures { false };