From 4368c572438d5dd24615b93c596b1e2e8d9c093d Mon Sep 17 00:00:00 2001 From: Shyotl Date: Wed, 19 Oct 2011 09:43:28 -0500 Subject: [PATCH] Disabled reserved attrib having reserved locations in shaders. Conflicted with attrib location assumptions elsewhere. --- indra/llrender/llglslshader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 5645c9061..6647a3390 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -262,11 +262,11 @@ void LLGLSLShader::attachObjects(GLhandleARB* objects, S32 count) BOOL LLGLSLShader::mapAttributes(const vector * attributes) { //before linking, make sure reserved attributes always have consistent locations - for (U32 i = 0; i < LLShaderMgr::instance()->mReservedAttribs.size(); i++) + /*for (U32 i = 0; i < LLShaderMgr::instance()->mReservedAttribs.size(); i++) { const char* name = LLShaderMgr::instance()->mReservedAttribs[i].c_str(); glBindAttribLocationARB(mProgramObject, i, (const GLcharARB *) name); - } + }*/ //link the program BOOL res = link();