draw: use stdint.h types

Here, we want explicitly sized types, not just types that happen to be
of the right size.

Reviewed-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23833>

diff --git a/src/gallium/auxiliary/draw/draw_pt.c b/src/gallium/auxiliary/draw/draw_pt.c
index 2a678dd..e764997 100644 (file)
--- a/src/gallium/auxiliary/draw/draw_pt.c
+++ b/src/gallium/auxiliary/draw/draw_pt.c
@@ -265,19 +265,19 @@ draw_print_arrays(struct draw_context *draw, enum mesa_prim prim,
          switch (draw->pt.user.eltSize) {
          case 1:
             {
-               const ubyte *elem = (const ubyte *) draw->pt.user.elts;
+               const uint8_t *elem = (const uint8_t *) draw->pt.user.elts;
                ii = elem[start + i];
             }
             break;
          case 2:
             {
-               const ushort *elem = (const ushort *) draw->pt.user.elts;
+               const uint16_t *elem = (const uint16_t *) draw->pt.user.elts;
                ii = elem[start + i];
             }
             break;
          case 4:
             {
-               const uint *elem = (const uint *) draw->pt.user.elts;
+               const uint32_t *elem = (const uint32_t *) draw->pt.user.elts;
                ii = elem[start + i];
             }
             break;

diff --git a/src/gallium/auxiliary/draw/draw_pt_fetch.c b/src/gallium/auxiliary/draw/draw_pt_fetch.c
index 38bef97..9104913 100644 (file)
--- a/src/gallium/auxiliary/draw/draw_pt_fetch.c
+++ b/src/gallium/auxiliary/draw/draw_pt_fetch.c
@@ -86,7 +86,7 @@ draw_pt_fetch_prepare(struct pt_fetch *fetch,
          key.element[nr].output_format = PIPE_FORMAT_R32_USCALED;
          key.element[nr].output_offset = dst_offset;
 
-         dst_offset += sizeof(uint);
+         dst_offset += sizeof(uint32_t);
       } else if (util_format_is_pure_sint(draw->pt.vertex_element[i].src_format)) {
          key.element[nr].type = TRANSLATE_ELEMENT_NORMAL;
          key.element[nr].input_format = draw->pt.vertex_element[ei].src_format;
@@ -97,7 +97,7 @@ draw_pt_fetch_prepare(struct pt_fetch *fetch,
          key.element[nr].output_offset = dst_offset;
 
          ei++;
-         dst_offset += 4 * sizeof(int);
+         dst_offset += 4 * sizeof(int32_t);
       } else if (util_format_is_pure_uint(draw->pt.vertex_element[i].src_format)) {
          key.element[nr].type = TRANSLATE_ELEMENT_NORMAL;
          key.element[nr].input_format = draw->pt.vertex_element[ei].src_format;
@@ -108,7 +108,7 @@ draw_pt_fetch_prepare(struct pt_fetch *fetch,
          key.element[nr].output_offset = dst_offset;
 
          ei++;
-         dst_offset += 4 * sizeof(unsigned);
+         dst_offset += 4 * sizeof(uint32_t);
       } else {
          key.element[nr].type = TRANSLATE_ELEMENT_NORMAL;
          key.element[nr].input_format = draw->pt.vertex_element[ei].src_format;