diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2025-12-08 18:52:37 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2025-12-08 18:52:46 +0200 |
| commit | cbe606df6b77780fdecf8bdc4007a52d25ff5722 (patch) | |
| tree | 2bf38de402b8c338bdf5dde5798dcf7d15d9a8da /indra/llrender/llcubemap.cpp | |
| parent | 88a3d951fd15863bfd77b9b7137e9c02c21a4a10 (diff) | |
| parent | 49c73ac7297ec7760a00bf36fa6339f2d0be1f95 (diff) | |
Merge branch 'release/2026.01' into maxim/voice-moderation
# Conflicts:
# indra/newview/llviewerstats.h
Diffstat (limited to 'indra/llrender/llcubemap.cpp')
| -rw-r--r-- | indra/llrender/llcubemap.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/llrender/llcubemap.cpp b/indra/llrender/llcubemap.cpp index 26e4aaad52..b15cec5804 100644 --- a/indra/llrender/llcubemap.cpp +++ b/indra/llrender/llcubemap.cpp @@ -86,7 +86,10 @@ void LLCubeMap::initGL() #endif mImages[i]->setTarget(mTargets[i], LLTexUnit::TT_CUBE_MAP); mRawImages[i] = new LLImageRaw(RESOLUTION, RESOLUTION, 4); - mImages[i]->createGLTexture(0, mRawImages[i], texname); + if (!mImages[i]->createGLTexture(0, mRawImages[i], texname)) + { + LL_WARNS() << "Failed to create GL texture for environment cubemap face " << i << LL_ENDL; + } gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_CUBE_MAP, texname); mImages[i]->setAddressMode(LLTexUnit::TAM_CLAMP); @@ -203,7 +206,10 @@ void LLCubeMap::initEnvironmentMap(const std::vector<LLPointer<LLImageRaw> >& ra mImages[i] = new LLImageGL(resolution, resolution, components, true); mImages[i]->setTarget(mTargets[i], LLTexUnit::TT_CUBE_MAP); mRawImages[i] = rawimages[i]; - mImages[i]->createGLTexture(0, mRawImages[i], texname); + if (!mImages[i]->createGLTexture(0, mRawImages[i], texname)) + { + LL_WARNS() << "Failed to create GL texture for environment cubemap face " << i << LL_ENDL; + } gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_CUBE_MAP, texname); mImages[i]->setAddressMode(LLTexUnit::TAM_CLAMP); |