summaryrefslogtreecommitdiff
path: root/indra/llrender/llrender.h
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-09-15 16:38:31 -0500
committerDave Parks <davep@lindenlab.com>2011-09-15 16:38:31 -0500
commit24ae2fb5af52d7128e79a0f63afce9a8db1123eb (patch)
tree97d944e8dbe700e946f4e35b08ebeb407aaabe6b /indra/llrender/llrender.h
parentf72a24bf3a5bf7ecb826ef5e6d7f17dbb92d5db2 (diff)
SH-2243 work in progress -- don't use built-in GL light state when shaders are available.
Diffstat (limited to 'indra/llrender/llrender.h')
-rw-r--r--indra/llrender/llrender.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h
index 465c16f0de..0805ebb61a 100644
--- a/indra/llrender/llrender.h
+++ b/indra/llrender/llrender.h
@@ -239,6 +239,8 @@ public:
void setSpotDirection(const LLVector3& direction);
protected:
+ friend class LLRender;
+
S32 mIndex;
bool mEnabled;
LLColor4 mDiffuse;
@@ -347,7 +349,10 @@ public:
void multMatrix(const GLdouble* m);
void matrixMode(U32 mode);
+ const glh::matrix4f& getModelviewMatrix();
+
void syncMatrices();
+ void syncLightState();
void translateUI(F32 x, F32 y, F32 z);
void scaleUI(F32 x, F32 y, F32 z);