From d0b773094d5a3129f5b6db7d9de0da41791b2852 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Thu, 7 Sep 2023 21:12:38 +0800
Subject: Revert "Bring back GL funcs & macros that work on macOS"

This reverts commit e600f6504cd7edd9d2883ea7dc17c2574b1ff468.
---
 indra/llrender/llglslshader.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'indra/llrender/llglslshader.cpp')

diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index f587fb414c..58a9e28270 100644
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -797,21 +797,16 @@ GLint LLGLSLShader::mapUniformTextureChannel(GLint location, GLenum type)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_SHADER;
 
-#if GL_VERSION_2_0 || GL_VERSION_3_2
     if (
 #if GL_VERSION_2_0
-    (type >= GL_SAMPLER_1D_ARB && type <= GL_SAMPLER_2D_RECT_SHADOW_ARB)
+    (type >= GL_SAMPLER_1D_ARB && type <= GL_SAMPLER_2D_RECT_SHADOW_ARB) ||
 #endif
-#if GL_VERSION_3_2
-    || type == GL_SAMPLER_2D_MULTISAMPLE
-#endif
-    )
+        type == GL_SAMPLER_2D_MULTISAMPLE)
     {   //this here is a texture
         glUniform1i(location, mActiveTextureChannels);
         LL_DEBUGS("ShaderUniform") << "Assigned to texture channel " << mActiveTextureChannels << LL_ENDL;
         return mActiveTextureChannels++;
     }
-#endif // GL_VERSION_2_0 || GL_VERSION_3_2
     return -1;
 }
 
-- 
cgit v1.2.3