From c0e3be5df88ed316a247d8f7fae19a327a5a8a6f Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Sat, 19 Oct 2024 18:00:10 +0800 Subject: Further revert llrender to LL's This might fix the black screen problem on Apple GPU. --- indra/llrender/llgl.cpp | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'indra/llrender/llgl.cpp') diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index bd05645b46..6988e55034 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -50,10 +50,6 @@ #include "llglheaders.h" #include "llglslshader.h" -#include "llvertexbuffer.h" -#include "llcontrol.h" -extern LLControlGroup gSavedSettings; - #include "glm/glm.hpp" #include #include "glm/gtc/type_ptr.hpp" @@ -1283,18 +1279,6 @@ bool LLGLManager::initGL() initGLStates(); - U32 MPVBufferOptiMode = gSavedSettings.getU32("MPVBufferOptiMode"); - if (MPVBufferOptiMode == 0) - { - if(mIsApple) MPVBufferOptiMode = 2; - else MPVBufferOptiMode = 1; - gSavedSettings.setU32("MPVBufferOptiMode",MPVBufferOptiMode); - } - LLVertexBuffer::sMappingMode = MPVBufferOptiMode; - //LLRender::sMappingMode = MPVBufferOptiMode; - - LL_INFOS() << "milo init sMappingMode " << MPVBufferOptiMode << LL_ENDL; - return true; } @@ -1411,7 +1395,6 @@ void LLGLManager::asLLSD(LLSD& info) info["is_ati"] = mIsAMD; // note, do not rename is_ati to is_amd without coordinating with DW info["is_nvidia"] = mIsNVIDIA; info["is_intel"] = mIsIntel; - info["is_apple"] = mIsApple; info["gl_renderer"] = mGLRenderer; } -- cgit v1.2.3