OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: rename some 'client' array functions

Browse Source 
A long time ago gl_vertex_array was gl_client_array.  Update some function
names to be consistent.

Reviewed-by: Gert Wollny <gw.fossdev@gmail.com>
This commit is contained in:
Brian Paul
2018-01-26 11:35:43 -07:00
parent d2d9d090e5
commit f892e332a8
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesa/main/arrayobj.c
View File

@@ -315,7 +315,7 @@ _mesa_initialize_vao(struct gl_context *ctx,
* or a gl_vertex_buffer_binding has changed. * or a gl_vertex_buffer_binding has changed.
*/ */
void void
_mesa_update_vao_client_arrays(struct gl_context *ctx, _mesa_update_vao_derived_arrays(struct gl_context *ctx,
struct gl_vertex_array_object *vao) struct gl_vertex_array_object *vao)
{ {
GLbitfield arrays = vao->NewArrays; GLbitfield arrays = vao->NewArrays;
@@ -328,7 +328,7 @@ _mesa_update_vao_client_arrays(struct gl_context *ctx,
const struct gl_vertex_buffer_binding *buffer_binding = const struct gl_vertex_buffer_binding *buffer_binding =
&vao->BufferBinding[attrib_array->BufferBindingIndex]; &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); buffer_binding);
} }
} }

2
src/mesa/main/arrayobj.h
View File

@@ -78,7 +78,7 @@ _mesa_initialize_vao(struct gl_context *ctx,
extern void extern void
_mesa_update_vao_client_arrays(struct gl_context *ctx, _mesa_update_vao_derived_arrays(struct gl_context *ctx,
struct gl_vertex_array_object *vao); struct gl_vertex_array_object *vao);
/* Returns true if all varying arrays reside in vbos */ /* Returns true if all varying arrays reside in vbos */

2
src/mesa/main/attrib.c
View File

@@ -1503,7 +1503,7 @@ copy_array_object(struct gl_context *ctx,
/* skip RefCount */ /* skip RefCount */
for (i = 0; i < ARRAY_SIZE(src->VertexAttrib); i++) { 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_attrib_array(ctx, &dest->VertexAttrib[i], &src->VertexAttrib[i]);
_mesa_copy_vertex_buffer_binding(ctx, &dest->BufferBinding[i], &src->BufferBinding[i]); _mesa_copy_vertex_buffer_binding(ctx, &dest->BufferBinding[i], &src->BufferBinding[i]);
} }

2
src/mesa/main/state.c
View File

@@ -357,7 +357,7 @@ _mesa_update_state_locked( struct gl_context *ctx )
} }
if (new_state & _NEW_ARRAY) if (new_state & _NEW_ARRAY)
_mesa_update_vao_client_arrays(ctx, ctx->Array.VAO); _mesa_update_vao_derived_arrays(ctx, ctx->Array.VAO);
out: out:
new_prog_state |= update_program_constants(ctx); new_prog_state |= update_program_constants(ctx);

4
src/mesa/main/varray.c
View File

@@ -2794,10 +2794,10 @@ _mesa_VertexArrayBindingDivisor(GLuint vaobj, GLuint bindingIndex,
/** /**
* Copy one client vertex array to another. * Copy one vertex array to another.
*/ */
void 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 *dst,
struct gl_vertex_array *src) struct gl_vertex_array *src)
{ {

4
src/mesa/main/varray.h
View File

@@ -53,7 +53,7 @@ _mesa_vertex_attrib_address(const struct gl_array_attributes *array,
* gl_array_attributes and a gl_vertex_buffer_binding. * gl_array_attributes and a gl_vertex_buffer_binding.
*/ */
static inline void static inline void
_mesa_update_client_array(struct gl_context *ctx, _mesa_update_vertex_array(struct gl_context *ctx,
struct gl_vertex_array *dst, struct gl_vertex_array *dst,
const struct gl_array_attributes *attribs, const struct gl_array_attributes *attribs,
const struct gl_vertex_buffer_binding *binding) const struct gl_vertex_buffer_binding *binding)
@@ -475,7 +475,7 @@ _mesa_VertexArrayBindingDivisor(GLuint vaobj, GLuint bindingIndex,
GLuint divisor); GLuint divisor);
extern void 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 *dst,
struct gl_vertex_array *src); struct gl_vertex_array *src);