[Bf-blender-cvs] [ef4a315e725] temp-gpu-compute-shaders: Remove obsolete `attach_buffers`.
Jeroen Bakker
noreply at git.blender.org
Fri May 7 14:08:28 CEST 2021
Commit: ef4a315e725b26a54728f27dd0f510d059daa723
Author: Jeroen Bakker
Date: Fri May 7 14:08:20 2021 +0200
Branches: temp-gpu-compute-shaders
https://developer.blender.org/rBef4a315e725b26a54728f27dd0f510d059daa723
Remove obsolete `attach_buffers`.
===================================================================
M source/blender/gpu/intern/gpu_shader_private.hh
M source/blender/gpu/opengl/gl_shader.cc
M source/blender/gpu/opengl/gl_shader.hh
===================================================================
diff --git a/source/blender/gpu/intern/gpu_shader_private.hh b/source/blender/gpu/intern/gpu_shader_private.hh
index 1e2e2e0da64..281f01dbc22 100644
--- a/source/blender/gpu/intern/gpu_shader_private.hh
+++ b/source/blender/gpu/intern/gpu_shader_private.hh
@@ -57,9 +57,6 @@ class Shader {
virtual bool transform_feedback_enable(GPUVertBuf *) = 0;
virtual void transform_feedback_disable(void) = 0;
- virtual void attach_buffer(GPUVertBuf *vertex_buffer, uint location) = 0;
- virtual void attach_buffer(GPUIndexBuf *index_buffer, uint location) = 0;
-
virtual void bind(void) = 0;
virtual void unbind(void) = 0;
diff --git a/source/blender/gpu/opengl/gl_shader.cc b/source/blender/gpu/opengl/gl_shader.cc
index e8c89f87a8a..e77347d99eb 100644
--- a/source/blender/gpu/opengl/gl_shader.cc
+++ b/source/blender/gpu/opengl/gl_shader.cc
@@ -300,30 +300,6 @@ void GLShader::transform_feedback_disable()
/** \} */
-/* -------------------------------------------------------------------- */
-/** \name Attach buffers
- * \{ */
-
-void GLShader::attach_buffer(GPUVertBuf *vertex_buffer_, unsigned int location)
-{
- BLI_assert(GPU_compute_shader_support());
- GLVertBuf *vertex_buffer = static_cast<GLVertBuf *>(unwrap(vertex_buffer_));
- vertex_buffer->bind();
- BLI_assert(vertex_buffer->vbo_id_ != 0);
- glBindBufferBase(GL_SHADER_STORAGE_BUFFER, location, vertex_buffer->vbo_id_);
-}
-
-void GLShader::attach_buffer(GPUIndexBuf *index_buffer_, unsigned int location)
-{
- BLI_assert(GPU_compute_shader_support());
- GLIndexBuf *index_buffer = static_cast<GLIndexBuf *>(unwrap(index_buffer_));
- index_buffer->bind();
- BLI_assert(index_buffer->ibo_id_ != 0);
- glBindBufferBase(GL_SHADER_STORAGE_BUFFER, location, index_buffer->ibo_id_);
-}
-
-/** \} */
-
/* -------------------------------------------------------------------- */
/** \name Uniforms setters
* \{ */
diff --git a/source/blender/gpu/opengl/gl_shader.hh b/source/blender/gpu/opengl/gl_shader.hh
index 88748f08c54..48aaaf2283d 100644
--- a/source/blender/gpu/opengl/gl_shader.hh
+++ b/source/blender/gpu/opengl/gl_shader.hh
@@ -65,9 +65,6 @@ class GLShader : public Shader {
bool transform_feedback_enable(GPUVertBuf *buf) override;
void transform_feedback_disable(void) override;
- void attach_buffer(GPUVertBuf *vertex_buffer, uint location) override;
- void attach_buffer(GPUIndexBuf *index_buffer, uint location) override;
-
void bind(void) override;
void unbind(void) override;
More information about the Bf-blender-cvs
mailing list