[Bf-blender-cvs] [d2153b9f135] temp-gpu-compute-shaders: Small cleanupSmall cleanups, s,

[Jeroen Bakker]

Commit: d2153b9f135e5b538b12a35a4bd607375f630a90
Author: Jeroen Bakker
Date:   Wed Apr 28 11:59:39 2021 +0200
Branches: temp-gpu-compute-shaders
https://developer.blender.org/rBd2153b9f135e5b538b12a35a4bd607375f630a90

Small cleanupSmall cleanups,s,

===================================================================

M	source/blender/gpu/GPU_state.h
M	source/blender/gpu/opengl/gl_state.hh
M	source/blender/gpu/opengl/gl_vertex_buffer.cc

===================================================================

diff --git a/source/blender/gpu/GPU_state.h b/source/blender/gpu/GPU_state.h
index 16106e3053b..a338728804c 100644
--- a/source/blender/gpu/GPU_state.h
+++ b/source/blender/gpu/GPU_state.h
@@ -39,8 +39,7 @@ typedef enum eGPUBarrier {
   GPU_BARRIER_NONE = 0,
   GPU_BARRIER_SHADER_IMAGE_ACCESS = (1 << 0),
   GPU_BARRIER_TEXTURE_FETCH = (1 << 1),
-  GPU_BARRIER_VERTEX_ATTRIB_ARRAY = (1 << 2),
-  GPU_BARRIER_SHADER_STORAGE = (1 << 3),
+  GPU_BARRIER_SHADER_STORAGE = (1 << 2),
 } eGPUBarrier;
 
 ENUM_OPERATORS(eGPUBarrier, GPU_BARRIER_TEXTURE_FETCH)
diff --git a/source/blender/gpu/opengl/gl_state.hh b/source/blender/gpu/opengl/gl_state.hh
index c1dc814eb24..3b4b40b1d10 100644
--- a/source/blender/gpu/opengl/gl_state.hh
+++ b/source/blender/gpu/opengl/gl_state.hh
@@ -121,9 +121,6 @@ static inline GLbitfield to_gl(eGPUBarrier barrier_bits)
   if (barrier_bits & GPU_BARRIER_TEXTURE_FETCH) {
     barrier |= GL_TEXTURE_FETCH_BARRIER_BIT;
   }
-  if (barrier_bits & GPU_BARRIER_VERTEX_ATTRIB_ARRAY) {
-    barrier |= GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT;
-  }
   if (barrier_bits & GPU_BARRIER_SHADER_STORAGE) {
     barrier |= GL_SHADER_STORAGE_BARRIER_BIT;
   }
diff --git a/source/blender/gpu/opengl/gl_vertex_buffer.cc b/source/blender/gpu/opengl/gl_vertex_buffer.cc
index 1a18d1f5f8e..d2c98f0a637 100644
--- a/source/blender/gpu/opengl/gl_vertex_buffer.cc
+++ b/source/blender/gpu/opengl/gl_vertex_buffer.cc
@@ -63,7 +63,7 @@ void GLVertBuf::duplicate_data(VertBuf *dst_)
   BLI_assert(GLContext::get() != nullptr);
   GLVertBuf *src = this;
   GLVertBuf *dst = static_cast<GLVertBuf *>(dst_);
-  /* TODO(jbakker): Device only duplication of vertex buffers not supported yet. */
+  /* TODO(jbakker): Duplication of device only vertex buffers is not supported yet. */
   BLI_assert((src->usage_ != GPU_USAGE_DEVICE_ONLY) && (dst->usage_ != GPU_USAGE_DEVICE_ONLY));
 
   if (src->vbo_id_ != 0) {