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

draw: asst. clean-ups in draw_vertex.[ch]

Browse Source 
Signed-off-by: Brian Paul <brianp@vmware.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19024>
This commit is contained in:
Brian Paul
2022-10-05 21:09:32 -06:00
committed by Marge Bot
parent 3ac0b2115c
commit 9daf8531e5
2 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gallium/auxiliary/draw/draw_vertex.c
View File

@@ -45,10 +45,8 @@
void void
draw_compute_vertex_size(struct vertex_info *vinfo) draw_compute_vertex_size(struct vertex_info *vinfo)
{ {
uint i;
vinfo->size = 0; vinfo->size = 0;
for (i = 0; i < vinfo->num_attribs; i++) for (unsigned i = 0; i < vinfo->num_attribs; i++)
vinfo->size += draw_translate_vinfo_size(vinfo->attrib[i].emit); vinfo->size += draw_translate_vinfo_size(vinfo->attrib[i].emit);
assert(vinfo->size % 4 == 0); assert(vinfo->size % 4 == 0);
@@ -60,9 +58,7 @@ draw_compute_vertex_size(struct vertex_info *vinfo)
void void
draw_dump_emitted_vertex(const struct vertex_info *vinfo, const uint8_t *data) draw_dump_emitted_vertex(const struct vertex_info *vinfo, const uint8_t *data)
{ {
unsigned i; for (unsigned i = 0; i < vinfo->num_attribs; i++) {
for (i = 0; i < vinfo->num_attribs; i++) {
switch (vinfo->attrib[i].emit) { switch (vinfo->attrib[i].emit) {
case EMIT_OMIT: case EMIT_OMIT:
debug_printf("EMIT_OMIT:"); debug_printf("EMIT_OMIT:");

35
src/gallium/auxiliary/draw/draw_vertex.h
View File

@@ -79,26 +79,29 @@ struct vertex_info
} attrib[PIPE_MAX_SHADER_OUTPUTS]; } attrib[PIPE_MAX_SHADER_OUTPUTS];
}; };
static inline size_t static inline size_t
draw_vinfo_size( const struct vertex_info *a ) draw_vinfo_size(const struct vertex_info *a)
{ {
return offsetof(const struct vertex_info, attrib[a->num_attribs]); return offsetof(const struct vertex_info, attrib[a->num_attribs]);
} }
static inline int static inline int
draw_vinfo_compare( const struct vertex_info *a, draw_vinfo_compare(const struct vertex_info *a,
const struct vertex_info *b ) const struct vertex_info *b)
{ {
size_t sizea = draw_vinfo_size( a ); size_t sizea = draw_vinfo_size(a);
return memcmp( a, b, sizea ); return memcmp(a, b, sizea);
} }
static inline void static inline void
draw_vinfo_copy( struct vertex_info *dst, draw_vinfo_copy(struct vertex_info *dst,
const struct vertex_info *src ) const struct vertex_info *src)
{ {
size_t size = draw_vinfo_size( src ); size_t size = draw_vinfo_size(src);
memcpy( dst, src, size ); memcpy(dst, src, size);
} }
@@ -130,13 +133,17 @@ draw_emit_vertex_attr(struct vertex_info *vinfo,
} }
extern void draw_compute_vertex_size(struct vertex_info *vinfo); void
draw_compute_vertex_size(struct vertex_info *vinfo);
void draw_dump_emitted_vertex(const struct vertex_info *vinfo,
void
draw_dump_emitted_vertex(const struct vertex_info *vinfo,
const uint8_t *data); const uint8_t *data);
static inline enum pipe_format draw_translate_vinfo_format(enum attrib_emit emit) static inline enum pipe_format
draw_translate_vinfo_format(enum attrib_emit emit)
{ {
switch (emit) { switch (emit) {
case EMIT_OMIT: case EMIT_OMIT:
@@ -160,7 +167,9 @@ static inline enum pipe_format draw_translate_vinfo_format(enum attrib_emit emit
} }
} }
static inline unsigned draw_translate_vinfo_size(enum attrib_emit emit)
static inline unsigned
draw_translate_vinfo_size(enum attrib_emit emit)
{ {
switch (emit) { switch (emit) {
case EMIT_OMIT: case EMIT_OMIT: