[Mesa-dev] [PATCH 7/8] mesa: rename some 'client' array functions

[Brian Paul]

On 01/30/2018 09:59 AM, Mark Janes wrote:
> This series that was just pushed to master generates ~200 assertions on
> all platforms, eg:
> 
> piglit.spec.ext_framebuffer_multisample.formats 2
> 
> ext_framebuffer_multisample-formats: ../src/mesa/main/varray.c:1068:
> _mesa_enable_vertex_array_attrib: Assertion `attrib >=
> VERT_ATTRIB_GENERIC0' failed.
> 
> Should we revert the series?  This needs to be corrected immediately.

I'll post a patch to remove the assertion.  It appears to be hit via the 
meta code, which is not used by gallium.

-Brian


> 
> Brian Paul <brianp at vmware.com> writes:
> 
>> A long time ago gl_vertex_array was gl_client_array.  Update some function
>> names to be consistent.
>> ---
>>   src/mesa/main/arrayobj.c | 6 +++---
>>   src/mesa/main/arrayobj.h | 4 ++--
>>   src/mesa/main/attrib.c   | 2 +-
>>   src/mesa/main/state.c    | 2 +-
>>   src/mesa/main/varray.c   | 4 ++--
>>   src/mesa/main/varray.h   | 4 ++--
>>   6 files changed, 11 insertions(+), 11 deletions(-)
>>
>> diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
>> index b862f0f..ea9b316 100644
>> --- a/src/mesa/main/arrayobj.c
>> +++ b/src/mesa/main/arrayobj.c
>> @@ -311,8 +311,8 @@ _mesa_initialize_vao(struct gl_context *ctx,
>>    * or a gl_vertex_buffer_binding has changed.
>>    */
>>   void
>> -_mesa_update_vao_client_arrays(struct gl_context *ctx,
>> -                               struct gl_vertex_array_object *vao)
>> +_mesa_update_vao_derived_arrays(struct gl_context *ctx,
>> +                                struct gl_vertex_array_object *vao)
>>   {
>>      GLbitfield arrays = vao->NewArrays;
>>   
>> @@ -324,7 +324,7 @@ _mesa_update_vao_client_arrays(struct gl_context *ctx,
>>         const struct gl_vertex_buffer_binding *buffer_binding =
>>            &vao->BufferBinding[attrib_array->BufferBindingIndex];
>>   
>> -      _mesa_update_client_array(ctx, client_array, attrib_array,
>> +      _mesa_update_vertex_array(ctx, client_array, attrib_array,
>>                                   buffer_binding);
>>      }
>>   }
>> diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h
>> index 1b9900c..ff26157 100644
>> --- a/src/mesa/main/arrayobj.h
>> +++ b/src/mesa/main/arrayobj.h
>> @@ -78,8 +78,8 @@ _mesa_initialize_vao(struct gl_context *ctx,
>>   
>>   
>>   extern void
>> -_mesa_update_vao_client_arrays(struct gl_context *ctx,
>> -                               struct gl_vertex_array_object *vao);
>> +_mesa_update_vao_derived_arrays(struct gl_context *ctx,
>> +                                struct gl_vertex_array_object *vao);
>>   
>>   /* Returns true if all varying arrays reside in vbos */
>>   extern bool
>> diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
>> index 3c12fd6..0b4b63f 100644
>> --- a/src/mesa/main/attrib.c
>> +++ b/src/mesa/main/attrib.c
>> @@ -1503,7 +1503,7 @@ copy_array_object(struct gl_context *ctx,
>>      /* skip RefCount */
>>   
>>      for (i = 0; i < ARRAY_SIZE(src->VertexAttrib); i++) {
>> -      _mesa_copy_client_array(ctx, &dest->_VertexAttrib[i], &src->_VertexAttrib[i]);
>> +      _mesa_copy_vertex_array(ctx, &dest->_VertexAttrib[i], &src->_VertexAttrib[i]);
>>         _mesa_copy_vertex_attrib_array(ctx, &dest->VertexAttrib[i], &src->VertexAttrib[i]);
>>         _mesa_copy_vertex_buffer_binding(ctx, &dest->BufferBinding[i], &src->BufferBinding[i]);
>>      }
>> diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
>> index dd61cc7..df694d0 100644
>> --- a/src/mesa/main/state.c
>> +++ b/src/mesa/main/state.c
>> @@ -357,7 +357,7 @@ _mesa_update_state_locked( struct gl_context *ctx )
>>      }
>>   
>>      if (new_state & _NEW_ARRAY)
>> -      _mesa_update_vao_client_arrays(ctx, ctx->Array.VAO);
>> +      _mesa_update_vao_derived_arrays(ctx, ctx->Array.VAO);
>>   
>>    out:
>>      new_prog_state |= update_program_constants(ctx);
>> diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
>> index 2801a6f..6c022b4 100644
>> --- a/src/mesa/main/varray.c
>> +++ b/src/mesa/main/varray.c
>> @@ -2794,10 +2794,10 @@ _mesa_VertexArrayBindingDivisor(GLuint vaobj, GLuint bindingIndex,
>>   
>>   
>>   /**
>> - * Copy one client vertex array to another.
>> + * Copy one vertex array to another.
>>    */
>>   void
>> -_mesa_copy_client_array(struct gl_context *ctx,
>> +_mesa_copy_vertex_array(struct gl_context *ctx,
>>                           struct gl_vertex_array *dst,
>>                           struct gl_vertex_array *src)
>>   {
>> diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h
>> index 19506bf..79ecd9a 100644
>> --- a/src/mesa/main/varray.h
>> +++ b/src/mesa/main/varray.h
>> @@ -53,7 +53,7 @@ _mesa_vertex_attrib_address(const struct gl_array_attributes *array,
>>    * gl_array_attributes and a gl_vertex_buffer_binding.
>>    */
>>   static inline void
>> -_mesa_update_client_array(struct gl_context *ctx,
>> +_mesa_update_vertex_array(struct gl_context *ctx,
>>                             struct gl_vertex_array *dst,
>>                             const struct gl_array_attributes *attribs,
>>                             const struct gl_vertex_buffer_binding *binding)
>> @@ -475,7 +475,7 @@ _mesa_VertexArrayBindingDivisor(GLuint vaobj, GLuint bindingIndex,
>>                                   GLuint divisor);
>>   
>>   extern void
>> -_mesa_copy_client_array(struct gl_context *ctx,
>> +_mesa_copy_vertex_array(struct gl_context *ctx,
>>                           struct gl_vertex_array *dst,
>>                           struct gl_vertex_array *src);
>>   
>> -- 
>> 2.7.4
>>
>> _______________________________________________
>> mesa-dev mailing list
>> mesa-dev at lists.freedesktop.org
>> https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.freedesktop.org_mailman_listinfo_mesa-2Ddev&d=DwIBAg&c=uilaK90D4TOVoH58JNXRgQ&r=Ie7_encNUsqxbSRbqbNgofw0ITcfE8JKfaUjIQhncGA&m=PkSXy8v4V1noCgmTkBFt0BuAj0gJTSGbrBfp0_BWgis&s=raRQI3yI47M29oO15m8mmMSRnpzr6pwBrzjES9GTM8M&e=