diff options
| author | Richard Linden <none@none> | 2010-07-27 10:30:17 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-07-27 10:30:17 -0700 |
| commit | b4dfa76c9de73c6bebf54d6112b699a1e654ba63 (patch) | |
| tree | 72a2fcddec5d08ce9db9b97984b884bb0943e19f /indra/llrender/llrender.h | |
| parent | c8316be258cdf9252c2d1bec0f223bc4245ff205 (diff) | |
| parent | 50d8cc6d377b90b27c57b390eb6626223a1685a7 (diff) | |
merge
Diffstat (limited to 'indra/llrender/llrender.h')
| -rw-r--r-- | indra/llrender/llrender.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h index f6c87aa1db..0fa503182e 100644 --- a/indra/llrender/llrender.h +++ b/indra/llrender/llrender.h @@ -317,6 +317,10 @@ public: void color3fv(const GLfloat* c); void color4ubv(const GLubyte* c); + void vertexBatchPreTransformed(LLVector3* verts, S32 vert_count); + void vertexBatchPreTransformed(LLVector3* verts, LLVector2* uvs, S32 vert_count); + void vertexBatchPreTransformed(LLVector3* verts, LLVector2* uvs, LLColor4U*, S32 vert_count); + void setColorMask(bool writeColor, bool writeAlpha); void setColorMask(bool writeColorR, bool writeColorG, bool writeColorB, bool writeAlpha); void setSceneBlendType(eBlendType type); @@ -373,8 +377,8 @@ private: F32 mMaxAnisotropy; - std::list<LLVector3> mUIOffset; - std::list<LLVector3> mUIScale; + std::vector<LLVector3> mUIOffset; + std::vector<LLVector3> mUIScale; }; |