From e5cd4da823fe61e57c2d4bb829e39a587276af09 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 14 Apr 2022 22:24:11 +0300 Subject: SL-17035 Crash at gl_debug_callback RenderDebugGL was avaliable from develop menu, but since it was persistent, caused slowdowns and crashes it could result in users crashing or lagging without knowing the cause. To resolve the issue it was made to last for a single session. --- indra/newview/llface.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/newview/llface.cpp') diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index f1b64a5899..445615fdd5 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -63,7 +63,6 @@ #pragma GCC diagnostic ignored "-Wuninitialized" #endif -extern BOOL gGLDebugLoggingEnabled; #define LL_MAX_INDICES_COUNT 1000000 static LLStaticHashedString sTextureIndexIn("texture_index_in"); @@ -1522,7 +1521,6 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, !rebuild_weights && //TODO: add support for weights !volume.isUnique()) //source volume is NOT flexi { //use transform feedback to pack vertex buffer - //gGLDebugLoggingEnabled = TRUE; LL_RECORD_BLOCK_TIME(FTM_FACE_GEOM_FEEDBACK); LLGLEnable discard(GL_RASTERIZER_DISCARD); LLVertexBuffer* buff = (LLVertexBuffer*) vf.mVertexBuffer.get(); -- cgit v1.2.3 From 557fb2cccdb8f267c38f0b2dc88ce939bf1ccc21 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 14 Apr 2022 15:29:05 -0400 Subject: SL-17218: Update faulty test for null LLFace::mTangents --- indra/newview/llface.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llface.cpp') diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index f1b64a5899..547d9dad38 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1028,11 +1028,11 @@ void LLFace::getPlanarProjectedParams(LLQuaternion* face_rot, LLVector3* face_po const LLMatrix4& vol_mat = getWorldMatrix(); const LLVolumeFace& vf = getViewerObject()->getVolume()->getVolumeFace(mTEOffset); const LLVector4a& normal4a = vf.mNormals[0]; - const LLVector4a& tangent = vf.mTangents[0]; - if (!&tangent) + if (! vf.mTangents) { return; } + const LLVector4a& tangent = *vf.mTangents; LLVector4a binormal4a; binormal4a.setCross3(normal4a, tangent); -- cgit v1.2.3 From b9ed5f9e79799d1b180b9b548c1093d771154d5e Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 14 Apr 2022 15:48:09 -0400 Subject: SL-17218: Per NickyD review feedback, test LLFace::mNormals too. --- indra/newview/llface.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llface.cpp') diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 547d9dad38..2e32ffca26 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1027,12 +1027,12 @@ void LLFace::getPlanarProjectedParams(LLQuaternion* face_rot, LLVector3* face_po { const LLMatrix4& vol_mat = getWorldMatrix(); const LLVolumeFace& vf = getViewerObject()->getVolume()->getVolumeFace(mTEOffset); - const LLVector4a& normal4a = vf.mNormals[0]; - if (! vf.mTangents) + if (! (vf.mNormals && vf.mTangents)) { return; } - const LLVector4a& tangent = *vf.mTangents; + const LLVector4a& normal4a = *vf.mNormals; + const LLVector4a& tangent = *vf.mTangents; LLVector4a binormal4a; binormal4a.setCross3(normal4a, tangent); -- cgit v1.2.3 From a426e8ddb31260cbc56106d433d967ebcb9b99aa Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Fri, 27 May 2022 19:05:14 +0300 Subject: DRTVWR-543 post-merge cleanup --- indra/newview/llface.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llface.cpp') diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index e8eac55e50..c3b3ccabb4 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1541,7 +1541,6 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, !rebuild_weights && //TODO: add support for weights !volume.isUnique()) //source volume is NOT flexi { //use transform feedback to pack vertex buffer - //gGLDebugLoggingEnabled = TRUE; LL_PROFILE_ZONE_NAMED_CATEGORY_FACE("getGeometryVolume - transform feedback"); LLGLEnable discard(GL_RASTERIZER_DISCARD); -- cgit v1.2.3