OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa/st: initialize all winsys_handle fields for memory objects

Browse Source 
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reported-by: Eduardo Lima Mitev <elima@igalia.com>
Reviewed-by: Eduardo Lima Mitev <elima@igalia.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: <mesa-stable@lists.freedesktop.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4547>
This commit is contained in:
Tapani Pälli
2020-04-14 12:05:46 +03:00
committed by Marge Bot
parent e3e704c7e7
commit a934c8e7ed
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mesa/state_tracker/st_cb_memoryobjects.c
View File

@@ -35,6 +35,10 @@
#include "pipe/p_context.h" #include "pipe/p_context.h"
#include "pipe/p_screen.h" #include "pipe/p_screen.h"
#ifdef HAVE_LIBDRM
#include "drm-uapi/drm_fourcc.h"
#endif
static struct gl_memory_object * static struct gl_memory_object *
st_memoryobj_alloc(struct gl_context *ctx, GLuint name) st_memoryobj_alloc(struct gl_context *ctx, GLuint name)
{ {
@@ -64,13 +68,13 @@ st_import_memoryobj_fd(struct gl_context *ctx,
struct st_context *st = st_context(ctx); struct st_context *st = st_context(ctx);
struct pipe_context *pipe = st->pipe; struct pipe_context *pipe = st->pipe;
struct pipe_screen *screen = pipe->screen; struct pipe_screen *screen = pipe->screen;
struct winsys_handle whandle; struct winsys_handle whandle = {
.type = WINSYS_HANDLE_TYPE_FD,
whandle.type = WINSYS_HANDLE_TYPE_FD; .handle = fd,
whandle.handle = fd; #ifdef HAVE_LIBDRM
whandle.offset = 0; .modifier = DRM_FORMAT_MOD_INVALID,
whandle.layer = 0; #endif
whandle.stride = 0; };
st_obj->memory = screen->memobj_create_from_handle(screen, st_obj->memory = screen->memobj_create_from_handle(screen,
&whandle, &whandle,