[Mesa-dev] [PATCH 01/13] i965: Add a dependency on libisl

[Emil Velikov]

Strictly speaking, if the compiler is GL/DRI agnostic, one could move
it outside of src/mesa/drivers/dri and into src/intel. Although I'm
not sure how much of that is true.

On 16 April 2016 at 20:45, Jason Ekstrand <jason at jlekstrand.net> wrote:

Please add a note in the commit message to warn about Chad's
experience. I'm thinking about, but feel free to tweak/reword

"To avoid build issues, ensure that you're running `make' at the top
level and/or you're executed `make clean' beforehand."

> ---
>  configure.ac                          | 3 ++-
>  src/Makefile.am                       | 9 +++++++--
>  src/intel/Makefile.am                 | 4 ----
>  src/mesa/drivers/dri/i965/Makefile.am | 7 ++++++-
>  4 files changed, 15 insertions(+), 8 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 9226a0d..e4ce8fe 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -2459,7 +2459,8 @@ AM_CONDITIONAL(HAVE_SWRAST_DRI, test x$HAVE_SWRAST_DRI = xyes)
>
>  AM_CONDITIONAL(HAVE_INTEL_VULKAN, test "x$HAVE_INTEL_VULKAN" = xyes)
>
> -AM_CONDITIONAL(HAVE_INTEL_DRIVERS, test "x$HAVE_INTEL_VULKAN" = xyes)
> +AM_CONDITIONAL(HAVE_INTEL_DRIVERS, test "x$HAVE_INTEL_VULKAN" = xyes -o \
> +                                        "x$HAVE_I965_DRI" = xyes)
>
>  AM_CONDITIONAL(NEED_RADEON_DRM_WINSYS, test "x$HAVE_GALLIUM_R300" = xyes -o \
>                                              "x$HAVE_GALLIUM_R600" = xyes -o \
> diff --git a/src/Makefile.am b/src/Makefile.am
> index a0572b7..e9745d4 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -24,6 +24,10 @@ SUBDIRS = . gtest util mapi/glapi/gen mapi
>  # include only conditionally ?
>  SUBDIRS += compiler
>
> +if HAVE_INTEL_DRIVERS
> +SUBDIRS += intel
> +endif
> +
>  if NEED_OPENGL_COMMON
>  SUBDIRS += mesa
>  endif
> @@ -56,8 +60,9 @@ EXTRA_DIST = \
>  AM_CFLAGS = $(VISIBILITY_CFLAGS)
>  AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
>
> -if HAVE_INTEL_DRIVERS
> -SUBDIRS += intel
> +# This explicitly comes later because it depends on the i965 compiler
> +if HAVE_INTEL_VULKAN
> +SUBDIRS += intel/vulkan
>  endif
>
Please move this hunk just after mesa, and s/comes later/comes after mesa/


-Emil