diff options
author | Alyssa Rosenzweig <[email protected]> | 2019-07-05 08:25:56 -0700 |
---|---|---|
committer | Alyssa Rosenzweig <[email protected]> | 2019-07-10 06:12:03 -0700 |
commit | 7c82dfba8f37793e30b445428a2450bfca8b7e26 (patch) | |
tree | d60d9f26615798cfa9b11efe2e580a87c88cd281 /src/gallium/drivers/panfrost/pan_context.c | |
parent | c78d2d98409200f0b40d2e7bb7d143afbf1f0895 (diff) |
panfrost: Use standard ALIGN_POT/INFINITY macros
We had vendored duplicates from pre-Mesa days; clean that up.
Signed-off-by: Alyssa Rosenzweig <[email protected]>
Diffstat (limited to 'src/gallium/drivers/panfrost/pan_context.c')
-rw-r--r-- | src/gallium/drivers/panfrost/pan_context.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/drivers/panfrost/pan_context.c b/src/gallium/drivers/panfrost/pan_context.c index b9fb187be44..90ea38645dc 100644 --- a/src/gallium/drivers/panfrost/pan_context.c +++ b/src/gallium/drivers/panfrost/pan_context.c @@ -536,7 +536,7 @@ panfrost_emit_varyings( slot->stride = stride; slot->size = stride * count; - ctx->varying_height += ALIGN(slot->size, 64); + ctx->varying_height += ALIGN_POT(slot->size, 64); assert(ctx->varying_height < ctx->varying_mem.bo->size); return varying_address; @@ -1292,7 +1292,7 @@ panfrost_emit_for_draw(struct panfrost_context *ctx, bool with_vertex_data) mali_ptr gpu = panfrost_map_constant_buffer_gpu(ctx, buf, ubo); unsigned bytes_per_field = 16; - unsigned aligned = ALIGN(sz, bytes_per_field); + unsigned aligned = ALIGN_POT(sz, bytes_per_field); unsigned fields = aligned / bytes_per_field; ubos[ubo].size = MALI_POSITIVE(fields); @@ -1318,10 +1318,10 @@ panfrost_emit_for_draw(struct panfrost_context *ctx, bool with_vertex_data) * should work, but in practice causes issues when we're not * explicitly trying to scissor */ - .clip_minx = -inff, - .clip_miny = -inff, - .clip_maxx = inff, - .clip_maxy = inff, + .clip_minx = -INFINITY, + .clip_miny = -INFINITY, + .clip_maxx = INFINITY, + .clip_maxy = INFINITY, .clip_minz = 0.0, .clip_maxz = 1.0, |