On 20 March 2017 at 09:13, Kenneth Graunke <kenn...@whitecape.org> wrote: > This should give substantially better decoding, as the public libdrm > decoder hasn't been properly maintained in years. > > For now, we reuse the existing state dumping mechanism. We'll improve > that in the next patch. Can you share the size of i965_dri.so before/after this patch/series ? I'd imagine that things will be noticeably larger since we the, thankfully zlib[ed], _xml.h files are within the final binary. That in itself is _not_ a blocker, but good to point out, since it's not obvious.
> --- > src/mesa/drivers/dri/i965/Makefile.am | 1 + > src/mesa/drivers/dri/i965/Makefile.sources | 1 + > src/mesa/drivers/dri/i965/decoder.c | 1 + > src/mesa/drivers/dri/i965/intel_batchbuffer.c | 56 > +++++++++++++++++---------- > 4 files changed, 38 insertions(+), 21 deletions(-) > create mode 120000 src/mesa/drivers/dri/i965/decoder.c > > diff --git a/src/mesa/drivers/dri/i965/Makefile.am > b/src/mesa/drivers/dri/i965/Makefile.am > index 246fe41ca97..98a70e1ec48 100644 > --- a/src/mesa/drivers/dri/i965/Makefile.am > +++ b/src/mesa/drivers/dri/i965/Makefile.am > @@ -38,6 +38,7 @@ AM_CFLAGS = \ > -I$(top_srcdir)/src/compiler/nir \ > -I$(top_builddir)/src/intel \ > -I$(top_srcdir)/src/intel \ > + -I$(top_srcdir)/src/intel/tools \ I'm 99% sure we don't need this include. Is it because we have a symlink and the compiler looks within the symlink file directory as opposed to where the original file is stored ? Can you throw a similar fix for the Android build ? > $(DEFINES) \ > $(VISIBILITY_CFLAGS) \ > $(INTEL_CFLAGS) > diff --git a/src/mesa/drivers/dri/i965/Makefile.sources > b/src/mesa/drivers/dri/i965/Makefile.sources > index 6456df5dc01..13adb739aa3 100644 > --- a/src/mesa/drivers/dri/i965/Makefile.sources > +++ b/src/mesa/drivers/dri/i965/Makefile.sources > @@ -1,4 +1,5 @@ > i965_FILES = \ > + decoder.c \ Please sort this alphabetically. > brw_binding_tables.c \ > brw_blorp.c \ > brw_blorp.h \ > diff --git a/src/mesa/drivers/dri/i965/decoder.c > b/src/mesa/drivers/dri/i965/decoder.c > new file mode 120000 > index 00000000000..0cd95ba1038 > --- /dev/null > +++ b/src/mesa/drivers/dri/i965/decoder.c > @@ -0,0 +1 @@ > +../../../../intel/tools/decoder.c Can we do the symlink at build-time ? > \ No newline at end of file > diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c > b/src/mesa/drivers/dri/i965/intel_batchbuffer.c > index 887504273ab..319b640b2fd 100644 > --- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c > +++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c > @@ -31,6 +31,7 @@ > #include "brw_context.h" > #include "brw_defines.h" > #include "brw_state.h" > +#include "intel/tools/decoder.h" > The "intel/" part should no be needed. Let me know if any of the build/other stuff is a pain and I'll look into it. Thanks Emil _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev