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 | 0f2f597e7aa5011061c3ea1fef5867814ee3a5b2 (patch) | |
| tree | 72a2fcddec5d08ce9db9b97984b884bb0943e19f /indra/llrender/llrender.h | |
| parent | 0fde0686744b2c17c0ea4c0163da45e8e4648381 (diff) | |
| parent | 6cc6f816780e64c5fb1e17a22fb5e473e75efe69 (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; }; |