From 854f67c76e7c35fda06c8f7a22c8257c63ee9bcf Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 7 Mar 2023 11:44:43 -0500
Subject: [PATCH] Fix various things broken in merge
---
indra/llrender/llgl.cpp | 2 ++
indra/llrender/llgl.h | 2 --
indra/llrender/llimagegl.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index da69205ca84..0f8af6267e2 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -1423,6 +1423,8 @@ void LLGLManager::initExtensions()
mHasCubeMapArray = mGLVersion >= 3.99f;
mHasTransformFeedback = mGLVersion >= 3.99f;
mHasDebugOutput = mGLVersion >= 4.29f;
+ mHasGPUShader4 = mGLVersion >= 3.0f;
+ mHasTextureSwizzle = mGLVersion >= 3.29f;
// Misc
glGetIntegerv(GL_MAX_ELEMENTS_VERTICES, (GLint*) &mGLMaxVertexRange);
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h
index e274b15a3e6..533205e8e72 100644
--- a/indra/llrender/llgl.h
+++ b/indra/llrender/llgl.h
@@ -94,10 +94,8 @@ class LLGLManager
bool mHasCubeMapArray = false;
bool mHasDebugOutput = false;
bool mHasTransformFeedback = false;
- bool mHasAnisotropic = false;
bool mHasTextureSwizzle = false;
bool mHasGPUShader4 = false;
- bool mHasClipControl = false;
bool mHasAdaptiveVSync = false;
// Vendor-specific extensions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index d04f1c51f9b..9a50b4d4484 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -1283,7 +1283,6 @@ void LLImageGL::deleteTextures(S32 numTextures, const U32 *textures)
void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 width, S32 height, U32 pixformat, U32 pixtype, const void* pixels, bool allow_compression)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
- std::vector<U32> scratch;
if (LLRender::sGLCoreProfile)
{
#ifdef GL_ARB_texture_swizzle
@@ -1316,6 +1315,7 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt
else
#endif
{
+ std::vector<U32> scratch;
if (pixformat == GL_ALPHA && pixtype == GL_UNSIGNED_BYTE)
{ //GL_ALPHA is deprecated, convert to RGBA
try
--
GitLab