3 files changed, 16 insertions, 5 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 3a36e49029..fc06a9d089 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -2380,6 +2380,12 @@ void clear_glerror()
     glGetError();
 }
 
+void drain_glerror()
+{
+    // bounded: a lost/reset context can return errors indefinitely
+    for (S32 i = 0; i < 16 && glGetError() != GL_NO_ERROR; ++i) {}
+}
+
 ///////////////////////////////////////////////////////////////
 //
 // LLGLState
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h
index a7dced3753..92d82948ca 100644
--- a/indra/llrender/llgl.h
+++ b/indra/llrender/llgl.h
@@ -159,6 +159,7 @@ void log_glerror(std::string comment);
 void assert_glerror();
 
 void clear_glerror();
+void drain_glerror(); // pops ALL pending GL error flags (bounded so a lost/reset context that returns errors forever cannot hang the caller); use before an attributable glGetError check.
 
 
 //#if !LL_RELEASE_FOR_DOWNLOAD
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index eb86f5bae2..9529c7a2be 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -1596,7 +1596,7 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt
         // Drain stale GL errors so an OOM detected below belongs to this alloc.
         // Otherwise a failed glTexImage2D is swallowed in release while
         // alloc_tex_image still counts the bytes, inflating the used-VRAM figure.
-        while (glGetError() != GL_NO_ERROR) {}
+        drain_glerror();
 
         const bool use_sub_image = should_stagger_image_set(compress);
         if (!use_sub_image)
@@ -2016,7 +2016,8 @@ bool LLImageGL::readBackRaw(S32 discard_level, LLImageRaw* imageraw, bool compre
 
     //-----------------------------------------------------------------------------------------------
     GLenum error ;
-    while((error = glGetError()) != GL_NO_ERROR)
+    S32 error_count = 0 ;
+    while((error = glGetError()) != GL_NO_ERROR && ++error_count <= 16)
     {
         LL_WARNS() << "GL Error happens before reading back texture. Error code: " << error << LL_ENDL ;
     }
@@ -2078,7 +2079,8 @@ bool LLImageGL::readBackRaw(S32 discard_level, LLImageRaw* imageraw, bool compre
         LL_WARNS() << "GL Error happens after reading back texture. Error code: " << error << LL_ENDL ;
         imageraw->deleteData() ;
 
-        while((error = glGetError()) != GL_NO_ERROR)
+        error_count = 0 ;
+        while((error = glGetError()) != GL_NO_ERROR && ++error_count <= 16)
         {
             LL_WARNS() << "GL Error happens after reading back texture. Error code: " << error << LL_ENDL ;
         }
@@ -2665,8 +2667,10 @@ bool LLImageGL::scaleDown(S32 desired_discard)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
 
-    // Don't let eviction re-arm visibility: the glGenerateMipmap re-bind below
-    // would otherwise stamp mLastBindFrame and keep the texture fetch-eligible.
+    // Don't let eviction re-arm the GC: the glGenerateMipmap re-bind below would
+    // otherwise stamp mLastBindFrame, so the next computeDesiredDiscard treats the
+    // just-evicted texture as freshly drawn, un-floors it, and re-fetches - the
+    // evict/refetch oscillation.
     LLImageGLStampBypass no_stamp;
 
     if (mTarget != GL_TEXTURE_2D