From 230c9b68d81bcf163a6627e8474e545e8ceb2282 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 22 Jul 2019 16:24:49 -0700
Subject: Remove binding and use of glIsShader for now (only useful for
 avoiding warnings about deleting shader objects re-used across programs).

---
 indra/llrender/llglslshader.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

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

diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index 782304ae41..384e5bf99f 100644
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -348,12 +348,8 @@ void LLGLSLShader::unloadInternal()
 
         for (GLsizei i = 0; i < count; i++)
         {
-            // avoid opengl errors when multiple programs link a common shader obj
-            if (glIsShader(obj[i]))
-            {
-                glDetachObjectARB(mProgramObject, obj[i]);
-                glDeleteObjectARB(obj[i]);
-            }
+            glDetachObjectARB(mProgramObject, obj[i]);
+            glDeleteObjectARB(obj[i]);
         }
 
         glDeleteObjectARB(mProgramObject);
-- 
cgit v1.2.3