[Mesa-dev] [PATCH 02/17] mesa: add inlined_buffer_storage() helper

[Timothy Arceri]

This will allow us to share code between the dsa, non-dsa and
no_error variants.
---
 src/mesa/main/bufferobj.c | 47 +++++++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 0f93b0f..4afa2ee 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -1584,54 +1584,61 @@ buffer_storage(struct gl_context *ctx, struct gl_buffer_object *bufObj,
           * said that it should behave the same as glBufferData.
           */
          _mesa_error(ctx, GL_INVALID_OPERATION, "%s", func);
       }
       else {
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "%s", func);
       }
    }
 }
 
-void GLAPIENTRY
-_mesa_BufferStorage(GLenum target, GLsizeiptr size, const GLvoid *data,
-                    GLbitfield flags)
+
+static ALWAYS_INLINE void
+inlined_buffer_storage(GLenum target, GLuint buffer, GLsizeiptr size,
+                       const GLvoid *data, GLbitfield flags, bool dsa,
+                       const char *func)
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_buffer_object *bufObj;
-   const char *func = "glBufferStorage";
 
-   bufObj = get_buffer(ctx, func, target, GL_INVALID_OPERATION);
-   if (!bufObj)
-      return;
+   if (dsa) {
+      bufObj = _mesa_lookup_bufferobj_err(ctx, buffer, func);
+      if (!bufObj)
+         return;
+   } else {
+      bufObj = get_buffer(ctx, func, target, GL_INVALID_OPERATION);
+      if (!bufObj)
+         return;
+   }
 
    if (validate_buffer_storage(ctx, bufObj, size, flags, func))
       buffer_storage(ctx, bufObj, target, size, data, flags, func);
 }
 
+
+void GLAPIENTRY
+_mesa_BufferStorage(GLenum target, GLsizeiptr size, const GLvoid *data,
+                    GLbitfield flags)
+{
+   inlined_buffer_storage(target, 0, size, data, flags, false,
+                          "glBufferStorage");
+}
+
 void GLAPIENTRY
 _mesa_NamedBufferStorage(GLuint buffer, GLsizeiptr size, const GLvoid *data,
                          GLbitfield flags)
 {
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_buffer_object *bufObj;
-   const char *func = "glNamedBufferStorage";
-
-   bufObj = _mesa_lookup_bufferobj_err(ctx, buffer, func);
-   if (!bufObj)
-      return;
-
-   /*
-    * In direct state access, buffer objects have an unspecified target since
-    * they are not required to be bound.
+   /* In direct state access, buffer objects have an unspecified target
+    * since they are not required to be bound.
     */
-   if (validate_buffer_storage(ctx, bufObj, size, flags, func))
-      buffer_storage(ctx, bufObj, GL_NONE, size, data, flags, func);
+   inlined_buffer_storage(GL_NONE, buffer, size, data, flags, true,
+                          "glNamedBufferStorage");
 }
 
 
 void
 _mesa_buffer_data(struct gl_context *ctx, struct gl_buffer_object *bufObj,
                   GLenum target, GLsizeiptr size, const GLvoid *data,
                   GLenum usage, const char *func)
 {
    bool valid_usage;
 
-- 
2.9.3