diff options
author | Siddhartha Jejurkar <f20180617@goa.bits-pilani.ac.in> | 2021-12-17 16:01:32 +0300 |
---|---|---|
committer | Siddhartha Jejurkar <f20180617@goa.bits-pilani.ac.in> | 2021-12-17 16:01:32 +0300 |
commit | dbc41b30f88b96f7d8c6e995b17f5930eb55cc77 (patch) | |
tree | c6c495328443ea3621e5df2ef483b0e0dd504496 /source/blender/gpu/opengl/gl_batch.cc | |
parent | 99a2af76d10e05a18987be5d554ada197b1ca086 (diff) | |
parent | 7c9e4099854a4fc8eab4db97173c1aacd25f9e08 (diff) |
Merge branch 'master' into soc-2021-uv-edge-select-supportsoc-2021-uv-edge-select-support
Diffstat (limited to 'source/blender/gpu/opengl/gl_batch.cc')
-rw-r--r-- | source/blender/gpu/opengl/gl_batch.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/gpu/opengl/gl_batch.cc b/source/blender/gpu/opengl/gl_batch.cc index fc1d1006d0d..83cb0ddd053 100644 --- a/source/blender/gpu/opengl/gl_batch.cc +++ b/source/blender/gpu/opengl/gl_batch.cc @@ -74,7 +74,6 @@ void GLVaoCache::init() vao_id_ = 0; } -/* Create a new VAO object and store it in the cache. */ void GLVaoCache::insert(const GLShaderInterface *interface, GLuint vao) { /* Now insert the cache. */ @@ -191,7 +190,6 @@ void GLVaoCache::clear() this->init(); } -/* Return 0 on cache miss (invalid VAO) */ GLuint GLVaoCache::lookup(const GLShaderInterface *interface) { const int count = (is_dynamic_vao_count) ? dynamic_vaos.count : GPU_VAO_STATIC_LEN; @@ -205,8 +203,6 @@ GLuint GLVaoCache::lookup(const GLShaderInterface *interface) return 0; } -/* The GLVaoCache object is only valid for one GLContext. - * Reset the cache if trying to draw in another context; */ void GLVaoCache::context_check() { GLContext *ctx = GLContext::get(); @@ -276,6 +272,7 @@ GLuint GLVaoCache::vao_get(GPUBatch *batch) return vao_id_; } + /** \} */ /* -------------------------------------------------------------------- */ |