SL-18190 Cleanup -- convert some vec4's to vec3's (as they really are), remove some unused glsl files.

3 files changed, 13 insertions, 8 deletions

diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 2dbff3ffd0..9ea6bfdb4e 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -86,13 +86,13 @@ void APIENTRY gl_debug_callback(GLenum source,
                                 const GLchar* message,
                                 GLvoid* userParam)
 {
-    /*if (severity != GL_DEBUG_SEVERITY_HIGH // &&
-        severity != GL_DEBUG_SEVERITY_MEDIUM &&
-        severity != GL_DEBUG_SEVERITY_LOW
+    if (severity != GL_DEBUG_SEVERITY_HIGH // &&
+        //severity != GL_DEBUG_SEVERITY_MEDIUM &&
+        //severity != GL_DEBUG_SEVERITY_LOW
         )
     { //suppress out-of-spec messages sent by nvidia driver (mostly vertexbuffer hints)
         return;
-    }*/
+    }
 
     if (severity == GL_DEBUG_SEVERITY_HIGH)
     {
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h
index fd69f43f87..3401da832e 100644
--- a/indra/llrender/llglslshader.h
+++ b/indra/llrender/llglslshader.h
@@ -118,6 +118,11 @@ public:
         mVector3s.push_back({ index, value });
     }
 
+    void uniform3fv(S32 index, const F32* value)
+    {
+        mVector3s.push_back({ index, LLVector3(value) });
+    }
+
     void apply(LLGLSLShader* shader);
    
 
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index 6e659641fe..409b03f425 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -974,11 +974,11 @@ void LLRender::syncLightState()
         shader->uniform4fv(LLShaderMgr::LIGHT_ATTENUATION, LL_NUM_LIGHT_UNITS, attenuation[0].mV);
         shader->uniform2fv(LLShaderMgr::LIGHT_DEFERRED_ATTENUATION, LL_NUM_LIGHT_UNITS, size[0].mV);
         shader->uniform3fv(LLShaderMgr::LIGHT_DIFFUSE, LL_NUM_LIGHT_UNITS, diffuse[0].mV);
-        shader->uniform4fv(LLShaderMgr::LIGHT_AMBIENT, 1, mAmbientLightColor.mV);
+        shader->uniform3fv(LLShaderMgr::LIGHT_AMBIENT, 1, mAmbientLightColor.mV);
         shader->uniform1i(LLShaderMgr::SUN_UP_FACTOR, sun_primary[0] ? 1 : 0);
-        shader->uniform4fv(LLShaderMgr::AMBIENT, 1, mAmbientLightColor.mV);
-        shader->uniform4fv(LLShaderMgr::SUNLIGHT_COLOR, 1, diffuse[0].mV);
-        shader->uniform4fv(LLShaderMgr::MOONLIGHT_COLOR, 1, diffuse_b[0].mV);
+        shader->uniform3fv(LLShaderMgr::AMBIENT, 1, mAmbientLightColor.mV);
+        shader->uniform3fv(LLShaderMgr::SUNLIGHT_COLOR, 1, diffuse[0].mV);
+        shader->uniform3fv(LLShaderMgr::MOONLIGHT_COLOR, 1, diffuse_b[0].mV);
     }
 }