[Mesa-dev] [PATCH 2/6] main: Added entry point for glTransformFeedbackBufferBase

Laura Ekstrand laura at jlekstrand.net
Mon Feb 2 13:46:26 PST 2015


On Mon, Feb 2, 2015 at 3:00 AM, Martin Peres <martin.peres at linux.intel.com>
wrote:

> v2: Review from Laura Ekstrand
> - give more helpful error messages
> - factor the lookup code for the xfb and objBuf
> - replace some already-existing tabs with spaces
> - add comments to explain the cases where xfb == 0 or buffer == 0
> - fix the condition for binding the transform buffer or not
>
> v3: Review from Laura Ekstrand
> - rename _mesa_lookup_bufferobj_err to
>   _mesa_lookup_transform_feedback_bufferobj_err and make it static to
> avoid a
>   future conflict
> - make _mesa_lookup_transform_feedback_object_err static
>
> Signed-off-by: Martin Peres <martin.peres at linux.intel.com>
> ---
>  src/mapi/glapi/gen/ARB_direct_state_access.xml |   6 ++
>  src/mesa/main/bufferobj.c                      |   9 +-
>  src/mesa/main/tests/dispatch_sanity.cpp        |   1 +
>  src/mesa/main/transformfeedback.c              | 138
> +++++++++++++++++++------
>  src/mesa/main/transformfeedback.h              |  11 +-
>  5 files changed, 129 insertions(+), 36 deletions(-)
>
> diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml
> b/src/mapi/glapi/gen/ARB_direct_state_access.xml
> index 15b00c2..35d6906 100644
> --- a/src/mapi/glapi/gen/ARB_direct_state_access.xml
> +++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml
> @@ -14,6 +14,12 @@
>        <param name="ids" type="GLuint *" />
>     </function>
>
> +   <function name="TransformFeedbackBufferBase" offset="assign">
> +      <param name="xfb" type="GLuint" />
> +      <param name="index" type="GLuint" />
> +      <param name="buffer" type="GLuint" />
> +   </function>
> +
>     <!-- Texture object functions -->
>
>     <function name="CreateTextures" offset="assign">
> diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
> index 0c1ce98..86532ea 100644
> --- a/src/mesa/main/bufferobj.c
> +++ b/src/mesa/main/bufferobj.c
> @@ -3546,8 +3546,9 @@ _mesa_BindBufferRange(GLenum target, GLuint index,
>
>     switch (target) {
>     case GL_TRANSFORM_FEEDBACK_BUFFER:
> -      _mesa_bind_buffer_range_transform_feedback(ctx, index, bufObj,
> -                                                offset, size);
> +      _mesa_bind_buffer_range_transform_feedback(ctx,
> +
>  ctx->TransformFeedback.CurrentObject,
> +                                                 index, bufObj, offset,
> size);
>        return;
>     case GL_UNIFORM_BUFFER:
>        bind_buffer_range_uniform_buffer(ctx, index, bufObj, offset, size);
> @@ -3611,7 +3612,9 @@ _mesa_BindBufferBase(GLenum target, GLuint index,
> GLuint buffer)
>
>     switch (target) {
>     case GL_TRANSFORM_FEEDBACK_BUFFER:
> -      _mesa_bind_buffer_base_transform_feedback(ctx, index, bufObj);
> +      _mesa_bind_buffer_base_transform_feedback(ctx,
> +
> ctx->TransformFeedback.CurrentObject,
> +                                                index, bufObj, false);
>        return;
>     case GL_UNIFORM_BUFFER:
>        bind_buffer_base_uniform_buffer(ctx, index, bufObj);
> diff --git a/src/mesa/main/tests/dispatch_sanity.cpp
> b/src/mesa/main/tests/dispatch_sanity.cpp
> index 5e7f7ae..166401a 100644
> --- a/src/mesa/main/tests/dispatch_sanity.cpp
> +++ b/src/mesa/main/tests/dispatch_sanity.cpp
> @@ -956,6 +956,7 @@ const struct function gl_core_functions_possible[] = {
>
>     /* GL_ARB_direct_state_access */
>     { "glCreateTransformFeedbacks", 45, -1 },
> +   { "glTransformFeedbackBufferBase", 45, -1 },
>     { "glCreateTextures", 45, -1 },
>     { "glTextureStorage1D", 45, -1 },
>     { "glTextureStorage2D", 45, -1 },
> diff --git a/src/mesa/main/transformfeedback.c
> b/src/mesa/main/transformfeedback.c
> index 466d401..268360b 100644
> --- a/src/mesa/main/transformfeedback.c
> +++ b/src/mesa/main/transformfeedback.c
> @@ -514,22 +514,24 @@ _mesa_EndTransformFeedback(void)
>   * Helper used by BindBufferRange() and BindBufferBase().
>   */
>  static void
> -bind_buffer_range(struct gl_context *ctx, GLuint index,
> +bind_buffer_range(struct gl_context *ctx,
> +                  struct gl_transform_feedback_object *obj,
> +                  GLuint index,
>                    struct gl_buffer_object *bufObj,
> -                  GLintptr offset, GLsizeiptr size)
> +                  GLintptr offset, GLsizeiptr size,
> +                  bool dsa)
>  {
> -   struct gl_transform_feedback_object *obj =
> -      ctx->TransformFeedback.CurrentObject;
> -
>     /* Note: no need to FLUSH_VERTICES or flag NewTransformFeedback,
> because
>      * transform feedback buffers can't be changed while transform
> feedback is
>      * active.
>      */
>
> -   /* The general binding point */
> -   _mesa_reference_buffer_object(ctx,
> -                                 &ctx->TransformFeedback.CurrentBuffer,
> -                                 bufObj);
> +   if (!dsa) {
> +      /* The general binding point */
> +      _mesa_reference_buffer_object(ctx,
> +                                    &ctx->TransformFeedback.CurrentBuffer,
> +                                    bufObj);
> +   }
>
>     /* The per-attribute binding point */
>     _mesa_set_transform_feedback_binding(ctx, obj, index, bufObj, offset,
> size);
> @@ -543,15 +545,12 @@ bind_buffer_range(struct gl_context *ctx, GLuint
> index,
>   */
>  void
>  _mesa_bind_buffer_range_transform_feedback(struct gl_context *ctx,
> -                                          GLuint index,
> -                                          struct gl_buffer_object *bufObj,
> -                                          GLintptr offset,
> -                                          GLsizeiptr size)
>
These don't line up?  Check for tabs here.  (Mesa uses 3-space indents)

> +                                           struct
> gl_transform_feedback_object *obj,
> +                                           GLuint index,
> +                                           struct gl_buffer_object
> *bufObj,
> +                                           GLintptr offset,
> +                                           GLsizeiptr size)
>  {
> -   struct gl_transform_feedback_object *obj;
> -
> -   obj = ctx->TransformFeedback.CurrentObject;
> -
>     if (obj->Active) {
>        _mesa_error(ctx, GL_INVALID_OPERATION,
>                    "glBindBufferRange(transform feedback active)");
> @@ -559,13 +558,15 @@ _mesa_bind_buffer_range_transform_feedback(struct
> gl_context *ctx,
>     }
>
>     if (index >= ctx->Const.MaxTransformFeedbackBuffers) {
> -      _mesa_error(ctx, GL_INVALID_VALUE, "glBindBufferRange(index=%d)",
> index);
> +      _mesa_error(ctx, GL_INVALID_VALUE, "glBindBufferRange(index=%d "
> +                  "out of bounds)", index);
>        return;
>     }
>
>     if (size & 0x3) {
>        /* must a multiple of four */
> -      _mesa_error(ctx, GL_INVALID_VALUE, "glBindBufferRange(size=%d)",
> (int) size);
> +      _mesa_error(ctx, GL_INVALID_VALUE, "glBindBufferRange(size=%d)",
> +                  (int) size);
>        return;
>     }
>
> @@ -576,38 +577,109 @@ _mesa_bind_buffer_range_transform_feedback(struct
> gl_context *ctx,
>        return;
>     }
>
> -   bind_buffer_range(ctx, index, bufObj, offset, size);
> +   bind_buffer_range(ctx, obj, index, bufObj, offset, size, false);
>  }
>
>
>  /**
>   * Specify a buffer object to receive transform feedback results.
>   * As above, but start at offset = 0.
> - * Called from the glBindBufferBase() function.
> + * Called from the glBindBufferBase() and glTransformFeedbackBufferBase()
> + * functions.
>   */
>  void
>  _mesa_bind_buffer_base_transform_feedback(struct gl_context *ctx,
> -                                         GLuint index,
> -                                         struct gl_buffer_object *bufObj)
> +                                          struct
> gl_transform_feedback_object *obj,
> +                                          GLuint index,
> +                                          struct gl_buffer_object *bufObj,
> +                                          bool dsa)
>  {
> -   struct gl_transform_feedback_object *obj;
> -
> -   obj = ctx->TransformFeedback.CurrentObject;
> -
>     if (obj->Active) {
>        _mesa_error(ctx, GL_INVALID_OPERATION,
> -                  "glBindBufferBase(transform feedback active)");
> +                  "%s(transform feedback active)",
> +                  dsa?"glTransformFeedbackBufferBase":"glBindBufferBase");
>        return;
>     }
>
>     if (index >= ctx->Const.MaxTransformFeedbackBuffers) {
> -      _mesa_error(ctx, GL_INVALID_VALUE, "glBindBufferBase(index=%d)",
> index);
> +      _mesa_error(ctx, GL_INVALID_VALUE, "%s(index=%d out of bounds)",
> +                  dsa?"glTransformFeedbackBufferBase":"glBindBufferBase",
> +                  index);
>        return;
>     }
>
> -   bind_buffer_range(ctx, index, bufObj, 0, 0);
> +   bind_buffer_range(ctx, obj, index, bufObj, 0, 0, dsa);
>  }
>
> +/**
> + * Wrapper around _mesa_lookup_transform_feedback_object that throws
> + * GL_INVALID_OPERATION if id is not in the hash table. After calling
> + * _mesa_error, it returns NULL.
> + */
> +static struct gl_transform_feedback_object *
> +_mesa_lookup_transform_feedback_object_err(struct gl_context *ctx,
> +                                           GLuint xfb, const char* func)
> +{
> +   struct gl_transform_feedback_object *obj;
> +
> +   obj = _mesa_lookup_transform_feedback_object(ctx, xfb);
> +   if (!obj) {
> +      _mesa_error(ctx, GL_INVALID_OPERATION,
> +                  "%s(xfb=%u: non-generated object name)", func, xfb);
> +   }
> +
> +   return obj;
> +}
> +
> +/**
> + * Wrapper around _mesa_lookup_bufferobj that throws GL_INVALID_VALUE if
> id
> + * is not in the hash table. Specialised version for the
> + * transform-feedback-related functions. After calling _mesa_error, it
> + * returns NULL.
> + */
> +static struct gl_buffer_object *
> +_mesa_lookup_transform_feedback_bufferobj_err(struct gl_context *ctx,
> +                                              GLuint buffer, const char*
> func)
> +{
> +   struct gl_buffer_object *bufObj;
> +
>
It'd be nice to include the PDF page.

> +   /* OpenGL 4.5 core profile, 13.2: buffer must be zero or the name of an
> +    * existing buffer object.
> +    */
> +   if (buffer == 0) {
> +      bufObj = ctx->Shared->NullBufferObj;
> +   } else {
> +      bufObj = _mesa_lookup_bufferobj(ctx, buffer);
> +      if (!bufObj) {
> +         _mesa_error(ctx, GL_INVALID_VALUE, "%s(invalid buffer=%u)", func,
> +                     buffer);
> +      }
> +   }
> +
> +   return bufObj;
> +}
> +
> +void GLAPIENTRY
> +_mesa_TransformFeedbackBufferBase(GLuint xfb, GLuint index, GLuint buffer)
> +{
> +   GET_CURRENT_CONTEXT(ctx);
> +   struct gl_transform_feedback_object *obj;
> +   struct gl_buffer_object *bufObj;
> +
> +   obj = _mesa_lookup_transform_feedback_object_err(ctx, xfb,
> +
>  "glTransformFeedbackBufferBase");
> +   if(!obj) {
> +      return;
> +   }
> +
> +   bufObj = _mesa_lookup_transform_feedback_bufferobj_err(ctx, buffer,
> +                                       "glTransformFeedbackBufferBase");
> +   if(!bufObj) {
> +      return;
> +   }
> +
> +   _mesa_bind_buffer_base_transform_feedback(ctx, obj, index, bufObj,
> true);
> +}
>
>  /**
>   * Specify a buffer object to receive transform feedback results, plus the
> @@ -660,7 +732,7 @@ _mesa_BindBufferOffsetEXT(GLenum target, GLuint index,
> GLuint buffer,
>        return;
>     }
>
> -   bind_buffer_range(ctx, index, bufObj, offset, 0);
> +   bind_buffer_range(ctx, obj, index, bufObj, offset, 0, false);
>  }
>
>
> @@ -817,6 +889,10 @@ _mesa_GetTransformFeedbackVarying(GLuint program,
> GLuint index,
>  struct gl_transform_feedback_object *
>  _mesa_lookup_transform_feedback_object(struct gl_context *ctx, GLuint
> name)
>  {
>
Again, a page number would be nice, but not necessary.

> +   /* OpenGL 4.5 core profile, 13.2: xfb must be zero, indicating the
> default
> +    * transform feedback object, or the name of an existing transform
> +    * feedback object.
> +    */
>     if (name == 0) {
>        return ctx->TransformFeedback.DefaultObject;
>     }
> diff --git a/src/mesa/main/transformfeedback.h
> b/src/mesa/main/transformfeedback.h
> index d598533..5a93302 100644
> --- a/src/mesa/main/transformfeedback.h
> +++ b/src/mesa/main/transformfeedback.h
> @@ -65,6 +65,7 @@ _mesa_EndTransformFeedback(void);
>
>  extern void
>  _mesa_bind_buffer_range_transform_feedback(struct gl_context *ctx,
> +                                          struct
> gl_transform_feedback_object *obj,
>                                            GLuint index,
>                                            struct gl_buffer_object *bufObj,
>                                            GLintptr offset,
> @@ -72,9 +73,10 @@ _mesa_bind_buffer_range_transform_feedback(struct
> gl_context *ctx,
>
>  extern void
>  _mesa_bind_buffer_base_transform_feedback(struct gl_context *ctx,
> +                                         struct
> gl_transform_feedback_object *obj,
>                                           GLuint index,
> -                                         struct gl_buffer_object *bufObj);
> -
> +                                         struct gl_buffer_object *bufObj,
> +                                         bool dsa);
>  extern void GLAPIENTRY
>  _mesa_BindBufferOffsetEXT(GLenum target, GLuint index, GLuint buffer,
>                            GLintptr offset);
> @@ -147,4 +149,9 @@ _mesa_set_transform_feedback_binding(struct gl_context
> *ctx,
>     tfObj->RequestedSize[index] = size;
>  }
>
> +/*** GL_ARB_direct_state_access ***/
> +
> +extern void GLAPIENTRY
> +_mesa_TransformFeedbackBufferBase(GLuint xfb, GLuint index, GLuint
> buffer);
> +
>  #endif /* TRANSFORM_FEEDBACK_H */
> --
> 2.2.2
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20150202/17fd657d/attachment-0001.html>


More information about the mesa-dev mailing list