From de782e5b39efbb6f395950021e7d5b3dc394c1fa Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Wed, 13 Jun 2018 02:15:40 -0700 Subject: [PATCH] iris: delete some pointless STATIC_ASSERTS these were useful when I was patching relocs --- src/gallium/drivers/iris/iris_state.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index d36a11d0aab..c7517f2c2cd 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -2544,12 +2544,10 @@ iris_upload_render_state(struct iris_context *ice, if (dirty & IRIS_DIRTY_VERTEX_BUFFERS) { struct iris_vertex_buffer_state *cso = ice->state.cso_vertex_buffers; - - STATIC_ASSERT(GENX(VERTEX_BUFFER_STATE_length) == 4); - STATIC_ASSERT((GENX(VERTEX_BUFFER_STATE_BufferStartingAddress_bits) % 32) == 0); + const unsigned vb_dwords = GENX(VERTEX_BUFFER_STATE_length); iris_batch_emit(batch, cso->vertex_buffers, - sizeof(uint32_t) * (1 + 4 * cso->num_buffers)); + sizeof(uint32_t) * (1 + vb_dwords * cso->num_buffers)); for (unsigned i = 0; i < cso->num_buffers; i++) { iris_use_pinned_bo(batch, cso->bos[i], false); -- 2.30.2