It's a neat idea, and still useful in some cases, but the intel common
code is used by i965 and anvil only, this is a little clearer.
Signed-off-by: Dylan Baker
---
src/intel/blorp/meson.build | 1 -
src/intel/common/meson.build | 1 -
src/intel/isl/meson.build| 3 ---
src/meson.
This is the same logic as the previous two patches.
Signed-off-by: Dylan Baker
---
src/amd/addrlib/meson.build | 1 -
src/amd/common/meson.build | 1 -
src/meson.build | 4 +++-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/amd/addrlib/meson.build b/src/amd
: Dylan Baker
Tested-by: Lionel Landwerlin (v1)
---
src/gallium/drivers/freedreno/meson.build| 1 -
src/gallium/drivers/llvmpipe/meson.build | 1 -
src/gallium/drivers/nouveau/meson.build | 1 -
src/gallium/drivers/radeon/meson.build | 1 -
src/gallium/drivers/radeonsi
Quoting Eric Anholt (2017-11-13 13:07:31)
> Dylan Baker writes:
>
> > Using build_by_default : false is convenient for dependencies that can
> > be pulled in by various diverse components of the build system, the
> > gallium hardware/software drivers and state
Quoting Ian Romanick (2017-11-13 13:34:15)
> On 11/13/2017 10:49 AM, Dylan Baker wrote:
> > Quoting Ian Romanick (2017-11-10 14:32:49)
> > [snip]
> >
> >> +
> >> +def collect_data(spirv):
> >> +for x in spirv["opera
Quoting Ian Romanick (2017-11-10 14:32:50)
[snip]
> +
> +def can_have_extra_operands(name, enums):
> +"""Determine whether an enum can have extra operands.
> +
> +Some enums, like SpvDecoration, can have extra operands with some values.
> +Other enums, like SpvMemorySemantics, cannot.
>
Quoting Ian Romanick (2017-11-13 16:00:08)
>
> That's what I had first, and it did not work in some cases. I believe
> that list==list is only True if the elements have the same order. This
> function only requires that both lists have the same contents without
> regard for order. I will add a
Signed-off-by: Dylan Baker
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index e8467590df2..8ea2b3e106c 100644
--- a/meson.build
+++ b/meson.build
@@ -702,7 +702,7 @@ if with_gallium_freedreno
endif
llvm_modules = ['bitw
Build tested only.
Signed-off-by: Dylan Baker
---
meson.build | 6 ++-
src/gallium/drivers/svga/meson.build| 88 +
src/gallium/meson.build | 5 +-
src/gallium/targets/dri/meson.build | 5 ++
src/gallium
v2: - set with_gallium_omx when -Dgallium-omx=true
- Fix detection of omx plugins dir
- only use cflags from pkg-config, don't add linker flags.
---
meson.build| 60 -
meson_options.txt | 13
src/
v2: - set with_gallium_vdpau when -Dgallium-vdpau=true
- Install megadriver hard links and symlinks
- only use cflags from pkg-config, don't add linker flags.
---
meson.build | 46 -
meson_options.txt| 13
src/ga
Build tested only.
Signed-off-by: Dylan Baker
---
meson.build | 7 +++-
src/gallium/drivers/i915/meson.build| 70 +
src/gallium/meson.build | 7 ++--
src/gallium/targets/dri/meson.build | 5 +++
src/gallium
r and more obvious.
Tested with make distcheck.
v2: - Split tiny -> patch change
- Drop temporary variables
- change XA_VERSION_* -> XA_*
Signed-off-by: Dylan Baker
Reviewed-by: Emil Velikov
Reviewed-by: Matt Turner
---
configure.ac
building media state trackers with explicitly turned on (off and auto
worked previous)
- Split the XA autotools changes
- fix gallium media targets megadriver install
- Fix omx pluginsdir detection.
Dylan Baker (15):
meson: add proper LLVM modules to check for RadeonSI as well
Signed-off-by: Dylan Baker
Tested-by: Aaron Watry
---
meson.build | 22 --
src/gallium/drivers/r600/meson.build | 128 +++
src/gallium/meson.build | 6 +-
src/gallium/targets/dri/meson.build | 7 +-
4 files changed
v2: - set with_gallium_xa when -Dgallium-xa=true
- install pkg config file
---
meson.build | 22
meson_options.txt | 7 +++
src/gallium/meson.build | 7 ++-
src/gallium/state_trackers/xa/meson.build | 45 +++
Build tested only.
Signed-off-by: Dylan Baker
---
meson.build| 16
src/gallium/drivers/virgl/meson.build | 39 ++
src/gallium/meson.build| 7 +-
src/gallium/targets/dri/meson.build| 5
Because patch is more common than tiny for talking about the 3rd element
of a version.
Signed-off-by: Dylan Baker
---
configure.ac | 6 +++---
src/gallium/state_trackers/xa/xa_tracker.h.in | 2 +-
src/gallium/targets/d3dadapter9/Makefile.am | 2 +-
src/gallium
v2: - set with_gallium_xvmc when -Dgallium-xvmc=true
- Install megadrivers properly
- only use cflags from pkg-config, don't add linker flags.
---
meson.build | 40 ++-
meson_options.txt | 13 +
src/gallium/meson.bui
This is build tested only
Signed-off-by: Dylan Baker
---
meson.build | 6 +-
src/gallium/drivers/r300/meson.build | 156 +++
src/gallium/meson.build | 9 +-
src/gallium/targets/dri/meson.build | 12 ++-
4 files changed
This argument is the wrong approach for handling gallium media state
trackers, since it doesn't allow for an auto option. Instead we'll use
tristates, which do allow for auto.
This option has never been wired to anything anyway.
Signed-off-by: Dylan Baker
---
meson.build
v2: - set with_gallium_va when -Dgallium-va=true
- Fix megadrivers install
- only use cflags from pkg-config, don't add linker flags.
- Don't get version from pkg-config, it's not tracking the same
version information.
---
meson.build | 41 ++
which is required for the gallium media state trackers.
---
bin/install_megadrivers.py | 6 ++
1 file changed, 6 insertions(+)
diff --git a/bin/install_megadrivers.py b/bin/install_megadrivers.py
index a98d7dd177b..581ff9791e5 100755
--- a/bin/install_megadrivers.py
+++ b/bin/install_megadriv
Quoting Jon Turney (2017-11-14 04:05:21)
> On 13/11/2017 17:41, Dylan Baker wrote:
> > I thought I'd fixed this already,
> > Reviewed-by: Dylan Baker
>
> This workaround is already in place for dep_xxf86vm.
>
> I took a brief look, and didn't see anywhere
Quoting Marc Dietrich (2017-11-14 01:45:43)
> Hi Dylan,
>
> Am Dienstag, 14. November 2017, 02:09:08 CET schrieb Dylan Baker:
> > Signed-off-by: Dylan Baker
> > Tested-by: Aaron Watry
> > ---
> > meson.build | 22 --
> > src
Quoting Eric Engestrom (2017-11-14 06:47:33)
> On Monday, 2017-11-13 17:09:13 -0800, Dylan Baker wrote:
> > which is required for the gallium media state trackers.
> > ---
> > bin/install_megadrivers.py | 6 ++
> > 1 file changed, 6 insertions(+
Quoting Marc Dietrich (2017-11-14 01:49:42)
> Hi Dylan,
>
> Am Dienstag, 14. November 2017, 02:09:18 CET schrieb Dylan Baker:
> > v2: - set with_gallium_va when -Dgallium-va=true
> > - Fix megadrivers install
> > - only use cflags from pkg-config, don't a
Quoting Marc Dietrich (2017-11-14 02:51:38)
> Hi Dylan,
>
> Am Dienstag, 14. November 2017, 02:09:19 CET schrieb Dylan Baker:
> > v2: - set with_gallium_xa when -Dgallium-xa=true
> > - install pkg config file
> > ---
> > meson.build
This will allow us to simplify some guards within the gallium directory.
Signed-off-by: Dylan Baker
---
src/meson.build | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/meson.build b/src/meson.build
index 9232cc4ab18..00bbaa8989c 100644
--- a/src/meson.build
+++ b/src
Currently the target has a redundant guard, and the state tracker isn't
properly guarded.
Signed-off-by: Dylan Baker
---
src/gallium/meson.build | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index 7ccf48
I think "suffix" would be better for the title "name". Also, library ->
libraries.
With that changed:
Reviewed-by: Dylan Baker
Quoting Vinson Lee (2017-11-14 17:17:49)
> Signed-off-by: Vinson Lee
> ---
> src/mapi/es1api/ABI-check | 7 ++-
> src/mapi/es2a
Reviewed-by: Dylan Baker
Quoting Rafael Antognolli (2017-11-15 09:32:47)
> Xorg (and possibly other things) depend on this variable to find the
> path to DRI drivers.
>
> Signed-off-by: Rafael Antognolli
> Cc: Dylan Baker
> ---
> src/mesa/drivers/dri/meson.build | 1 +
bs, and I don't think
those get HAVE_PTHREADS.
I also don't konw what depdnency('threads') returns on windows, but in mean time
this probably fixes some platforms and doesn't break any that previous worked.
Reviewed-by: Dylan Baker
>
> In include/c11/threads.h the
Nope. meson builds all C++ code as C++11 because so much of mesa's C++ code
cannot be built without it (Because of LLVM). As far as I can tell the GLSL
compiler and the Intel Compiler are the only C++ code in mesa not using C++11.
Quoting Kai Wasserbäch (2017-11-15 08:45:30)
> Doesn't the meson.bu
7;:
> + # This is quite incomplete, but it hopefully covers the platforms that
> + # people actually use SCons on...
> + env.Append(CPPDEFINES= [
> + 'HAVE_TIMESPEC_GET',
> + ])
> +
I think that haiku uses scons, I've added one of (a
Quoting Ilia Mirkin (2017-11-15 09:52:06)
> On Wed, Nov 15, 2017 at 12:47 PM, Dylan Baker wrote:
> > Nope. meson builds all C++ code as C++11 because so much of mesa's C++ code
> > cannot be built without it (Because of LLVM). As far as I can tell the GLSL
> > compiler
This should make scons work correctly on every platform, so:
Reviewed-by: Dylan Baker
Quoting Nicolai Hähnle (2017-11-15 12:58:12)
> From: Nicolai Hähnle
>
> Tested with Travis and Appveyor.
>
> v2: add HAVE_TIMESPEC_GET for non-Windows Scons builds
> v3: use check_functi
Quoting Timothy Arceri (2017-11-15 16:16:10)
> This was left out of c980a3aa3133
> ---
> src/mesa/state_tracker/st_program.c | 10 ++
> 1 file changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/src/mesa/state_tracker/st_program.c
> b/src/mesa/state_tracker/st_program.c
> index 97b
build tested.
Signed-off-by: Dylan Baker
---
meson.build | 17 ++---
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/meson.build b/meson.build
index 0d201c711a0..261c4753427 100644
--- a/meson.build
+++ b/meson.build
@@ -554,13 +554,16 @@ endif
# TODO: texture
This patch checks for an and then enables sse4.1 optimizations if the
host machine will be x86/x86_64.
Signed-off-by: Dylan Baker
---
meson.build | 27 ++-
src/mesa/meson.build | 14 +++---
2 files changed, 37 insertions(+), 4 deletions(-)
diff --git a
This function is required for both the Intel "Anvil" vulkan driver and
the i965 GL driver. Error out if either of those is enabled but this
function isn't found.
Signed-off-by: Dylan Baker
---
meson.build | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
These are all either done already, or are autotools specific. The
misspelled gallium G3DVL is the autotools specific bit, meson is
handling that via build_by_default.
Signed-off-by: Dylan Baker
---
meson.build | 15 ---
1 file changed, 15 deletions(-)
diff --git a/meson.build b
Hey Emil, this commit breaks mesa pretty badly, wflinfo segfaults:
40a01c9a0ef2c8110d79c284976ef34c0f73be92 is the first bad commit
commit 40a01c9a0ef2c8110d79c284976ef34c0f73be92
Author: Emil Velikov
Date: Thu Nov 9 19:04:25 2017 +
egl/drm: move teardown code to the platform file
Tested-by: Dylan Baker
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103784
Quoting Emil Velikov (2017-11-16 10:36:01)
> From: Emil Velikov
>
> Cc: Mark Janes
> Fixes: 40a01c9a0ef ("egl/drm: move teardown code to the platform file")
> Fixes: 8d745abc009 (&q
Quoting Emil Velikov (2017-11-16 05:21:50)
> On 16 November 2017 at 01:11, Dylan Baker wrote:
> > This function is required for both the Intel "Anvil" vulkan driver and
> > the i965 GL driver. Error out if either of those is enabled but this
> > function isn't
Quoting Eric Engestrom (2017-11-16 03:46:04)
> On Wednesday, 2017-11-15 17:11:00 -0800, Dylan Baker wrote:
> > This patch allows building asm for x86 on x86_64 platforms, when the
> > operating system is the same. Previously cross compile always turned off
> > assembly. This
Quoting Emil Velikov (2017-11-16 05:21:50)
> On 16 November 2017 at 01:11, Dylan Baker wrote:
> > This function is required for both the Intel "Anvil" vulkan driver and
> > the i965 GL driver. Error out if either of those is enabled but this
> > function isn't
Quoting Matt Turner (2017-11-15 21:57:37)
> On Wed, Nov 15, 2017 at 5:10 PM, Dylan Baker wrote:
> > This patch checks for an and then enables sse4.1 optimizations if the
> > host machine will be x86/x86_64.
>
> There's some stack realignment stuff that probably needs t
Quoting Emil Velikov (2017-11-16 03:35:17)
> Hi Dylan,
>
> On 16 November 2017 at 01:10, Dylan Baker wrote:
> > This patch checks for an and then enables sse4.1 optimizations if the
> > host machine will be x86/x86_64.
> >
> Hell yeah, SSE is coming to town :-)
&
This patch checks for an and then enables sse4.1 optimizations if the
host machine will be x86/x86_64.
v2: - Don't compile code, it's unnecessary since we require a compiler
which always has SSE4.1 (Matt)
Signed-off-by: Dylan Baker
Reviewed-by: Eric Engestrom (v1)
---
m
This is build tested only
Signed-off-by: Dylan Baker
---
meson.build | 6 +-
src/gallium/drivers/r300/meson.build | 156 +++
src/gallium/meson.build | 9 +-
src/gallium/targets/dri/meson.build | 12 ++-
4 files changed
v4: - Ensure inc_amd_common defined when radeonsi is disabled (needed by
r600)
Signed-off-by: Dylan Baker
Tested-by: Aaron Watry
---
meson.build | 22 --
src/amd/common/meson.build | 2 -
src/gallium/drivers/r600/meson.build | 128
Signed-off-by: Dylan Baker
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 383ebb36662..87d435fcb71 100644
--- a/meson.build
+++ b/meson.build
@@ -702,7 +702,7 @@ if with_gallium_freedreno
endif
llvm_modules = ['bitw
Build tested only.
Signed-off-by: Dylan Baker
---
meson.build| 16
src/gallium/drivers/virgl/meson.build | 39 ++
src/gallium/meson.build| 7 +-
src/gallium/targets/dri/meson.build| 5
v2: - set with_gallium_vdpau when -Dgallium-vdpau=true
- Install megadriver hard links and symlinks
- only use cflags from pkg-config, don't add linker flags.
v4: - make use of the install_megadrivers.py changes
Signed-off-by: Dylan Baker
---
meson.
v2: - set with_gallium_va when -Dgallium-va=true
- Fix megadrivers install
- only use cflags from pkg-config, don't add linker flags.
- Don't get version from pkg-config, it's not tracking the same
version information.
v4: - Fix variable double-assignment
Signe
v2: - set with_gallium_omx when -Dgallium-omx=true
- Fix detection of omx plugins dir
- only use cflags from pkg-config, don't add linker flags.
Signed-off-by: Dylan Baker
---
meson.build| 60 -
meson_option
Build tested only.
Signed-off-by: Dylan Baker
---
meson.build | 6 ++-
src/gallium/drivers/svga/meson.build| 88 +
src/gallium/meson.build | 5 +-
src/gallium/targets/dri/meson.build | 5 ++
src/gallium
Build tested only.
Signed-off-by: Dylan Baker
---
meson.build | 7 +++-
src/gallium/drivers/i915/meson.build| 70 +
src/gallium/meson.build | 7 ++--
src/gallium/targets/dri/meson.build | 5 +++
src/gallium
v2: - set with_gallium_xvmc when -Dgallium-xvmc=true
- Install megadrivers properly
- only use cflags from pkg-config, don't add linker flags.
v4: - make use of the install_megadrivers.py changes
Signed-off-by: Dylan Baker
---
meson.build
v2: - set with_gallium_xa when -Dgallium-xa=true
- install pkg config file
Signed-off-by: Dylan Baker
---
meson.build | 22
meson_options.txt | 7 +++
src/gallium/meson.build | 7 ++-
src/gallium
This argument is the wrong approach for handling gallium media state
trackers, since it doesn't allow for an auto option. Instead we'll use
tristates, which do allow for auto.
This option has never been wired to anything anyway.
Signed-off-by: Dylan Baker
---
meson.build
Which is required for the gallium media state trackers.
v4: - Make the full version the hard link and the partial so versiions
the symlinks
Signed-off-by: Dylan Baker
---
bin/install_megadrivers.py | 19 ++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a
This patch checks for an and then enables sse4.1 optimizations if the
host machine will be x86/x86_64.
v2: - Don't compile code, it's unnecessary since we require a compiler
which always has SSE4.1 (Matt)
v3: - x64 -> x86_64 (Matt)
Signed-off-by: Dylan Baker
Reviewed-by: E
Quoting Emil Velikov (2017-11-17 03:11:50)
> On 16 November 2017 at 22:21, Dylan Baker wrote:
> > Quoting Emil Velikov (2017-11-16 03:35:17)
> >> Hi Dylan,
> >>
> >> On 16 November 2017 at 01:10, Dylan Baker wrote:
> >> > This patch checks for
Quoting Emil Velikov (2017-11-17 04:19:22)
> Hi Dylan,
>
> On 17 November 2017 at 00:27, Dylan Baker wrote:
>
> > + elif not (with_gallium_r600 or with_gallium_radeonsi or
> > with_gallium_nouveau)
>
>
> > + elif not (with_gallium_r600 or with_gallium_r
Quoting Matt Turner (2017-11-17 12:46:03)
> On Fri, Nov 17, 2017 at 12:34 PM, Dylan Baker wrote:
> > Quoting Emil Velikov (2017-11-17 03:11:50)
> >> On 16 November 2017 at 22:21, Dylan Baker wrote:
> >> > Quoting Emil Velikov (2017-11-16 03:35:17)
> >> >
I noticed this race condition too, this patch isn't correct though, since this
will add a radeonsi generated target unconditionally to the sources.
si_driinfo_h should be added to the gallium_dri_sources inside the `if
with_gallium_radeonsi` block.
Dylan
Quoting Juan A. Suarez Romero (2017-11-17
Quoting Emil Velikov (2017-11-17 04:19:22)
> Hi Dylan,
>
> On 17 November 2017 at 00:27, Dylan Baker wrote:
>
> > + elif not (with_gallium_r600 or with_gallium_radeonsi or
> > with_gallium_nouveau)
>
>
> > + elif not (with_gallium_r600 or with_gallium_r
Build tested only.
Signed-off-by: Dylan Baker
---
meson.build | 7 +++-
src/gallium/drivers/i915/meson.build| 70 +
src/gallium/meson.build | 7 ++--
src/gallium/targets/dri/meson.build | 5 +++
src/gallium
symlinks as necessary.
Signed-off-by: Dylan Baker
---
bin/install_megadrivers.py | 8
1 file changed, 8 insertions(+)
diff --git a/bin/install_megadrivers.py b/bin/install_megadrivers.py
index a98d7dd177b..587a1f6726d 100755
--- a/bin/install_megadrivers.py
+++ b/bin/install_megadrivers.py
This is build tested only
Signed-off-by: Dylan Baker
---
meson.build | 6 +-
src/gallium/drivers/r300/meson.build | 156 +++
src/gallium/meson.build | 9 +-
src/gallium/targets/dri/meson.build | 12 ++-
4 files changed
v2: - set with_gallium_omx when -Dgallium-omx=true
- Fix detection of omx plugins dir
- only use cflags from pkg-config, don't add linker flags.
Signed-off-by: Dylan Baker
---
meson.build| 60 -
meson_option
This argument is the wrong approach for handling gallium media state
trackers, since it doesn't allow for an auto option. Instead we'll use
tristates, which do allow for auto.
This option has never been wired to anything anyway.
Signed-off-by: Dylan Baker
---
meson.build
v4: - Ensure inc_amd_common defined when radeonsi is disabled (needed by
r600)
Signed-off-by: Dylan Baker
Tested-by: Aaron Watry
---
meson.build | 22 --
src/amd/common/meson.build | 2 -
src/gallium/drivers/r600/meson.build | 128
Build tested only.
Signed-off-by: Dylan Baker
---
meson.build| 16
src/gallium/drivers/virgl/meson.build | 39 ++
src/gallium/meson.build| 7 +-
src/gallium/targets/dri/meson.build| 5
v2: - set with_gallium_va when -Dgallium-va=true
- Fix megadrivers install
- only use cflags from pkg-config, don't add linker flags.
- Don't get version from pkg-config, it's not tracking the same
version information.
v4: - Fix variable double-assignment
Signe
Signed-off-by: Dylan Baker
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 383ebb36662..87d435fcb71 100644
--- a/meson.build
+++ b/meson.build
@@ -702,7 +702,7 @@ if with_gallium_freedreno
endif
llvm_modules = ['bitw
v2: - set with_gallium_xa when -Dgallium-xa=true
- install pkg config file
Signed-off-by: Dylan Baker
---
meson.build | 22
meson_options.txt | 7 +++
src/gallium/meson.build | 7 ++-
src/gallium
v2: - set with_gallium_vdpau when -Dgallium-vdpau=true
- Install megadriver hard links and symlinks
- only use cflags from pkg-config, don't add linker flags.
v4: - make use of the install_megadrivers.py changes
v5: - adapt for install_megadrivers changes
Signed-off-by: Dylan
v2: - set with_gallium_xvmc when -Dgallium-xvmc=true
- Install megadrivers properly
- only use cflags from pkg-config, don't add linker flags.
v4: - make use of the install_megadrivers.py changes
v5: - adapt for install_megadrivers changes
Signed-off-by: Dylan Baker
---
meson.
Build tested only.
Signed-off-by: Dylan Baker
---
meson.build | 6 ++-
src/gallium/drivers/svga/meson.build| 88 +
src/gallium/meson.build | 5 +-
src/gallium/targets/dri/meson.build | 5 ++
src/gallium
This patch checks for an and then enables sse4.1 optimizations if the
host machine will be x86/x86_64.
v2: - Don't compile code, it's unnecessary since we require a compiler
which always has SSE4.1 (Matt)
v3: - x64 -> x86_64 (Matt)
Signed-off-by: Dylan Baker
Reviewed-by: E
These are all either done already, or are autotools specific. The
misspelled gallium G3DVL is the autotools specific bit, meson is
handling that via build_by_default.
Signed-off-by: Dylan Baker
Reviewed-by: Eric Engestrom
---
meson.build | 15 ---
1 file changed, 15 deletions
build tested.
v4: - set condition to build == x86_64 and host == 'x86' and
build.system == host.system
Signed-off-by: Dylan Baker
---
meson.build | 17 ++---
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/meson.build b/meson.build
index 049c9a24e4a..2
This function is required for both the Intel "Anvil" vulkan driver and
the i965 GL driver. Error out if either of those is enabled but this
function isn't found.
Signed-off-by: Dylan Baker
Reviewed-by: Emil Velikov
Reviewed-by: Eric Engestrom
---
meson.build | 6 --
1
There are two distinct set of problems this series addresses.
1) the meson build has never worked
2) the checks for this path have been broken in several different ways for a
long time.
Dylan Baker (8):
glapi: don't walk backwards for includes
meson: fix test source name for static
Instead just set the proper -I flags and include it from a more standard
path. In this case we'll add -Isrc/mesa (which is common), and #include
main/foo.h.
---
src/mapi/Makefile.am | 3 ++-
src/mapi/glapi/meson.build | 1 +
src/mapi/glapi/tests/check_table.cpp | 2 +-
3
Because meson won't put it in that folder.
Signed-off-by: Dylan Baker
---
src/mapi/glapi/tests/check_table.cpp | 2 +-
src/mesa/main/tests/Makefile.am | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/mapi/glapi/tests/check_table.cpp
b/src/mapi/glapi/
Signed-off-by: Dylan Baker
---
src/mapi/Makefile.am | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index 015edc37cb3..5db888abddc 100644
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -150,7 +150,8 @@ check_PROGRAMS
Fixes: 7009955281260fbb ("mesa: Remove GL_APPLE_vertex_array_object stubs")
Signed-off-by: Dylan Baker
---
src/mapi/glapi/tests/check_table.cpp | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/mapi/glapi/tests/check_table.cpp
b/src/mapi/glapi/tests/check_table.cpp
index 7
Signed-off-by: Dylan Baker
---
src/mesa/state_tracker/tests/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/mesa/state_tracker/tests/Makefile.am
b/src/mesa/state_tracker/tests/Makefile.am
index 6c58d367694..18c0ce50621 100644
--- a/src/mesa/state_tracker/tests/Makefile.am
Signed-off-by: Dylan Baker
---
src/mapi/glapi/meson.build | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/mapi/glapi/meson.build b/src/mapi/glapi/meson.build
index 892d8b35759..db6cd834511 100644
--- a/src/mapi/glapi/meson.build
+++ b/src/mapi/glapi/meson.build
This doesn't actually accomplish what it's meant to do, as extern C
doesn't undefine __cplusplus, so the included headers define a template
(because __cplusplus is defined), but then that code is in an 'extern
"C"' block, and explosion.
Signed-off-by: Dyl
fixes: 43a6e84927e3 ("meson: build mesa test.")
Signed-off-by: Dylan Baker
---
src/mesa/main/tests/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mesa/main/tests/meson.build b/src/mesa/main/tests/meson.build
index 2c1d8e067e8..78bef00f61e 100644
This is still not fully correct (haiku and BSD are probably not
correct), but Linux is not regressed and this should be correct for
macOS and Windows.
Signed-off-by: Dylan Baker
---
meson.build | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/meson.build b
This option has been acting as a strange sort of half-tri state anyway.
Signed-off-by: Dylan Baker
---
meson.build | 48 +---
meson_options.txt | 5 +++--
2 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/meson.build b
There is one provided unconditionally, and one guarded by platform ==
linux. Remove the unconditional one.
Signed-off-by: Dylan Baker
---
meson.build | 1 -
1 file changed, 1 deletion(-)
diff --git a/meson.build b/meson.build
index 383ebb36662..ce2c8c2c1d0 100644
--- a/meson.build
+++ b
This is necessary to support operating systems other than the *nix
family (excluding macOS). For Linux nothing has changed, the defaults
are still the same.
Signed-off-by: Dylan Baker
---
meson.build | 7 +++
meson_options.txt | 4 ++--
2 files changed, 9 insertions(+), 2 deletions
This fixes the windows and macos stubs to be consistent with the *nix
path.
Signed-off-by: Dylan Baker
---
meson.build| 4
src/glx/meson.build| 4 ++--
src/mapi/glapi/meson.build | 2 +-
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/meson.build b
501 - 600 of 2585 matches
Mail list logo
