Merge pull request #114 from secondlife/SL-19338

Sl 19338: Fix textures not loading when RenderCompressTextures is 1

2 files changed, 45 insertions, 35 deletions

diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index 50d4532fa7..b5c36ea35e 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -1409,52 +1409,59 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt
 
         free_cur_tex_image();
 #if LL_DARWIN
-        {
-            LL_PROFILE_ZONE_NAMED("glTexImage2D alloc");
-            glTexImage2D(target, miplevel, intformat, width, height, 0, pixformat, pixtype, use_scratch ? scratch : pixels);
-        }
+        const bool use_sub_image = false;
 #else
-        // break up calls to a manageable size for the GL command buffer
+        // glTexSubImage2D doesn't work with compressed textures on select tested Nvidia GPUs on Windows 10 -Cosmic,2023-03-08
+        const bool use_sub_image = !allow_compression;
+#endif
+        if (!use_sub_image)
         {
             LL_PROFILE_ZONE_NAMED("glTexImage2D alloc");
-            glTexImage2D(target, miplevel, intformat, width, height, 0, pixformat, pixtype, nullptr);
+            glTexImage2D(target, miplevel, intformat, width, height, 0, pixformat, pixtype, use_scratch ? scratch : pixels);
         }
-
-        U8* src = (U8*)(use_scratch ? scratch : pixels);
-        if (src)
+        else
         {
-            LL_PROFILE_ZONE_NAMED("glTexImage2D copy");
-            U32 components = dataFormatComponents(pixformat);
-            U32 type_width = 0;
-
-            switch (pixtype)
+            // break up calls to a manageable size for the GL command buffer
             {
-            case GL_UNSIGNED_BYTE:
-            case GL_BYTE:
-            case GL_UNSIGNED_INT_8_8_8_8_REV:
-                type_width = 1;
-                break;
-            case GL_UNSIGNED_SHORT:
-            case GL_SHORT:
-                type_width = 2;
-                break;
-            case GL_UNSIGNED_INT:
-            case GL_INT:
-            case GL_FLOAT:
-                type_width = 4;
-                break;
-            default:
-                LL_ERRS() << "Unknown type: " << pixtype << LL_ENDL;
+                LL_PROFILE_ZONE_NAMED("glTexImage2D alloc");
+                glTexImage2D(target, miplevel, intformat, width, height, 0, pixformat, pixtype, nullptr);
             }
 
-            U32 line_width = width * components * type_width;
-            for (U32 y = 0; y < height; ++y)
+            U8* src = (U8*)(use_scratch ? scratch : pixels);
+            if (src)
             {
-                glTexSubImage2D(target, miplevel, 0, y, width, 1, pixformat, pixtype, src);
-                src += line_width;
+                LL_PROFILE_ZONE_NAMED("glTexImage2D copy");
+                U32 components = dataFormatComponents(pixformat);
+                U32 type_width = 0;
+
+                switch (pixtype)
+                {
+                case GL_UNSIGNED_BYTE:
+                case GL_BYTE:
+                case GL_UNSIGNED_INT_8_8_8_8_REV:
+                    type_width = 1;
+                    break;
+                case GL_UNSIGNED_SHORT:
+                case GL_SHORT:
+                    type_width = 2;
+                    break;
+                case GL_UNSIGNED_INT:
+                case GL_INT:
+                case GL_FLOAT:
+                    type_width = 4;
+                    break;
+                default:
+                    LL_ERRS() << "Unknown type: " << pixtype << LL_ENDL;
+                }
+
+                U32 line_width = width * components * type_width;
+                for (U32 y = 0; y < height; ++y)
+                {
+                    glTexSubImage2D(target, miplevel, 0, y, width, 1, pixformat, pixtype, src);
+                    src += line_width;
+                }
             }
         }
-#endif
         alloc_tex_image(width, height, pixformat);
     }
     stop_glerror();
diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h
index bbd024abd9..a03233323b 100644
--- a/indra/llrender/llimagegl.h
+++ b/indra/llrender/llimagegl.h
@@ -118,6 +118,9 @@ public:
 	BOOL createGLTexture(S32 discard_level, const U8* data, BOOL data_hasmips = FALSE, S32 usename = 0, bool defer_copy = false, LLGLuint* tex_name = nullptr);
 	void setImage(const LLImageRaw* imageraw);
 	BOOL setImage(const U8* data_in, BOOL data_hasmips = FALSE, S32 usename = 0);
+    // *NOTE: force_fast_update should only be used if the texture is not
+    // compressed (i.e. RenderCompressTextures is 0). Partial image updates
+    // (glTexSubImage2D) do not work on compressed textures.
 	BOOL setSubImage(const LLImageRaw* imageraw, S32 x_pos, S32 y_pos, S32 width, S32 height, BOOL force_fast_update = FALSE, LLGLuint use_name = 0);
 	BOOL setSubImage(const U8* datap, S32 data_width, S32 data_height, S32 x_pos, S32 y_pos, S32 width, S32 height, BOOL force_fast_update = FALSE, LLGLuint use_name = 0);
 	BOOL setSubImageFromFrameBuffer(S32 fb_x, S32 fb_y, S32 x_pos, S32 y_pos, S32 width, S32 height);