From 3773bac6b441d103ab553b86eb34d3ec6f288a2a Mon Sep 17 00:00:00 2001 From: Cosmic Linden Date: Wed, 8 Mar 2023 14:21:44 -0800 Subject: Revert "SL-19338: (WIP) Test disabling new use of glTexSubImage2D and see if the bug still repros" This reverts commit 6c486e485372a6f79e632839a7217c5208a09d0c. --- indra/llrender/llimagegl.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'indra') diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 7bb98be84a..50d4532fa7 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1408,9 +1408,7 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt LL_PROFILE_ZONE_NUM(height); free_cur_tex_image(); -// TODO: Revert -//#if LL_DARWIN -#if 1 +#if LL_DARWIN { LL_PROFILE_ZONE_NAMED("glTexImage2D alloc"); glTexImage2D(target, miplevel, intformat, width, height, 0, pixformat, pixtype, use_scratch ? scratch : pixels); -- cgit v1.2.3