Mesa (master): r600: Delete vertex buffer only if there is actually a shader state

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: b119f8b4a050b2f37b0abbda669b7e27b0cd538b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b119f8b4a050b2f37b0abbda669b7e27b0cd538b

Author: Gert Wollny <gert.wollny at collabora.com>
Date:   Sat Dec 28 17:17:02 2019 +0100

r600: Delete vertex buffer only if there is actually a shader state

Fixes: gl-2.0-vertexattribpointer
Signed-off-by: Gert Wollny <gert.wollny at collabora.com>
Reviewed-by: Konstantin Kharlamov <hi-angel at yandex.ru>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3286>

---

 src/gallium/drivers/r600/r600_state_common.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
index fe17d10c201..4718286bd2b 100644
--- a/src/gallium/drivers/r600/r600_state_common.c
+++ b/src/gallium/drivers/r600/r600_state_common.c
@@ -546,7 +546,8 @@ static void r600_bind_vertex_elements(struct pipe_context *ctx, void *state)
 static void r600_delete_vertex_elements(struct pipe_context *ctx, void *state)
 {
 	struct r600_fetch_shader *shader = (struct r600_fetch_shader*)state;
-	r600_resource_reference(&shader->buffer, NULL);
+	if (shader)
+		r600_resource_reference(&shader->buffer, NULL);
 	FREE(shader);
 }