livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backed out changeset: 5fe5ad059c05

master
ruslantproductengine 2016-07-18 20:09:18 +03:00
parent 1c4dbc64ab
commit eebbda288d
11 changed files with 2 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
indra/llrender/llglslshader.cpp
View File

@ -1274,28 +1274,6 @@ void LLGLSLShader::uniformMatrix4fv(U32 index, U32 count, GLboolean transpose, c
}
}
void LLGLSLShader::uniform1b(U32 index, GLboolean x)
{
if (mProgramObject > 0)
{
if (mUniform.size() <= index)
{
UNIFORM_ERRS << "Uniform index out of bounds." << LL_ENDL;
return;
}
if (mUniform[index] >= 0)
{
std::map<GLint, LLVector4>::iterator iter = mValue.find(mUniform[index]);
if (iter == mValue.end() || iter->second.mV[0] != x)
{
glUniform1iARB(mUniform[index], x);
mValue[mUniform[index]] = LLVector4(x, 0.f, 0.f, 0.f);
}
}
}
}
GLint LLGLSLShader::getUniformLocation(const LLStaticHashedString& uniform)
{
GLint ret = -1;

1
indra/llrender/llglslshader.h
View File

@ -125,7 +125,6 @@ public:
void uniform3fv(const LLStaticHashedString& uniform, U32 count, const GLfloat* v);
void uniform4fv(const LLStaticHashedString& uniform, U32 count, const GLfloat* v);
void uniformMatrix4fv(const LLStaticHashedString& uniform, U32 count, GLboolean transpose, const GLfloat *v);
void uniform1b(U32 index, GLboolean b);
void setMinimumAlpha(F32 minimum);

8
indra/llrender/llrender.cpp
View File

@ -1466,14 +1466,6 @@ U32 LLRender::getMatrixMode()
return mMatrixMode;
}
void LLRender::setInverseTexCoordByY(bool v)
{
LLGLSLShader* shader = LLGLSLShader::sCurBoundShaderPtr;
if (shader)
{
shader->uniform1b(LLShaderMgr::INVERSE_TEX_Y, v);
}
}
void LLRender::loadIdentity()
{

1
indra/llrender/llrender.h
View File

@ -355,7 +355,6 @@ public:
void multMatrix(const GLfloat* m);
void matrixMode(U32 mode);
U32 getMatrixMode();
void setInverseTexCoordByY(bool v);
const glh::matrix4f& getModelviewMatrix();
const glh::matrix4f& getProjectionMatrix();

1
indra/llrender/llshadermgr.cpp
View File

@ -1190,7 +1190,6 @@ void LLShaderMgr::initAttribsAndUniforms()
mReservedUniforms.push_back("origin");
mReservedUniforms.push_back("display_gamma");
mReservedUniforms.push_back("invert_tex_y");
llassert(mReservedUniforms.size() == END_RESERVED_UNIFORMS);
std::set<std::string> dupe_check;

3
indra/llrender/llshadermgr.h
View File

@ -215,8 +215,7 @@ public:
TERRAIN_ALPHARAMP,
SHINY_ORIGIN,
DISPLAY_GAMMA,
INVERSE_TEX_Y,
DISPLAY_GAMMA,
END_RESERVED_UNIFORMS
} eGLSLReservedUniforms;

11
indra/newview/app_settings/shaders/class1/deferred/diffuseV.glsl
View File

@ -26,13 +26,6 @@
uniform mat3 normal_matrix;
uniform mat4 texture_matrix0;
uniform mat4 modelview_projection_matrix;
uniform bool invert_tex_y = false;
const mat4 invTexM = mat4(
1, 0, 0, 0,
0,-1, 0, 0,
0, 0, 1, 0,
0, 0, 0, 1
);
ATTRIBUTE vec3 position;
ATTRIBUTE vec4 diffuse_color;
@ -51,10 +44,6 @@ void main()
//transform vertex
gl_Position = modelview_projection_matrix * vec4(position.xyz, 1.0);
vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
if(invert_tex_y)
{
vary_texcoord0 = vec2(invTexM * vec4(vary_texcoord0,0,1)).xy;
}
passTextureIndex();
vary_normal = normalize(normal_matrix * normal);

11
indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl
View File

