From: Erik Faye-Lund Date: Wed, 29 Aug 2018 13:48:29 +0000 (+0200) Subject: st/mesa: simplify MaxAtomicBufferSize-logic X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=84795f8c6495511e20fa63faf592169cc3baa01c;p=mesa.git st/mesa: simplify MaxAtomicBufferSize-logic MaxAtomicCounters has already been assigned in the loop above in the ssbo_atomic = true case, so this will calculate the same value as the default. While we're at it, fixup indentation on the MaxAtomicBufferBindings assign. Signed-off-by: Erik Faye-Lund Reviewed-by: Marek Olšák Reviewed-by: Gurchetan Singh --- diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 83fc09f52b8..9ecdd26edda 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -441,12 +441,11 @@ void st_init_limits(struct pipe_screen *screen, c->NumProgramBinaryFormats = 1; c->MaxAtomicBufferBindings = - c->Program[MESA_SHADER_FRAGMENT].MaxAtomicBuffers; + c->Program[MESA_SHADER_FRAGMENT].MaxAtomicBuffers; + c->MaxAtomicBufferSize = + c->Program[MESA_SHADER_FRAGMENT].MaxAtomicCounters * ATOMIC_COUNTER_SIZE; if (!ssbo_atomic) { - /* for separate atomic buffers - there atomic buffer size will be - limited */ - c->MaxAtomicBufferSize = c->Program[MESA_SHADER_FRAGMENT].MaxAtomicCounters * ATOMIC_COUNTER_SIZE; /* on all HW with separate atomic (evergreen) the following lines are true. not sure it's worth adding CAPs for this at this stage. */