Skip to content

Fix various GL errors and a startup crash #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RyeMutt merged 6 commits into from
Oct 11, 2025
Merged

Fix various GL errors and a startup crash #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9da66a1
Fix GL assert due to unbinding incorrect texture target type
RyeMutt Oct 7, 2025
1afe1c9
Bump irradiance map back up to 64x64 to improve IBL quality
RyeMutt Oct 7, 2025
a84ef80
Bump cubemap arrays RGB type back to 16F for improved HDR color preci…
RyeMutt Oct 7, 2025
5688162
Disable cubemap array copy constructor due to GL errors
RyeMutt Oct 7, 2025
338d7dc
Fix using physicsextensions_tpv package
RyeMutt Oct 7, 2025
efc081f
Fix crash on startup from missing RLVa setting (#260)
RyeMutt Oct 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion indra/cmake/LLPhysicsExtensions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,15 @@ if (HAVOK)
use_prebuilt_binary(llphysicsextensions_source)
set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/src)
target_link_libraries( llphysicsextensions_impl INTERFACE llphysicsextensions)
target_compile_definitions( llphysicsextensions_impl INTERFACE LL_HAVOK=1 )
elseif (HAVOK_TPV)
use_prebuilt_binary(llphysicsextensions_tpv)
target_link_libraries( llphysicsextensions_impl INTERFACE llphysicsextensions_tpv)
if(WINDOWS)
target_link_libraries( llphysicsextensions_impl INTERFACE ${ARCH_PREBUILT_DIRS}/llphysicsextensions_tpv.lib)
else()
target_link_libraries( llphysicsextensions_impl INTERFACE ${ARCH_PREBUILT_DIRS}/libllphysicsextensions_tpv.a)
endif()
target_compile_definitions( llphysicsextensions_impl INTERFACE LL_HAVOK=1 )
else (HAVOK)
use_prebuilt_binary(llphysicsextensions_stub)
set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/stub)
Expand Down
2 changes: 1 addition & 1 deletion indra/llrender/llcubemaparray.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ void LLCubeMapArray::allocate(U32 resolution, U32 components, U32 count, bool us
bind(0);
free_cur_tex_image();

U32 format = components == 4 ? GL_RGBA16F : GL_R11F_G11F_B10F;
U32 format = components == 4 ? GL_RGBA16F : GL_RGB16F;
if (!hdr)
{
format = components == 4 ? GL_RGBA8 : GL_RGB8;
Expand Down
11 changes: 0 additions & 11 deletions indra/newview/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1839,17 +1839,6 @@ if (WINDOWS)
list(APPEND viewer_SOURCE_FILES ${viewer_INSTALLER_FILES})
endif (WINDOWS)

if (HAVOK OR HAVOK_TPV)
set(LLSTARTUP_COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS} -DLL_HAVOK")
endif (HAVOK OR HAVOK_TPV)

if( DEFINED LLSTARTUP_COMPILE_FLAGS )
# progress view disables/enables icons based on available packages
set_source_files_properties(llprogressview.cpp PROPERTIES COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS}")

set_source_files_properties(llstartup.cpp PROPERTIES COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS}")
endif()

list(APPEND viewer_SOURCE_FILES ${viewer_HEADER_FILES})

add_executable(${VIEWER_BINARY_NAME}
Expand Down
4 changes: 2 additions & 2 deletions indra/newview/llagentcamera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2242,8 +2242,8 @@ LLVector3d LLAgentCamera::getFocusOffsetInitial()
// [RLVa:KB] - @setcam_eyeoffsetscale
F32 LLAgentCamera::getCameraOffsetScale() const
{
static LLCachedControl<F32> camera_offset_scale(gSavedSettings, "CameraOffsetScale");
static LLCachedControl<F32> camera_offset_scale_rlv(gSavedSettings, "CameraOffsetScaleRLVa");
static LLCachedControl<F32> camera_offset_scale(gSavedSettings, "CameraOffsetScale", 1.0f);
static LLCachedControl<F32> camera_offset_scale_rlv(gSavedSettings, "CameraOffsetScaleRLVa", 0.0f);
return (ECameraPreset::CAMERA_RLV_SETCAM_VIEW != mCameraPreset) ? camera_offset_scale : camera_offset_scale_rlv;
}
// [/RLVa:KB]
Expand Down
6 changes: 4 additions & 2 deletions indra/newview/llreflectionmapmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ void LLReflectionMapManager::update()

if (!mRenderTarget.isComplete())
{
U32 color_fmt = render_hdr ? GL_R11F_G11F_B10F : GL_RGB8;
U32 color_fmt = render_hdr ? GL_RGB16F : GL_RGB8;
U32 targetRes = mProbeResolution * 4; // super sample
mRenderTarget.allocate(targetRes, targetRes, color_fmt, true);
}
Expand All @@ -287,7 +287,7 @@ void LLReflectionMapManager::update()
mMipChain.resize(count);
for (U32 i = 0; i < count; ++i)
{
mMipChain[i].allocate(res, res, render_hdr ? GL_R11F_G11F_B10F : GL_RGB8);
mMipChain[i].allocate(res, res, render_hdr ? GL_RGB16F : GL_RGB8);
res /= 2;
}
}
Expand Down Expand Up @@ -1442,13 +1442,15 @@ void LLReflectionMapManager::initReflectionMaps()
mTexture->getWidth() != mProbeResolution ||
mReflectionProbeCount + 2 != mTexture->getCount())
{
#if 0 // LLCubeMapArray copy critically flawed
if (mTexture)
{
mTexture = new LLCubeMapArray(*mTexture, mProbeResolution, mReflectionProbeCount + 2);

mIrradianceMaps = new LLCubeMapArray(*mIrradianceMaps, LL_IRRADIANCE_MAP_RESOLUTION, mReflectionProbeCount);
}
else
#endif
{
mTexture = new LLCubeMapArray();

Expand Down
2 changes: 1 addition & 1 deletion indra/newview/llreflectionmapmanager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class LLViewerObject;
#define LL_MAX_REFLECTION_PROBE_COUNT 256

// reflection probe resolution
#define LL_IRRADIANCE_MAP_RESOLUTION 16
#define LL_IRRADIANCE_MAP_RESOLUTION 64

// reflection probe mininum scale
#define LL_REFLECTION_PROBE_MINIMUM_SCALE 1.f;
Expand Down
2 changes: 1 addition & 1 deletion indra/newview/pipeline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9463,7 +9463,7 @@ void LLPipeline::bindReflectionProbes(LLGLSLShader& shader)

void LLPipeline::unbindReflectionProbes(LLGLSLShader& shader)
{
S32 channel = shader.disableTexture(LLShaderMgr::REFLECTION_PROBES, LLTexUnit::TT_CUBE_MAP);
S32 channel = shader.disableTexture(LLShaderMgr::REFLECTION_PROBES, LLTexUnit::TT_CUBE_MAP_ARRAY);
if (channel > -1 && mReflectionMapManager.mTexture.notNull())
{
mReflectionMapManager.mTexture->unbind();
Expand Down
Loading