@ -26,13 +26,6 @@
uniform mat4 texture_matrix0;
uniform mat4 modelview_matrix;
uniform mat4 modelview_projection_matrix;
uniform bool invert_tex_y = false;
const mat4 invTexM = mat4(
1, 0, 0, 0,
0,-1, 0, 0,
0, 0, 1, 0,
0, 0, 0, 1
);
ATTRIBUTE vec3 position;
@ -69,10 +62,6 @@ void main()
#endif
vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
if(invert_tex_y)
{
vary_texcoord0 = vec2(invTexM * vec4(vary_texcoord0,0,1)).xy;
}
calcAtmospherics(pos.xyz);

13
indra/newview/app_settings/shaders/class1/objects/fullbrightV.glsl
View File

@ -26,14 +26,6 @@
uniform mat4 texture_matrix0;
uniform mat4 modelview_matrix;
uniform mat4 modelview_projection_matrix;
uniform bool invert_tex_y = false;
const mat4 invTexM = mat4(
1, 0, 0, 0,
0,-1, 0, 0,
0, 0, 1, 0,
0, 0, 0, 1
);
ATTRIBUTE vec3 position;
void passTextureIndex();
@ -57,11 +49,6 @@ void main()
vec4 pos = (modelview_matrix * vert);
gl_Position = modelview_projection_matrix*vec4(position.xyz, 1.0);
vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
if(invert_tex_y)
{
vary_texcoord0 = vec2(invTexM * vec4(vary_texcoord0,0,1)).xy;
}
calcAtmospherics(pos.xyz);

12
indra/newview/app_settings/shaders/class1/objects/simpleV.glsl
View File

@ -27,13 +27,6 @@ uniform mat3 normal_matrix;
uniform mat4 texture_matrix0;
uniform mat4 modelview_matrix;
uniform mat4 modelview_projection_matrix;
uniform bool invert_tex_y = false;
const mat4 invTexM = mat4(
1, 0, 0, 0,
0,-1, 0, 0,
0, 0, 1, 0,
0, 0, 0, 1
);
ATTRIBUTE vec3 position;
void passTextureIndex();
@ -58,10 +51,7 @@ void main()
gl_Position = modelview_projection_matrix*vec4(position.xyz, 1.0);
vary_texcoord0 = (texture_matrix0 * vec4(texcoord0, 0, 1)).xy;
if(invert_tex_y)
{
vary_texcoord0 = vec2(invTexM * vec4(vary_texcoord0,0,1)).xy;
}
vec3 norm = normalize(normal_matrix * normal);

45
indra/newview/lldrawpool.cpp
View File

@ -473,10 +473,6 @@ void LLRenderPass::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture, BOOL ba
if (params.mTextureList[i].notNull())
{
gGL.getTexUnit(i)->bind(params.mTextureList[i], TRUE);
if (LLViewerTexture::MEDIA_TEXTURE == params.mTextureList[i]->getType())
{
gGL.setInverseTexCoordByY(true);
}
}
}
}
@ -486,54 +482,13 @@ void LLRenderPass::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture, BOOL ba
{
params.mTexture->addTextureStats(params.mVSize);
gGL.getTexUnit(0)->bind(params.mTexture, TRUE) ;
if (!gPipeline.mVertexShadersEnabled)
{
if (LLViewerTexture::MEDIA_TEXTURE == params.mTexture->getType() && !params.mTextureMatrix)
{
static const float fIdntInvY[] = {
1, 0, 0, 0,
0, -1, 0, 0,
0, 0, 1, 0,
0, 0, 0, 1
};
gGL.getTexUnit(0)->activate();
gGL.matrixMode(LLRender::MM_TEXTURE);
gGL.loadMatrix((GLfloat*)fIdntInvY);
gPipeline.mTextureMatrixOps++;
tex_setup = true;
}
}
else
{
gGL.setInverseTexCoordByY(LLViewerTexture::MEDIA_TEXTURE == params.mTexture->getType());
}
if (params.mTextureMatrix)
{
tex_setup = true;
gGL.getTexUnit(0)->activate();
gGL.matrixMode(LLRender::MM_TEXTURE);
gGL.loadMatrix((GLfloat*) params.mTextureMatrix->mMatrix);
if (LLViewerTexture::MEDIA_TEXTURE == params.mTexture->getType() && !gPipeline.mVertexShadersEnabled)
{
static const float fIdntInvY[] = {
1, 0, 0, 0,
0, -1, 0, 0,
0, 0, 1, 0,
0, 0, 0, 1
};
gGL.multMatrix(fIdntInvY);
gPipeline.mMatrixOpCount++;
}
gPipeline.mTextureMatrixOps++;
tex_setup = true;
}
}
else