summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Neph <ryanneph@google.com>2023-06-14 14:51:42 -0700
committerMarge Bot <emma+marge@anholt.net>2023-06-14 22:10:27 +0000
commit8f986932f5df8f8888a40db9b9662215faf3d346 (patch)
tree3d0b83bc014849c9450ebbbcdf0287fc73d070c1
parent144da8655228944a6b3f5e7c6ae49c4119bb6699 (diff)
vrend: fix missed flagging as GBM_BUFFER on early-return
A recent refactor incorrectly moved GBM_BUFFER flagging after a non-error early-return in vrend_resource_gbm_init. Fixes: 511f450642 ("Fix vrend_resource_gbm_init() error handling") Signed-off-by: Ryan Neph <ryanneph@google.com> Part-of: <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/1162>
-rw-r--r--src/vrend_renderer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/vrend_renderer.c b/src/vrend_renderer.c
index 3b4e879..cf6a1bc 100644
--- a/src/vrend_renderer.c
+++ b/src/vrend_renderer.c
@@ -8256,6 +8256,8 @@ static void vrend_resource_gbm_init(struct vrend_resource *gr, uint32_t format)
return;
gr->gbm_bo = bo;
+ gr->storage_bits |= VREND_STORAGE_GBM_BUFFER;
+
/* This is true so far, but maybe gbm_bo_get_caching_type is needed in the future. */
if (!strcmp(gbm_device_get_backend_name(gbm->device), "i915"))
gr->map_info = VIRGL_RENDERER_MAP_CACHE_CACHED;
@@ -8272,7 +8274,6 @@ static void vrend_resource_gbm_init(struct vrend_resource *gr, uint32_t format)
return;
}
- gr->storage_bits |= VREND_STORAGE_GBM_BUFFER;
gr->storage_bits |= VREND_STORAGE_EGL_IMAGE;
#else