Re: [Mesa-dev] [PATCH 1/7] mesa: Add gallium include dirs to more parts of the tree.
On 13/02/15 00:49, Eric Anholt wrote: Jose Fonseca jfons...@vmware.com writes: Thanks for doing this. I appreciate it. I have no objection with the series. I'm happy to see more reuse. We can always move things around later, and it will be much easier when then are less entangled/duplicated. We'll need to update SCons include paths too. If you have a git repos with your series that I can pull from I'll give it a go tomorrow and provide a patch for it. gallium-includes of my tree. Sorry it took this long to come back to on this. I was sick for a couple days then had to rush to catch up. I've tried to build your branch, and it looks like with your v2: Try to patch up the scons bits. update everything just works. Apart of one minor comment (in a seperate email), the series looks good: Reviewed-by: Jose Fonseca jfons...@vmware.com ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/7] mesa: Add gallium include dirs to more parts of the tree.
Thanks for doing this. I appreciate it. I have no objection with the series. I'm happy to see more reuse. We can always move things around later, and it will be much easier when then are less entangled/duplicated. We'll need to update SCons include paths too. If you have a git repos with your series that I can pull from I'll give it a go tomorrow and provide a patch for it. Jose On 12/02/15 00:48, Eric Anholt wrote: --- src/glsl/Makefile.am | 2 ++ src/mesa/drivers/dri/common/Makefile.am | 2 ++ src/mesa/drivers/dri/i915/Makefile.am| 2 ++ src/mesa/drivers/dri/i965/Makefile.am| 2 ++ src/mesa/drivers/dri/nouveau/Makefile.am | 2 ++ src/mesa/drivers/dri/r200/Makefile.am| 2 ++ src/mesa/drivers/dri/radeon/Makefile.am | 2 ++ src/mesa/drivers/dri/swrast/Makefile.am | 2 ++ src/util/Makefile.am | 2 ++ 9 files changed, 18 insertions(+) diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am index e89a9ad..75a5b13 100644 --- a/src/glsl/Makefile.am +++ b/src/glsl/Makefile.am @@ -26,6 +26,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa/ \ + -I$(top_srcdir)/src/gallium/include \ + -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/glsl/glcpp \ -I$(top_srcdir)/src/glsl/nir \ -I$(top_srcdir)/src/gtest/include \ diff --git a/src/mesa/drivers/dri/common/Makefile.am b/src/mesa/drivers/dri/common/Makefile.am index af6f742..da8f97a 100644 --- a/src/mesa/drivers/dri/common/Makefile.am +++ b/src/mesa/drivers/dri/common/Makefile.am @@ -30,6 +30,8 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa/ \ + -I$(top_srcdir)/src/gallium/include \ + -I$(top_srcdir)/src/gallium/auxiliary \ $(DEFINES) \ $(EXPAT_CFLAGS) \ $(VISIBILITY_CFLAGS) diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am index ac49360..822f74c 100644 --- a/src/mesa/drivers/dri/i915/Makefile.am +++ b/src/mesa/drivers/dri/i915/Makefile.am @@ -28,6 +28,8 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa/ \ + -I$(top_srcdir)/src/gallium/include \ + -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/mesa/drivers/dri/common \ -I$(top_srcdir)/src/mesa/drivers/dri/intel/server \ -I$(top_builddir)/src/mesa/drivers/dri/common \ diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am index 07eefce..5d33159 100644 --- a/src/mesa/drivers/dri/i965/Makefile.am +++ b/src/mesa/drivers/dri/i965/Makefile.am @@ -28,6 +28,8 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa/ \ + -I$(top_srcdir)/src/gallium/include \ + -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/mesa/drivers/dri/common \ -I$(top_srcdir)/src/mesa/drivers/dri/intel/server \ -I$(top_srcdir)/src/gtest/include \ diff --git a/src/mesa/drivers/dri/nouveau/Makefile.am b/src/mesa/drivers/dri/nouveau/Makefile.am index f302864..61af95a 100644 --- a/src/mesa/drivers/dri/nouveau/Makefile.am +++ b/src/mesa/drivers/dri/nouveau/Makefile.am @@ -33,6 +33,8 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa/ \ + -I$(top_srcdir)/src/gallium/include \ + -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/mesa/drivers/dri/common \ $(DEFINES) \ $(VISIBILITY_CFLAGS) \ diff --git a/src/mesa/drivers/dri/r200/Makefile.am b/src/mesa/drivers/dri/r200/Makefile.am index a156728..137d3c8 100644 --- a/src/mesa/drivers/dri/r200/Makefile.am +++ b/src/mesa/drivers/dri/r200/Makefile.am @@ -32,6 +32,8 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa/ \ + -I$(top_srcdir)/src/gallium/include \ + -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/mesa/drivers/dri/common \ -I$(top_srcdir)/src/mesa/drivers/dri/r200/server \ -I$(top_builddir)/src/mesa/drivers/dri/common \ diff --git a/src/mesa/drivers/dri/radeon/Makefile.am b/src/mesa/drivers/dri/radeon/Makefile.am index 25c4884..b236aa6 100644 --- a/src/mesa/drivers/dri/radeon/Makefile.am +++ b/src/mesa/drivers/dri/radeon/Makefile.am @@ -33,6 +33,8 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa/ \ + -I$(top_srcdir)/src/gallium/include \ + -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/mesa/drivers/dri/common \ -I$(top_srcdir)/src/mesa/drivers/dri/radeon/server \ -I$(top_builddir)/src/mesa/drivers/dri/common \ diff --git a/src/mesa/drivers/dri/swrast/Makefile.am
Re: [Mesa-dev] [PATCH 1/7] mesa: Add gallium include dirs to more parts of the tree.
Jose Fonseca jfons...@vmware.com writes: Thanks for doing this. I appreciate it. I have no objection with the series. I'm happy to see more reuse. We can always move things around later, and it will be much easier when then are less entangled/duplicated. We'll need to update SCons include paths too. If you have a git repos with your series that I can pull from I'll give it a go tomorrow and provide a patch for it. gallium-includes of my tree. signature.asc Description: PGP signature ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/7] mesa: Add gallium include dirs to more parts of the tree.
Matt Turner matts...@gmail.com writes: On Wed, Feb 11, 2015 at 4:48 PM, Eric Anholt e...@anholt.net wrote: --- Maybe I just read what I wanted to read in the cover letter, but I was expecting you to move u_math.h to src/util instead of this patch. That doesn't work because of u_math's inclusion of pipe/p_compiler.h? ...which in turn relies on p_config.h. So, yeah. Basically I was trying to get something out that hopefully wouldn't be sufficiently objected to, that would get us making progress toward more sharing. I know I've started toward getting bitset.h moved a bunch of times, and lost motivation before getting something perfect. I think I'm not alone. signature.asc Description: PGP signature ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/7] mesa: Add gallium include dirs to more parts of the tree.
On Wed, Feb 11, 2015 at 5:02 PM, Matt Turner matts...@gmail.com wrote: On Wed, Feb 11, 2015 at 4:48 PM, Eric Anholt e...@anholt.net wrote: --- Maybe I just read what I wanted to read in the cover letter, but I was expecting you to move u_math.h to src/util instead of this patch. That doesn't work because of u_math's inclusion of pipe/p_compiler.h? If so, and assuming it just needs the PIPE_* definitions, I think we can probably just replace most of them. PIPE_ARCH_BIG_ENDIAN is the only one that looks like it might be a pain. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 1/7] mesa: Add gallium include dirs to more parts of the tree.
--- src/glsl/Makefile.am | 2 ++ src/mesa/drivers/dri/common/Makefile.am | 2 ++ src/mesa/drivers/dri/i915/Makefile.am| 2 ++ src/mesa/drivers/dri/i965/Makefile.am| 2 ++ src/mesa/drivers/dri/nouveau/Makefile.am | 2 ++ src/mesa/drivers/dri/r200/Makefile.am| 2 ++ src/mesa/drivers/dri/radeon/Makefile.am | 2 ++ src/mesa/drivers/dri/swrast/Makefile.am | 2 ++ src/util/Makefile.am | 2 ++ 9 files changed, 18 insertions(+) diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am index e89a9ad..75a5b13 100644 --- a/src/glsl/Makefile.am +++ b/src/glsl/Makefile.am @@ -26,6 +26,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa/ \ + -I$(top_srcdir)/src/gallium/include \ + -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/glsl/glcpp \ -I$(top_srcdir)/src/glsl/nir \ -I$(top_srcdir)/src/gtest/include \ diff --git a/src/mesa/drivers/dri/common/Makefile.am b/src/mesa/drivers/dri/common/Makefile.am index af6f742..da8f97a 100644 --- a/src/mesa/drivers/dri/common/Makefile.am +++ b/src/mesa/drivers/dri/common/Makefile.am @@ -30,6 +30,8 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa/ \ + -I$(top_srcdir)/src/gallium/include \ + -I$(top_srcdir)/src/gallium/auxiliary \ $(DEFINES) \ $(EXPAT_CFLAGS) \ $(VISIBILITY_CFLAGS) diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am index ac49360..822f74c 100644 --- a/src/mesa/drivers/dri/i915/Makefile.am +++ b/src/mesa/drivers/dri/i915/Makefile.am @@ -28,6 +28,8 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa/ \ + -I$(top_srcdir)/src/gallium/include \ + -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/mesa/drivers/dri/common \ -I$(top_srcdir)/src/mesa/drivers/dri/intel/server \ -I$(top_builddir)/src/mesa/drivers/dri/common \ diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am index 07eefce..5d33159 100644 --- a/src/mesa/drivers/dri/i965/Makefile.am +++ b/src/mesa/drivers/dri/i965/Makefile.am @@ -28,6 +28,8 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa/ \ + -I$(top_srcdir)/src/gallium/include \ + -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/mesa/drivers/dri/common \ -I$(top_srcdir)/src/mesa/drivers/dri/intel/server \ -I$(top_srcdir)/src/gtest/include \ diff --git a/src/mesa/drivers/dri/nouveau/Makefile.am b/src/mesa/drivers/dri/nouveau/Makefile.am index f302864..61af95a 100644 --- a/src/mesa/drivers/dri/nouveau/Makefile.am +++ b/src/mesa/drivers/dri/nouveau/Makefile.am @@ -33,6 +33,8 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa/ \ + -I$(top_srcdir)/src/gallium/include \ + -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/mesa/drivers/dri/common \ $(DEFINES) \ $(VISIBILITY_CFLAGS) \ diff --git a/src/mesa/drivers/dri/r200/Makefile.am b/src/mesa/drivers/dri/r200/Makefile.am index a156728..137d3c8 100644 --- a/src/mesa/drivers/dri/r200/Makefile.am +++ b/src/mesa/drivers/dri/r200/Makefile.am @@ -32,6 +32,8 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa/ \ + -I$(top_srcdir)/src/gallium/include \ + -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/mesa/drivers/dri/common \ -I$(top_srcdir)/src/mesa/drivers/dri/r200/server \ -I$(top_builddir)/src/mesa/drivers/dri/common \ diff --git a/src/mesa/drivers/dri/radeon/Makefile.am b/src/mesa/drivers/dri/radeon/Makefile.am index 25c4884..b236aa6 100644 --- a/src/mesa/drivers/dri/radeon/Makefile.am +++ b/src/mesa/drivers/dri/radeon/Makefile.am @@ -33,6 +33,8 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa/ \ + -I$(top_srcdir)/src/gallium/include \ + -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/mesa/drivers/dri/common \ -I$(top_srcdir)/src/mesa/drivers/dri/radeon/server \ -I$(top_builddir)/src/mesa/drivers/dri/common \ diff --git a/src/mesa/drivers/dri/swrast/Makefile.am b/src/mesa/drivers/dri/swrast/Makefile.am index 0837b45..bfc3c10 100644 --- a/src/mesa/drivers/dri/swrast/Makefile.am +++ b/src/mesa/drivers/dri/swrast/Makefile.am @@ -29,6 +29,8 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa/ \ + -I$(top_srcdir)/src/gallium/include \ + -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/mesa/drivers/dri/common \
Re: [Mesa-dev] [PATCH 1/7] mesa: Add gallium include dirs to more parts of the tree.
On Wed, Feb 11, 2015 at 4:48 PM, Eric Anholt e...@anholt.net wrote: --- Maybe I just read what I wanted to read in the cover letter, but I was expecting you to move u_math.h to src/util instead of this patch. That doesn't work because of u_math's inclusion of pipe/p_compiler.h? ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
