From 4f26fe6430cd12914b0d6edf33baabe19829d014 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Sat, 12 Oct 2024 16:39:32 +0800
Subject: Preprocess eTextureType like sGLTextureType

(cause eTextureType seems to have been designed to mirror sGLTextureType)
otherwise you'd get a GL error of invalid enum of the first argument
for glTexImage2D.
---
 indra/llrender/llrender.cpp       | 2 ++
 indra/llrender/llrender.h         | 6 ++++++
 indra/llrender/llrendertarget.cpp | 2 ++
 3 files changed, 10 insertions(+)

(limited to 'indra/llrender')

diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index ca10e10b00..fd34a94ae8 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -2149,9 +2149,11 @@ void LLRender::debugTexUnits(void)
                 case LLTexUnit::TT_TEXTURE:
                     LL_CONT << "Texture 2D";
                     break;
+#if GL_VERSION_3_1
                 case LLTexUnit::TT_RECT_TEXTURE:
                     LL_CONT << "Texture Rectangle";
                     break;
+#endif
                 case LLTexUnit::TT_CUBE_MAP:
                     LL_CONT << "Cube Map";
                     break;
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h
index d198b0cd7c..4e568b2b2b 100644
--- a/indra/llrender/llrender.h
+++ b/indra/llrender/llrender.h
@@ -67,10 +67,16 @@ public:
     typedef enum
     {
         TT_TEXTURE = 0,         // Standard 2D Texture
+#if GL_VERSION_3_1
         TT_RECT_TEXTURE,        // Non power of 2 texture
+#endif
         TT_CUBE_MAP,            // 6-sided cube map texture
+#if GL_VERSION_4_0
         TT_CUBE_MAP_ARRAY,      // Array of cube maps
+#endif
+#if GL_VERSION_3_2
         TT_MULTISAMPLE_TEXTURE, // see GL_ARB_texture_multisample
+#endif
         TT_TEXTURE_3D,          // standard 3D Texture
         TT_NONE,                // No texture type is currently enabled
     } eTextureType;
diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp
index 2674fa1ec6..1ff0dec23a 100644
--- a/indra/llrender/llrendertarget.cpp
+++ b/indra/llrender/llrendertarget.cpp
@@ -255,12 +255,14 @@ bool LLRenderTarget::addColorAttachment(U32 color_fmt)
         stop_glerror();
     }
 
+#if GL_VERSION_3_1
     if (mUsage != LLTexUnit::TT_RECT_TEXTURE)
     {
         gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_MIRROR);
         stop_glerror();
     }
     else
+#endif
     {
         // ATI doesn't support mirrored repeat for rectangular textures.
         gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_CLAMP);
-- 
cgit v1.2.3


From ca452502e73389d376c81c7d0ca8aabc294387c7 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Sat, 12 Oct 2024 16:54:25 +0800
Subject: No samples_passed when there's no GL_SAMPLES_PASSED

cause it relies on querying mSamplesQuery, which would only have a
value if it could run glBeginQuery(GL_SAMPLES_PASSED, mSamplesQuery).
---
 indra/llrender/llglslshader.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'indra/llrender')

diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index 439cf46684..f21f0327fe 100644
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -307,16 +307,15 @@ bool LLGLSLShader::readProfileQuery(bool for_runtime, bool force_read)
             GLuint64 primitives_generated = 0;
             glGetQueryObjectui64v(mPrimitivesQuery, GL_QUERY_RESULT, &primitives_generated);
 #else
-            GLuint samples_passed = 0;
-            glGetQueryObjectuiv(mSamplesQuery, GL_QUERY_RESULT, &samples_passed);
-
             GLuint primitives_generated = 0;
             glGetQueryObjectuiv(mPrimitivesQuery, GL_QUERY_RESULT, &primitives_generated);
 #endif
             sTotalTimeElapsed += time_elapsed;
 
+#if GL_VERSION_1_5
             sTotalSamplesDrawn += samples_passed;
             mSamplesDrawn += samples_passed;
+#endif
 
             U32 tri_count = (U32)primitives_generated / 3;
 
-- 
cgit v1.2.3