diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-04-15 14:13:57 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-04-15 14:13:57 -0500 |
| commit | af6133dfa5c6f4e3a00752f2885bd2f30c0e1c8c (patch) | |
| tree | 71335616be646d8dd8e793732b508ea77ed197db /indra/llrender/llvertexbuffer.h | |
| parent | 7e7ff13b49f6f806a385bd92d675123ff7db7232 (diff) | |
| parent | 6a491424677086a84d180ace0b91f1eefaeb67ba (diff) | |
merge
Diffstat (limited to 'indra/llrender/llvertexbuffer.h')
| -rw-r--r-- | indra/llrender/llvertexbuffer.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llrender/llvertexbuffer.h b/indra/llrender/llvertexbuffer.h index 2bbc17fb12..a9f22193f8 100644 --- a/indra/llrender/llvertexbuffer.h +++ b/indra/llrender/llvertexbuffer.h @@ -56,13 +56,17 @@ protected: virtual GLuint allocateName() { GLuint name; + stop_glerror(); glGenBuffersARB(1, &name); + stop_glerror(); return name; } virtual void releaseName(GLuint name) { + stop_glerror(); glDeleteBuffersARB(1, &name); + stop_glerror(); } }; @@ -97,6 +101,8 @@ public: static void initClass(bool use_vbo, bool no_vbo_mapping); static void cleanupClass(); static void setupClientArrays(U32 data_mask); + static void drawArrays(U32 mode, const std::vector<LLVector3>& pos, const std::vector<LLVector3>& norm); + static void clientCopy(F64 max_time = 0.005); //copy data from client to GL static void unbind(); //unbind any bound vertex buffer |