From 709dffa856682b706e516dd324e2f5129a127e8e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tapani=20P=C3=A4lli?= Date: Tue, 18 Aug 2020 15:16:37 +0300 Subject: [PATCH] anv: null check for buffer before reading size MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit v2: move assignment under existing check (Nanley) Fixes: b9a05447a19 ("anv: dynamic vertex input binding stride and size support") Signed-off-by: Tapani Pälli Reviewed-by: Nanley Chery Part-of: --- src/intel/vulkan/genX_cmd_buffer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 7afaeca366b..4522f5d2aef 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -3344,13 +3344,13 @@ genX(cmd_buffer_flush_state)(struct anv_cmd_buffer *cmd_buffer) bool dynamic_stride = cmd_buffer->state.gfx.dynamic.dyn_vbo_stride; bool dynamic_size = cmd_buffer->state.gfx.dynamic.dyn_vbo_size; - uint32_t stride = dynamic_stride ? - cmd_buffer->state.vertex_bindings[vb].stride : pipeline->vb[vb].stride; - uint32_t size = dynamic_size ? - cmd_buffer->state.vertex_bindings[vb].size : buffer->size; - struct GENX(VERTEX_BUFFER_STATE) state; if (buffer) { + uint32_t stride = dynamic_stride ? + cmd_buffer->state.vertex_bindings[vb].stride : pipeline->vb[vb].stride; + uint32_t size = dynamic_size ? + cmd_buffer->state.vertex_bindings[vb].size : buffer->size; + state = (struct GENX(VERTEX_BUFFER_STATE)) { .VertexBufferIndex = vb, -- 2.30.2