summaryrefslogtreecommitdiff
path: root/indra/llrender/llrender.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llrender/llrender.cpp')
-rw-r--r--indra/llrender/llrender.cpp36
1 files changed, 0 insertions, 36 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index 7f4ae89657..f28eefcb63 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -2084,12 +2084,6 @@ void LLRender::diffuseColor3f(F32 r, F32 g, F32 b)
{
shader->uniform4f(LLShaderMgr::DIFFUSE_COLOR, r,g,b,1.f);
}
-#if GL_VERSION_1_1
- else
- {
- glColor3f(r,g,b);
- }
-#endif
}
void LLRender::diffuseColor3fv(const F32* c)
@@ -2101,12 +2095,6 @@ void LLRender::diffuseColor3fv(const F32* c)
{
shader->uniform4f(LLShaderMgr::DIFFUSE_COLOR, c[0], c[1], c[2], 1.f);
}
-#if GL_VERSION_1_1
- else
- {
- glColor3fv(c);
- }
-#endif
}
void LLRender::diffuseColor4f(F32 r, F32 g, F32 b, F32 a)
@@ -2118,12 +2106,6 @@ void LLRender::diffuseColor4f(F32 r, F32 g, F32 b, F32 a)
{
shader->uniform4f(LLShaderMgr::DIFFUSE_COLOR, r,g,b,a);
}
-#if GL_VERSION_1_1
- else
- {
- glColor4f(r,g,b,a);
- }
-#endif
}
void LLRender::diffuseColor4fv(const F32* c)
@@ -2135,12 +2117,6 @@ void LLRender::diffuseColor4fv(const F32* c)
{
shader->uniform4fv(LLShaderMgr::DIFFUSE_COLOR, 1, c);
}
-#if GL_VERSION_1_1
- else
- {
- glColor4fv(c);
- }
-#endif
}
void LLRender::diffuseColor4ubv(const U8* c)
@@ -2152,12 +2128,6 @@ void LLRender::diffuseColor4ubv(const U8* c)
{
shader->uniform4f(LLShaderMgr::DIFFUSE_COLOR, c[0]/255.f, c[1]/255.f, c[2]/255.f, c[3]/255.f);
}
-#if GL_VERSION_1_1
- else
- {
- glColor4ubv(c);
- }
-#endif
}
void LLRender::diffuseColor4ub(U8 r, U8 g, U8 b, U8 a)
@@ -2169,12 +2139,6 @@ void LLRender::diffuseColor4ub(U8 r, U8 g, U8 b, U8 a)
{
shader->uniform4f(LLShaderMgr::DIFFUSE_COLOR, r/255.f, g/255.f, b/255.f, a/255.f);
}
-#if GL_VERSION_1_1
- else
- {
- glColor4ub(r,g,b,a);
- }
-#endif
}