From 71446bf8e303089cf927412385e992fc70156261 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alejandro=20Pi=C3=B1eiro?= Date: Thu, 4 Jul 2019 14:11:27 +0200 Subject: [PATCH] v3d: Early return with handle 0 when getting a bo on the simulator Until now we were just asking entries on the bo hash table, and don't worry if the handle was NULL, as we were just expecting to get a NULL in return. It seems that now the hash table assert with some reserverd pointers, included NULL. This commit just early returns with handle 0. This change fixes several crashes on vk-gl-cts GLES tests when using the v3d simulator, like: KHR-GLES3.core.internalformat.copy_tex_image.* Reviewed-by: Eric Anholt --- src/gallium/drivers/v3d/v3d_simulator.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gallium/drivers/v3d/v3d_simulator.c b/src/gallium/drivers/v3d/v3d_simulator.c index 6e2d25e9448..039672d9ca2 100644 --- a/src/gallium/drivers/v3d/v3d_simulator.c +++ b/src/gallium/drivers/v3d/v3d_simulator.c @@ -289,6 +289,9 @@ v3d_free_simulator_bo(struct v3d_simulator_bo *sim_bo) static struct v3d_simulator_bo * v3d_get_simulator_bo(struct v3d_simulator_file *file, int gem_handle) { + if (gem_handle == 0) + return NULL; + mtx_lock(&sim_state.mutex); struct hash_entry *entry = _mesa_hash_table_search(file->bo_map, int_to_key(gem_handle)); -- 2.30.2