diff options
| author | Tapani Pälli <tapani.palli@intel.com> | 2020-08-18 15:16:37 +0300 |
|---|---|---|
| committer | Tapani Pälli <tapani.palli@intel.com> | 2020-08-20 08:33:59 +0300 |
| commit | 709dffa856682b706e516dd324e2f5129a127e8e (patch) | |
| tree | b07f6c56d1e54a77fc438698da289bcc50991601 | |
| parent | 8d38b25788c9f9bcc1c8bf2a422162328ac663d1 (diff) | |
anv: null check for buffer before reading size
v2: move assignment under existing check (Nanley)
Fixes: b9a05447a19 ("anv: dynamic vertex input binding stride and size support")
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6369>
| -rw-r--r-- | src/intel/vulkan/genX_cmd_buffer.c | 10 |
1 files 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, |