On Thu, Mar 01, 2018 at 09:04:58AM -0800, Dylan Baker wrote: > Quoting Thierry Reding (2018-03-01 05:54:52) > > From: Thierry Reding <[email protected]> > > > > This adds support for framebuffer modifiers to Nouveau. This will be > > used by the Tegra driver to share metadata about the format of buffers > > (such as the tiling mode or compression). > > > > Changes in v2: > > - remove unused parameters to nouveau_buffer_create() > > - move format modifier query code to nvc0 backend > > - restrict format modifiers to 2D textures > > - implement ->query_dmabuf_modifiers() > > > > Acked-by: Emil Velikov <[email protected]> > > Tested-by: Andre Heider <[email protected]> > > Signed-off-by: Thierry Reding <[email protected]> > > --- > > src/gallium/drivers/nouveau/Android.mk | 3 + > > src/gallium/drivers/nouveau/Makefile.am | 1 + > > src/gallium/drivers/nouveau/nouveau_screen.c | 4 ++ > > src/gallium/drivers/nouveau/nv30/nv30_resource.c | 2 + > > src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c | 81 > > +++++++++++++++++++++++- > > src/gallium/drivers/nouveau/nvc0/nvc0_resource.c | 59 ++++++++++++++++- > > src/gallium/drivers/nouveau/nvc0/nvc0_resource.h | 3 +- > > 7 files changed, 149 insertions(+), 4 deletions(-) > > > > diff --git a/src/gallium/drivers/nouveau/Android.mk > > b/src/gallium/drivers/nouveau/Android.mk > > index 2de22e73ec18..a446774a86e8 100644 > > --- a/src/gallium/drivers/nouveau/Android.mk > > +++ b/src/gallium/drivers/nouveau/Android.mk > > @@ -36,6 +36,9 @@ LOCAL_SRC_FILES := \ > > $(NVC0_CODEGEN_SOURCES) \ > > $(NVC0_C_SOURCES) > > > > +LOCAL_C_INCLUDES := \ > > + $(MESA_TOP)/include/drm-uapi > > + > > LOCAL_SHARED_LIBRARIES := libdrm_nouveau > > LOCAL_MODULE := libmesa_pipe_nouveau > > > > diff --git a/src/gallium/drivers/nouveau/Makefile.am > > b/src/gallium/drivers/nouveau/Makefile.am > > index 91547178e397..f6126b544811 100644 > > --- a/src/gallium/drivers/nouveau/Makefile.am > > +++ b/src/gallium/drivers/nouveau/Makefile.am > > @@ -24,6 +24,7 @@ include Makefile.sources > > include $(top_srcdir)/src/gallium/Automake.inc > > > > AM_CPPFLAGS = \ > > + -I$(top_srcdir)/include/drm-uapi \ > > This needs to be added for the meson build as well, right? Should just need to > add "inc_drm_uapi" to the relevant "include_directories" lines.
It seems like this was working "by accident" for me because I was building against a locally modified version of libdrm that provided the necessary UABI changes. Fixed now. Thierry
signature.asc
Description: PGP signature
_______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
