diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2020-08-31 16:09:15 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2020-08-31 16:15:04 +0300 |
commit | a1df2fc44388a92ba539f764203170902dd2a663 (patch) | |
tree | 7e7c4f6467a024fb1abd0643f79ec6ec70a37822 /source/blender/gpu/opengl | |
parent | 1804eb57fd27fceb0ed113e3ef2f4a55db0d03c8 (diff) |
Cleanup: GPU: Remove unused attr_binding and primitive code
Diffstat (limited to 'source/blender/gpu/opengl')
-rw-r--r-- | source/blender/gpu/opengl/gl_batch.cc | 4 | ||||
-rw-r--r-- | source/blender/gpu/opengl/gl_drawlist.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/gpu/opengl/gl_batch.cc b/source/blender/gpu/opengl/gl_batch.cc index 7d6270bca93..bc951736db3 100644 --- a/source/blender/gpu/opengl/gl_batch.cc +++ b/source/blender/gpu/opengl/gl_batch.cc @@ -32,11 +32,11 @@ #include "GPU_extensions.h" #include "gpu_batch_private.hh" -#include "gpu_primitive_private.h" #include "gpu_shader_private.hh" #include "gl_batch.hh" #include "gl_context.hh" +#include "gl_primitive.hh" #include "gl_vertex_array.hh" using namespace blender::gpu; @@ -335,7 +335,7 @@ void GLBatch::draw(int v_first, int v_count, int i_first, int i_count) BLI_assert(v_count > 0 && i_count > 0); - GLenum gl_type = convert_prim_type_to_gl(prim_type); + GLenum gl_type = to_gl(prim_type); if (elem) { const GPUIndexBuf *el = elem; diff --git a/source/blender/gpu/opengl/gl_drawlist.cc b/source/blender/gpu/opengl/gl_drawlist.cc index 16ea924d8dc..35fecc859b8 100644 --- a/source/blender/gpu/opengl/gl_drawlist.cc +++ b/source/blender/gpu/opengl/gl_drawlist.cc @@ -33,10 +33,10 @@ #include "gpu_context_private.hh" #include "gpu_drawlist_private.hh" -#include "gpu_primitive_private.h" #include "gl_backend.hh" #include "gl_drawlist.hh" +#include "gl_primitive.hh" #include <limits.h> @@ -199,7 +199,7 @@ void GLDrawList::submit(void) * case where only a few instances are needed to finish filling a call buffer. */ const bool is_finishing_a_buffer = (command_offset_ >= data_size_); if (command_len_ > 2 || is_finishing_a_buffer) { - GLenum prim = convert_prim_type_to_gl(batch_->prim_type); + GLenum prim = to_gl(batch_->prim_type); void *offset = (void *)data_offset_; glBindBuffer(GL_DRAW_INDIRECT_BUFFER, buffer_id_); |