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

mesa: use gl_vert_attrib enum type in more places

Browse Source 
Slightly better readbility.

Reviewed-by: Gert Wollny <gw.fossdev@gmail.com>
This commit is contained in:
Brian Paul
2018-01-30 11:02:06 -07:00
parent f892e332a8
commit efa0993eaf
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -231,7 +231,7 @@ _mesa_reference_vao_(struct gl_context *ctx,
static void
init_array(struct gl_context *ctx,
struct gl_vertex_array_object *vao,
GLuint index, GLint size, GLint type)
gl_vert_attrib index, GLint size, GLint type)
{
assert(index < ARRAY_SIZE(vao->VertexAttrib));
struct gl_array_attributes *array = &vao->VertexAttrib[index];

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

@@ -132,7 +132,7 @@ type_to_bit(const struct gl_context *ctx, GLenum type)
static void
vertex_attrib_binding(struct gl_context *ctx,
struct gl_vertex_array_object *vao,
GLuint attribIndex,
gl_vert_attrib attribIndex,
GLuint bindingIndex)
{
struct gl_array_attributes *array = &vao->VertexAttrib[attribIndex];
@@ -294,7 +294,7 @@ get_array_format(const struct gl_context *ctx, GLint sizeMax, GLint *size)
void
_mesa_update_array_format(struct gl_context *ctx,
struct gl_vertex_array_object *vao,
GLuint attrib, GLint size, GLenum type,
gl_vert_attrib attrib, GLint size, GLenum type,
GLenum format, GLboolean normalized,
GLboolean integer, GLboolean doubles,
GLuint relativeOffset)
@@ -1063,7 +1063,7 @@ _mesa_VertexAttribLPointer(GLuint index, GLint size, GLenum type,
void
_mesa_enable_vertex_array_attrib(struct gl_context *ctx,
struct gl_vertex_array_object *vao,
unsigned attrib)
gl_vert_attrib attrib)
{
assert(attrib >= VERT_ATTRIB_GENERIC0);
assert(attrib < ARRAY_SIZE(vao->VertexAttrib));
@@ -1965,7 +1965,7 @@ _mesa_VertexAttribDivisor_no_error(GLuint index, GLuint divisor)
{
GET_CURRENT_CONTEXT(ctx);
const GLuint genericIndex = VERT_ATTRIB_GENERIC(index);
const gl_vert_attrib genericIndex = VERT_ATTRIB_GENERIC(index);
struct gl_vertex_array_object * const vao = ctx->Array.VAO;
assert(genericIndex < ARRAY_SIZE(vao->VertexAttrib));
@@ -1996,7 +1996,7 @@ _mesa_VertexAttribDivisor(GLuint index, GLuint divisor)
{
GET_CURRENT_CONTEXT(ctx);
const GLuint genericIndex = VERT_ATTRIB_GENERIC(index);
const gl_vert_attrib genericIndex = VERT_ATTRIB_GENERIC(index);
struct gl_vertex_array_object * const vao = ctx->Array.VAO;
if (!ctx->Extensions.ARB_instanced_arrays) {
@@ -2856,7 +2856,7 @@ _mesa_print_arrays(struct gl_context *ctx)
fprintf(stderr, "Array Object %u\n", vao->Name);
unsigned i;
gl_vert_attrib i;
for (i = 0; i < VERT_ATTRIB_MAX; ++i) {
const struct gl_array_attributes *array = &vao->VertexAttrib[i];
if (!array->Enabled)

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

@@ -96,7 +96,7 @@ _mesa_set_drawing_arrays(struct gl_context *ctx,
extern void
_mesa_update_array_format(struct gl_context *ctx,
struct gl_vertex_array_object *vao,
GLuint attrib, GLint size, GLenum type,
gl_vert_attrib attrib, GLint size, GLenum type,
GLenum format, GLboolean normalized,
GLboolean integer, GLboolean doubles,
GLuint relativeOffset);
@@ -104,7 +104,7 @@ _mesa_update_array_format(struct gl_context *ctx,
extern void
_mesa_enable_vertex_array_attrib(struct gl_context *ctx,
struct gl_vertex_array_object *vao,
unsigned attrib);
gl_vert_attrib attrib);
extern void
_mesa_bind_vertex_buffer(struct gl_context *ctx,