projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace IFLOOR with util_ifloor
[mesa.git]
/
src
/
mesa
/
state_tracker
/
st_cb_memoryobjects.c
diff --git
a/src/mesa/state_tracker/st_cb_memoryobjects.c
b/src/mesa/state_tracker/st_cb_memoryobjects.c
index 6a2f524836dd5064615c5c3c865177bf8c898e25..5176df68e78a69a31f8477ad2a33a82940b55240 100644
(file)
--- a/
src/mesa/state_tracker/st_cb_memoryobjects.c
+++ b/
src/mesa/state_tracker/st_cb_memoryobjects.c
@@
-35,6
+35,10
@@
#include "pipe/p_context.h"
#include "pipe/p_screen.h"
#include "pipe/p_context.h"
#include "pipe/p_screen.h"
+#ifdef HAVE_LIBDRM
+#include "drm-uapi/drm_fourcc.h"
+#endif
+
static struct gl_memory_object *
st_memoryobj_alloc(struct gl_context *ctx, GLuint name)
{
static struct gl_memory_object *
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 pipe_context *pipe = st->pipe;
struct pipe_screen *screen = pipe->screen;
struct st_context *st = st_context(ctx);
struct pipe_context *pipe = st->pipe;
struct pipe_screen *screen = pipe->screen;
- struct winsys_handle whandle
;
-
- whandle.type = WINSYS_HANDLE_TYPE_FD;
- whandle.handle = fd;
- whandle.offset = 0;
- whandle.layer = 0;
-
whandle.stride = 0
;
+ struct winsys_handle whandle
= {
+ .type = WINSYS_HANDLE_TYPE_FD,
+ .handle = fd,
+#ifdef HAVE_LIBDRM
+ .modifier = DRM_FORMAT_MOD_INVALID,
+#endif
+
}
;
st_obj->memory = screen->memobj_create_from_handle(screen,
&whandle,
st_obj->memory = screen->memobj_create_from_handle(screen,
&whandle,