[Mesa-dev] [PATCH 1/3] mesa : move bindbuffer{base, range} from transformfeedback.c

Ian Romanick idr at freedesktop.org
Mon Nov 21 15:26:55 PST 2011


On 11/21/2011 02:01 PM, Vincent Lejeune wrote:
>     BindBuffer* functions are part of tfb extension. They are however
>     used by others extensions such as uniform buffer object.
>     This patch moves the BindBuffer* definition to to bufferobj.c
>     where it acts as a dispatcher calling original tfb function ;
>     BindBuffer* functions can be used by others extensions, even if
>     FEATURE_EXT_transform_feedback is not defined.
> ---
>   src/mesa/main/api_exec.c          |    2 +
>   src/mesa/main/bufferobj.c         |  144 +++++++++++++++++++++++++++++++++++++
>   src/mesa/main/bufferobj.h         |   12 +++
>   src/mesa/main/transformfeedback.c |  109 +---------------------------
>   src/mesa/main/transformfeedback.h |    7 --
>   5 files changed, 159 insertions(+), 115 deletions(-)
>
> diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
> index 93214dd..0bbfa8b 100644
> --- a/src/mesa/main/api_exec.c
> +++ b/src/mesa/main/api_exec.c
> @@ -590,6 +590,8 @@ _mesa_create_exec_table(void)
>      SET_IsBufferARB(exec, _mesa_IsBufferARB);
>      SET_MapBufferARB(exec, _mesa_MapBufferARB);
>      SET_UnmapBufferARB(exec, _mesa_UnmapBufferARB);
> +   SET_BindBufferRangeEXT(exec, _mesa_BindBufferRange);
> +   SET_BindBufferBaseEXT(exec, _mesa_BindBufferBase);
>   #endif
>
>      /* ARB 29. GL_ARB_occlusion_query */
> diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
> index 431eafd..0908ce6 100644
> --- a/src/mesa/main/bufferobj.c
> +++ b/src/mesa/main/bufferobj.c
> @@ -703,6 +703,150 @@ _mesa_BindBufferARB(GLenum target, GLuint buffer)
>      bind_buffer_object(ctx, target, buffer);
>   }
>
> +/**
> + * Helper used by BindBufferRange() and BindBufferBase().
> + */
> +void
> +bind_buffer_range(struct gl_context *ctx, GLuint index,
> +                  struct gl_buffer_object *bufObj,
> +                  GLintptr offset, GLsizeiptr size);

This should be in transformfeedback.h.  It should also be renamed 
_mesa_bind_buffer_range or (based on the extern below) 
_mesa_bind_buffer_range_for_transform_feedback.

> +
> +/**
> + * Several extensions declare a BindBufferBase API function,
> + * this one dispatchs call according to target
> + */
> +void GLAPIENTRY
> +_mesa_BindBufferBase(GLenum target, GLuint index, GLuint buffer)
> +{
> +
> +/**
> + * Declare everything here to avoid declaring inside switch statement
> + */
> +#if FEATURE_EXT_transform_feedback
> +   struct gl_transform_feedback_object *obj;
> +   struct gl_buffer_object *bufObj;
> +   GLsizeiptr size;
> +#endif
> +
> +   GET_CURRENT_CONTEXT(ctx);
> +   switch (target) {
> +#if FEATURE_EXT_transform_feedback
> +      case GL_TRANSFORM_FEEDBACK_BUFFER:
> +         /**
> +          * Specify a buffer object to receive vertex shader results.
> +          * As in BindBufferRange, but start at offset = 0.
> +          */
> +         obj = ctx->TransformFeedback.CurrentObject;
> +
> +         if (obj->Active) {
> +            _mesa_error(ctx, GL_INVALID_OPERATION,
> +                        "glBindBufferBase(transform feedback active)");
> +            return;
> +         }
> +
> +         if (index>= ctx->Const.MaxTransformFeedbackSeparateAttribs) {
> +            _mesa_error(ctx, GL_INVALID_VALUE, "glBindBufferBase(index=%d)", index);
> +            return;
> +         }
> +
> +         bufObj = _mesa_lookup_bufferobj(ctx, buffer);
> +         if (!bufObj) {
> +            _mesa_error(ctx, GL_INVALID_OPERATION,
> +                        "glBindBufferBase(invalid buffer=%u)", buffer);
> +            return;
> +         }
> +
> +         /* default size is the buffer size rounded down to nearest
> +          * multiple of four.
> +          */
> +         size = bufObj->Size&  ~0x3;
> +
> +         bind_buffer_range(ctx, index, bufObj, 0, size);
> +         break;
> +#endif
> +      default:
> +         _mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferBase(target)");
> +         break;
> +   }
> +   return;
> +}
> +
> +extern void
> +BindBufferRange_TFB(GLenum target, GLuint index,
> +                      GLuint buffer, GLintptr offset, GLsizeiptr size);

It doesn't look like this is defined or used.  Should it be deleted?

