summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlyssa Rosenzweig <[email protected]>2019-03-31 04:27:29 +0000
committerAlyssa Rosenzweig <[email protected]>2019-03-31 04:42:22 +0000
commited160a11606889af24b92b563511b972e8516e0f (patch)
treea0326ee9c257275970692db0e594214c13e512d8
parent0e4c321c15823b9e44598f0268ee8d69a07bd9d5 (diff)
panfrost: Fix index calculation types and asserts
Fixes crash in dEQP-GLES2.functional.draw.draw_elements.points.single_attribute. Signed-off-by: Alyssa Rosenzweig <[email protected]>
-rw-r--r--src/gallium/drivers/panfrost/pan_context.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gallium/drivers/panfrost/pan_context.c b/src/gallium/drivers/panfrost/pan_context.c
index 973b9c6ae93..bafe67e138f 100644
--- a/src/gallium/drivers/panfrost/pan_context.c
+++ b/src/gallium/drivers/panfrost/pan_context.c
@@ -1461,8 +1461,8 @@ panfrost_draw_vbo(
const uint8_t *ibuf8 = panfrost_get_index_buffer_raw(info);
- int min_index = INT_MAX;
- int max_index = 0;
+ unsigned min_index = UINT_MAX;
+ unsigned max_index = 0;
if (info->index_size == 1) {
CALCULATE_MIN_MAX_INDEX(uint8_t, ibuf8, info->start, info->count);
@@ -1477,9 +1477,8 @@ panfrost_draw_vbo(
}
/* Make sure we didn't go crazy */
- assert(min_index < INT_MAX);
- assert(max_index > 0);
- assert(max_index > min_index);
+ assert(min_index < UINT_MAX);
+ assert(max_index >= min_index);
/* Use the corresponding values */
invocation_count = max_index - min_index + 1;