> +
> +/**
> + * Several extensions declare a BindBufferRange API function,
> + * this one dispatchs call according to target
> + */
> +void GLAPIENTRY
> +_mesa_BindBufferRange(GLenum target, GLuint index,
> +                      GLuint buffer, GLintptr offset, GLsizeiptr size)
> +{
> +/**
> + * Declare everything here to avoid declaring inside switch statement
> + */
> +#if FEATURE_EXT_transform_feedback
> +   struct gl_transform_feedback_object *obj;
> +   struct gl_buffer_object *bufObj;
> +#endif
> +
> +   GET_CURRENT_CONTEXT(ctx);
> +   switch (target) {
> +#if FEATURE_EXT_transform_feedback
> +      case GL_TRANSFORM_FEEDBACK_BUFFER:
> +         /**
> +          * Specify a buffer object to receive vertex shader results.  Plus,
> +          * specify the starting offset to place the results, and max size.
> +          */
> +         obj = ctx->TransformFeedback.CurrentObject;
> +
> +         if (obj->Active) {
> +            _mesa_error(ctx, GL_INVALID_OPERATION,
> +                        "glBindBufferRange(transform feedback active)");
> +            return;
> +         }
> +
> +         if (index>= ctx->Const.MaxTransformFeedbackSeparateAttribs) {
> +            _mesa_error(ctx, GL_INVALID_VALUE, "glBindBufferRange(index=%d)", index);
> +            return;
> +         }
> +
> +         if ((size<= 0) || (size&  0x3)) {
> +            /* must be positive and multiple of four */
> +            _mesa_error(ctx, GL_INVALID_VALUE, "glBindBufferRange(size%d)", (int) size);
> +            return;
> +         }
> +
> +         if (offset&  0x3) {
> +            /* must be multiple of four */
> +            _mesa_error(ctx, GL_INVALID_VALUE,
> +                        "glBindBufferRange(offset=%d)", (int) offset);
> +            return;
> +         }
> +
> +         bufObj = _mesa_lookup_bufferobj(ctx, buffer);
> +         if (!bufObj) {
> +            _mesa_error(ctx, GL_INVALID_OPERATION,
> +                        "glBindBufferRange(invalid buffer=%u)", buffer);
> +            return;
> +         }
> +
> +         if (offset + size>= bufObj->Size) {
> +            _mesa_error(ctx, GL_INVALID_VALUE,
> +                        "glBindBufferRange(offset + size %d>  buffer size %d)",
> +                    (int) (offset + size), (int) (bufObj->Size));
> +            return;
> +         }
> +
> +         bind_buffer_range(ctx, index, bufObj, offset, size);
> +         break;
> +#endif
> +      default:
> +         _mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferRange(target)");
> +   }
> +   return;
> +}
>
>   /**
>    * Delete a set of buffer objects.
> diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
> index b4e70f2..1b3c70c 100644
> --- a/src/mesa/main/bufferobj.h
> +++ b/src/mesa/main/bufferobj.h
> @@ -154,6 +154,18 @@ _mesa_ObjectUnpurgeableAPPLE(GLenum objectType, GLuint name, GLenum option);
>
>   extern void GLAPIENTRY
>   _mesa_GetObjectParameterivAPPLE(GLenum objectType, GLuint name, GLenum pname, GLint* params);
> +
> +
> +/**
> + * These functions dont fit anywhere else, declare them here as they are related to buffers
> + */
> +extern void GLAPIENTRY
> +_mesa_BindBufferBase(GLenum target, GLuint index, GLuint buffer);
> +
> +extern void GLAPIENTRY
> +_mesa_BindBufferRange(GLenum target, GLuint index,
> +                      GLuint buffer, GLintptr offset, GLsizeiptr size);
> +
>   #endif
>
>   #endif
> diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c
> index 47efad1..da6cf5c 100644
> --- a/src/mesa/main/transformfeedback.c
> +++ b/src/mesa/main/transformfeedback.c
> @@ -329,8 +329,6 @@ _mesa_init_transform_feedback_dispatch(struct _glapi_table *disp)
>   {
>      SET_BeginTransformFeedbackEXT(disp, _mesa_BeginTransformFeedback);
>      SET_EndTransformFeedbackEXT(disp, _mesa_EndTransformFeedback);
> -   SET_BindBufferRangeEXT(disp, _mesa_BindBufferRange);
> -   SET_BindBufferBaseEXT(disp, _mesa_BindBufferBase);
>      SET_BindBufferOffsetEXT(disp, _mesa_BindBufferOffsetEXT);
>      SET_TransformFeedbackVaryingsEXT(disp, _mesa_TransformFeedbackVaryings);
>      SET_GetTransformFeedbackVaryingEXT(disp, _mesa_GetTransformFeedbackVarying);
> @@ -399,7 +397,7 @@ _mesa_EndTransformFeedback(void)
>   /**
>    * Helper used by BindBufferRange() and BindBufferBase().
>    */
> -static void
> +void
>   bind_buffer_range(struct gl_context *ctx, GLuint index,
>                     struct gl_buffer_object *bufObj,
>                     GLintptr offset, GLsizeiptr size)
> @@ -424,111 +422,6 @@ bind_buffer_range(struct gl_context *ctx, GLuint index,
>   }
>
>
> -/**
> - * Specify a buffer object to receive vertex shader results.  Plus,
> - * specify the starting offset to place the results, and max size.
> - */
> -void GLAPIENTRY
> -_mesa_BindBufferRange(GLenum target, GLuint index,
> -                      GLuint buffer, GLintptr offset, GLsizeiptr size)
> -{
> -   struct gl_transform_feedback_object *obj;
> -   struct gl_buffer_object *bufObj;
> -   GET_CURRENT_CONTEXT(ctx);
> -
> -   if (target != GL_TRANSFORM_FEEDBACK_BUFFER) {
> -      _mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferRange(target)");
> -      return;
> -   }
> -
> -   obj = ctx->TransformFeedback.CurrentObject;
> -
> -   if (obj->Active) {
> -      _mesa_error(ctx, GL_INVALID_OPERATION,
> -                  "glBindBufferRange(transform feedback active)");
> -      return;
> -   }
> -
> -   if (index>= ctx->Const.MaxTransformFeedbackSeparateAttribs) {
> -      _mesa_error(ctx, GL_INVALID_VALUE, "glBindBufferRange(index=%d)", index);
> -      return;
> -   }
> -
> -   if ((size<= 0) || (size&  0x3)) {
> -      /* must be positive and multiple of four */
> -      _mesa_error(ctx, GL_INVALID_VALUE, "glBindBufferRange(size%d)", (int) size);
> -      return;
> -   }
> -
> -   if (offset&  0x3) {
> -      /* must be multiple of four */
> -      _mesa_error(ctx, GL_INVALID_VALUE,
> -                  "glBindBufferRange(offset=%d)", (int) offset);
> -      return;
> -   }
> -
> -   bufObj = _mesa_lookup_bufferobj(ctx, buffer);
> -   if (!bufObj) {
> -      _mesa_error(ctx, GL_INVALID_OPERATION,
> -                  "glBindBufferRange(invalid buffer=%u)", buffer);
> -      return;
> -   }
> -
> -   if (offset + size>= bufObj->Size) {
> -      _mesa_error(ctx, GL_INVALID_VALUE,
> -                  "glBindBufferRange(offset + size %d>  buffer size %d)",
> -		  (int) (offset + size), (int) (bufObj->Size));
> -      return;
> -   }
> -
> -   bind_buffer_range(ctx, index, bufObj, offset, size);
> -}
> -
> -
> -/**
> - * Specify a buffer object to receive vertex shader results.
> - * As above, but start at offset = 0.
> - */
> -void GLAPIENTRY
> -_mesa_BindBufferBase(GLenum target, GLuint index, GLuint buffer)
> -{
> -   struct gl_transform_feedback_object *obj;
> -   struct gl_buffer_object *bufObj;
> -   GLsizeiptr size;
> -   GET_CURRENT_CONTEXT(ctx);
> -
> -   if (target != GL_TRANSFORM_FEEDBACK_BUFFER) {
> -      _mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferBase(target)");
> -      return;
> -   }
> -
> -   obj = ctx->TransformFeedback.CurrentObject;
> -
> -   if (obj->Active) {
> -      _mesa_error(ctx, GL_INVALID_OPERATION,
> -                  "glBindBufferBase(transform feedback active)");
> -      return;
> -   }
> -
> -   if (index>= ctx->Const.MaxTransformFeedbackSeparateAttribs) {
> -      _mesa_error(ctx, GL_INVALID_VALUE, "glBindBufferBase(index=%d)", index);
> -      return;
> -   }
> -
> -   bufObj = _mesa_lookup_bufferobj(ctx, buffer);
> -   if (!bufObj) {
> -      _mesa_error(ctx, GL_INVALID_OPERATION,
> -                  "glBindBufferBase(invalid buffer=%u)", buffer);
> -      return;
> -   }
> -
> -   /* default size is the buffer size rounded down to nearest
> -    * multiple of four.
> -    */
> -   size = bufObj->Size&  ~0x3;
> -
> -   bind_buffer_range(ctx, index, bufObj, 0, size);
> -}
>
>
>   /**
> diff --git a/src/mesa/main/transformfeedback.h b/src/mesa/main/transformfeedback.h
> index 9447eff..65041c9 100644
> --- a/src/mesa/main/transformfeedback.h
> +++ b/src/mesa/main/transformfeedback.h
> @@ -64,13 +64,6 @@ extern void GLAPIENTRY
>   _mesa_EndTransformFeedback(void);
>
>   extern void GLAPIENTRY
> -_mesa_BindBufferRange(GLenum target, GLuint index,
> -                      GLuint buffer, GLintptr offset, GLsizeiptr size);
> -
> -extern void GLAPIENTRY
> -_mesa_BindBufferBase(GLenum target, GLuint index, GLuint buffer);
> -
> -extern void GLAPIENTRY
>   _mesa_BindBufferOffsetEXT(GLenum target, GLuint index, GLuint buffer,
>                             GLintptr offset);
>


More information about the mesa-dev mailing list