Mesa (master): configure: radv depends on mako

[Eric Engeström]

Module: Mesa
Branch: master
Commit: c765c39ea73178c81a8bf88fe57c8d39a01dc57d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c765c39ea73178c81a8bf88fe57c8d39a01dc57d

Author: Eric Engestrom 
Date:   Mon Jun  4 12:08:15 2018 +0100

configure: radv depends on mako

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=106784
Fixes: 17201a2eb0b1b85387136 "radv: port to using updated anv
  entrypoint/extension generator."
Acked-by: Bas Nieuwenhuizen 
Signed-off-by: Eric Engestrom 

---

 configure.ac | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configure.ac b/configure.ac
index 02dca4547c..600127af8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2099,6 +2099,9 @@ if test -n "$with_vulkan_drivers"; then
 PKG_CHECK_MODULES([AMDGPU], [libdrm >= $LIBDRM_AMDGPU_REQUIRED 
libdrm_amdgpu >= $LIBDRM_AMDGPU_REQUIRED])
 radeon_llvm_check $LLVM_REQUIRED_RADV "radv"
 require_x11_dri3 "radv"
+if test "x$acv_mako_found" = xno; then
+AC_MSG_ERROR([Python mako module v$PYTHON_MAKO_REQUIRED or 
higher not found])
+fi
 HAVE_RADEON_VULKAN=yes
 ;;
 *)

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): travis: use correct form for array options

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 5bdc38f3566f8f281aab3a8c86c0d499e73c2fb2
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5bdc38f3566f8f281aab3a8c86c0d499e73c2fb2

Author: Eric Engestrom 
Date:   Tue Jun  5 11:42:02 2018 +0100

travis: use correct form for array options

I'd like to eventually drop support for the confusing "an array of
a single empty string is meant to be interpreted as an empty array", so
let's start by not using it anymore.

Reviewed-by: Dylan Baker 
Signed-off-by: Eric Engestrom 

---

 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d05c40bf9d..1f83f5b8d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ matrix:
 - env:
 - LABEL="meson Vulkan"
 - BUILD=meson
-- MESON_OPTIONS="-Ddri-drivers= -Dgallium-drivers="
+- MESON_OPTIONS="-Ddri-drivers=[] -Dgallium-drivers=[]"
 - LLVM_VERSION=5.0
 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
   addons:
@@ -53,7 +53,7 @@ matrix:
 - env:
 - LABEL="meson loaders/classic DRI"
 - BUILD=meson
-- MESON_OPTIONS="-Dvulkan-drivers= -Dgallium-drivers="
+- MESON_OPTIONS="-Dvulkan-drivers=[] -Dgallium-drivers=[]"
   addons:
 apt:
   packages:

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): autotools: add missing android file to package

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 66c61797ada12e0e2b396affcc2dc495b6cc04ed
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=66c61797ada12e0e2b396affcc2dc495b6cc04ed

Author: Eric Engestrom 
Date:   Mon Jun  4 18:06:30 2018 +0100

autotools: add missing android file to package

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=106779
Fixes: ff904978a1d299a36b587 "gallium/util: Android backtrace support"
Reviewed-by: Dylan Baker 
Signed-off-by: Eric Engestrom 

---

 src/gallium/auxiliary/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gallium/auxiliary/Makefile.am 
b/src/gallium/auxiliary/Makefile.am
index 07856e5a52..6b048b8eeb 100644
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -118,6 +118,7 @@ EXTRA_DIST = \
postprocess/ADDING \
rbug/README \
target-helpers \
+   util/u_debug_stack_android.cpp \
util/u_format.csv \
util/u_format_pack.py \
util/u_format_parse.py \

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: fix platforms check for `-D egl=true`

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 7c4423cce98f95c3ab7349b3f7abc4a558cb6c48
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c4423cce98f95c3ab7349b3f7abc4a558cb6c48

Author: Eric Engestrom 
Date:   Mon Jun  4 11:26:10 2018 +0100

meson: fix platforms check for `-D egl=true`

Fixes: 0ed6a87a106b6e2266e0 "meson: fix platforms=[]"
Reported-by: Christoph Haag 
Reviewed-by: Dylan Baker 
Signed-off-by: Eric Engestrom 

---

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 7b7c118d77..1d1b2a979b 100644
--- a/meson.build
+++ b/meson.build
@@ -292,7 +292,7 @@ elif _egl == 'true'
 error('EGL requires dri')
   elif not with_shared_glapi
 error('EGL requires shared-glapi')
-  elif with_platforms
+  elif not with_platforms
 error('No platforms specified, consider -Dplatforms=drm,x11 at least')
   elif not ['disabled', 'dri'].contains(with_glx)
 error('EGL requires dri, but a GLX is being built without dri')

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: drop unused empty string array element

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 03a2e7b6627a99222b4ca4777047bbe2b8186c7b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=03a2e7b6627a99222b4ca4777047bbe2b8186c7b

Author: Eric Engestrom 
Date:   Thu May 10 16:12:12 2018 +0100

meson: drop unused empty string array element

Signed-off-by: Eric Engestrom 

---

 meson.build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index ab99c26313..7b7c118d77 100644
--- a/meson.build
+++ b/meson.build
@@ -100,13 +100,13 @@ if _drivers.contains('auto')
 if ['x86', 'x86_64'].contains(host_machine.cpu_family())
   _drivers = ['i915', 'i965', 'r100', 'r200', 'nouveau']
 elif ['arm', 'aarch64'].contains(host_machine.cpu_family())
-  _drivers = ['']
+  _drivers = []
 else
   error('Unknown architecture. Please pass -Ddri-drivers to set driver 
options. Patches gladly accepted to fix this.')
 endif
   elif ['darwin', 'windows', 'cygwin', 'haiku'].contains(host_machine.system())
 # only swrast would make sense here, but gallium swrast is a much better 
default
-_drivers = ['']
+_drivers = []
   else
 error('Unknown OS. Please pass -Ddri-drivers to set driver options. 
Patches gladly accepted to fix this.')
   endif
@@ -180,7 +180,7 @@ if _vulkan_drivers.contains('auto')
 endif
   elif ['darwin', 'windows', 'cygwin', 'haiku'].contains(host_machine.system())
 # No vulkan driver supports windows or macOS currently
-_vulkan_drivers = ['']
+_vulkan_drivers = []
   else
 error('Unknown OS. Please pass -Dvulkan-drivers to set driver options. 
Patches gladly accepted to fix this.')
   endif

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): docs/meson: mention how to use array options

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 57fbc2ac5023d281b8134f4da4da821a7ae405f8
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=57fbc2ac5023d281b8134f4da4da821a7ae405f8

Author: Eric Engestrom 
Date:   Mon May 14 16:39:42 2018 +0100

docs/meson: mention how to use array options

Signed-off-by: Eric Engestrom 

---

 docs/meson.html | 8 
 1 file changed, 8 insertions(+)

diff --git a/docs/meson.html b/docs/meson.html
index f394a22fc2..29907a60a9 100644
--- a/docs/meson.html
+++ b/docs/meson.html
@@ -68,6 +68,14 @@ command are in the form -D "command"="value".
 
 
 
+Note that options taking lists (such as platforms) are
+http://mesonbuild.com/Build-options.html#using-build-options;>a bit
+more complicated, but the simplest form compatible with Mesa options
+is to use a comma to separate values (-D platforms=drm,wayland)
+and brackets to represent an empty list (-D platforms=[]).
+
+
+
 Once you've run the initial meson command successfully you can use
 your configured backend to build the project. With ninja, the -C option can be
 be used to point at a directory to build.

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: fix dri-drivers=[]

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 393abd6a57d8caf25fc1283e84bea4a76f5d3676
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=393abd6a57d8caf25fc1283e84bea4a76f5d3676

Author: Eric Engestrom 
Date:   Thu May 10 16:03:30 2018 +0100

meson: fix dri-drivers=[]

Fixes: 5608d0a2cee47c7d037f ("meson: use array type options")
Signed-off-by: Eric Engestrom 

---

 meson.build | 25 +
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/meson.build b/meson.build
index 4aafba802a..21579de0ac 100644
--- a/meson.build
+++ b/meson.build
@@ -93,13 +93,6 @@ endif
 
 system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly', 
'linux'].contains(host_machine.system())
 
-with_dri = false
-with_dri_i915 = false
-with_dri_i965 = false
-with_dri_r100 = false
-with_dri_r200 = false
-with_dri_nouveau = false
-with_dri_swrast = false
 _drivers = get_option('dri-drivers')
 if _drivers.contains('auto')
   if system_has_kms_drm
@@ -118,15 +111,15 @@ if _drivers.contains('auto')
 error('Unknown OS. Please pass -Ddri-drivers to set driver options. 
Patches gladly accepted to fix this.')
   endif
 endif
-if _drivers != ['']
-  with_dri_i915 = _drivers.contains('i915')
-  with_dri_i965 = _drivers.contains('i965')
-  with_dri_r100 = _drivers.contains('r100')
-  with_dri_r200 = _drivers.contains('r200')
-  with_dri_nouveau = _drivers.contains('nouveau')
-  with_dri_swrast = _drivers.contains('swrast')
-  with_dri = true
-endif
+
+with_dri_i915 = _drivers.contains('i915')
+with_dri_i965 = _drivers.contains('i965')
+with_dri_r100 = _drivers.contains('r100')
+with_dri_r200 = _drivers.contains('r200')
+with_dri_nouveau = _drivers.contains('nouveau')
+with_dri_swrast = _drivers.contains('swrast')
+
+with_dri = _drivers.length() != 0 and _drivers != ['']
 
 with_gallium = false
 with_gallium_pl111 = false

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: fix gallium-drivers=[]

[Eric Engeström]

Module: Mesa
Branch: master
Commit: a425db4d7dc327667ac1a8c3ee0f6a6e1cb96433
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=a425db4d7dc327667ac1a8c3ee0f6a6e1cb96433

Author: Eric Engestrom 
Date:   Thu May 10 16:04:26 2018 +0100

meson: fix gallium-drivers=[]

Fixes: 5608d0a2cee47c7d037f ("meson: use array type options")
Signed-off-by: Eric Engestrom 

---

 meson.build | 65 +++--
 1 file changed, 24 insertions(+), 41 deletions(-)

diff --git a/meson.build b/meson.build
index 21579de0ac..a09122479d 100644
--- a/meson.build
+++ b/meson.build
@@ -121,23 +121,6 @@ with_dri_swrast = _drivers.contains('swrast')
 
 with_dri = _drivers.length() != 0 and _drivers != ['']
 
-with_gallium = false
-with_gallium_pl111 = false
-with_gallium_radeonsi = false
-with_gallium_r300 = false
-with_gallium_r600 = false
-with_gallium_nouveau = false
-with_gallium_freedreno = false
-with_gallium_softpipe = false
-with_gallium_vc4 = false
-with_gallium_v3d = false
-with_gallium_etnaviv = false
-with_gallium_imx = false
-with_gallium_tegra = false
-with_gallium_i915 = false
-with_gallium_svga = false
-with_gallium_virgl = false
-with_gallium_swr = false
 _drivers = get_option('gallium-drivers')
 if _drivers.contains('auto')
   if system_has_kms_drm
@@ -160,30 +143,30 @@ if _drivers.contains('auto')
 error('Unknown OS. Please pass -Dgallium-drivers to set driver options. 
Patches gladly accepted to fix this.')
   endif
 endif
-if _drivers != ['']
-  with_gallium_pl111 = _drivers.contains('pl111')
-  with_gallium_radeonsi = _drivers.contains('radeonsi')
-  with_gallium_r300 = _drivers.contains('r300')
-  with_gallium_r600 = _drivers.contains('r600')
-  with_gallium_nouveau = _drivers.contains('nouveau')
-  with_gallium_freedreno = _drivers.contains('freedreno')
-  with_gallium_softpipe = _drivers.contains('swrast')
-  with_gallium_v3d = _drivers.contains('v3d')
-  with_gallium_vc4 = _drivers.contains('vc4')
-  with_gallium_etnaviv = _drivers.contains('etnaviv')
-  with_gallium_imx = _drivers.contains('imx')
-  with_gallium_tegra = _drivers.contains('tegra')
-  with_gallium_i915 = _drivers.contains('i915')
-  with_gallium_svga = _drivers.contains('svga')
-  with_gallium_virgl = _drivers.contains('virgl')
-  with_gallium_swr = _drivers.contains('swr')
-  with_gallium = true
-  if system_has_kms_drm
-_glx = get_option('glx')
-_egl = get_option('egl')
-if _glx == 'dri' or _egl == 'true' or (_glx == 'disabled' and _egl != 
'false')
-  with_dri = true
-endif
+with_gallium_pl111 = _drivers.contains('pl111')
+with_gallium_radeonsi = _drivers.contains('radeonsi')
+with_gallium_r300 = _drivers.contains('r300')
+with_gallium_r600 = _drivers.contains('r600')
+with_gallium_nouveau = _drivers.contains('nouveau')
+with_gallium_freedreno = _drivers.contains('freedreno')
+with_gallium_softpipe = _drivers.contains('swrast')
+with_gallium_vc4 = _drivers.contains('vc4')
+with_gallium_v3d = _drivers.contains('v3d')
+with_gallium_etnaviv = _drivers.contains('etnaviv')
+with_gallium_imx = _drivers.contains('imx')
+with_gallium_tegra = _drivers.contains('tegra')
+with_gallium_i915 = _drivers.contains('i915')
+with_gallium_svga = _drivers.contains('svga')
+with_gallium_virgl = _drivers.contains('virgl')
+with_gallium_swr = _drivers.contains('swr')
+
+with_gallium = _drivers.length() != 0 and _drivers != ['']
+
+if with_gallium and system_has_kms_drm
+  _glx = get_option('glx')
+  _egl = get_option('egl')
+  if _glx == 'dri' or _egl == 'true' or (_glx == 'disabled' and _egl != 
'false')
+with_dri = true
   endif
 endif
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: fix platforms=[]

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 0ed6a87a106b6e2266e01c5d7e31344229833c8d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=0ed6a87a106b6e2266e01c5d7e31344229833c8d

Author: Eric Engestrom 
Date:   Thu May 10 16:11:29 2018 +0100

meson: fix platforms=[]

Fixes: 5608d0a2cee47c7d037f ("meson: use array type options")
Signed-off-by: Eric Engestrom 

---

 meson.build | 28 +---
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/meson.build b/meson.build
index 8db260c952..ab99c26313 100644
--- a/meson.build
+++ b/meson.build
@@ -221,12 +221,6 @@ else
   with_dri_platform = 'none'
 endif
 
-with_platform_android = false
-with_platform_wayland = false
-with_platform_x11 = false
-with_platform_drm = false
-with_platform_surfaceless = false
-egl_native_platform = ''
 _platforms = get_option('platforms')
 if _platforms.contains('auto')
   if system_has_kms_drm
@@ -239,13 +233,17 @@ if _platforms.contains('auto')
 error('Unknown OS. Please pass -Dplatforms to set platforms. Patches 
gladly accepted to fix this.')
   endif
 endif
-if _platforms != ['']
-  with_platform_android = _platforms.contains('android')
-  with_platform_x11 = _platforms.contains('x11')
-  with_platform_wayland = _platforms.contains('wayland')
-  with_platform_drm = _platforms.contains('drm')
-  with_platform_haiku = _platforms.contains('haiku')
-  with_platform_surfaceless = _platforms.contains('surfaceless')
+
+with_platform_android = _platforms.contains('android')
+with_platform_x11 = _platforms.contains('x11')
+with_platform_wayland = _platforms.contains('wayland')
+with_platform_drm = _platforms.contains('drm')
+with_platform_haiku = _platforms.contains('haiku')
+with_platform_surfaceless = _platforms.contains('surfaceless')
+
+with_platforms = false
+if _platforms.length() != 0 and _platforms != ['']
+  with_platforms = true
   egl_native_platform = _platforms[0]
 endif
 
@@ -288,13 +286,13 @@ endif
 
 _egl = get_option('egl')
 if _egl == 'auto'
-  with_egl = with_dri and with_shared_glapi and egl_native_platform != ''
+  with_egl = with_dri and with_shared_glapi and with_platforms
 elif _egl == 'true'
   if not with_dri
 error('EGL requires dri')
   elif not with_shared_glapi
 error('EGL requires shared-glapi')
-  elif egl_native_platform == ''
+  elif with_platforms
 error('No platforms specified, consider -Dplatforms=drm,x11 at least')
   elif not ['disabled', 'dri'].contains(with_glx)
 error('EGL requires dri, but a GLX is being built without dri')

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: fix vulkan-drivers=[]

[Eric Engeström]

Module: Mesa
Branch: master
Commit: a92cdcd5989717ec7d60e558cf648a6cf56c739b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=a92cdcd5989717ec7d60e558cf648a6cf56c739b

Author: Eric Engestrom 
Date:   Thu May 10 16:05:05 2018 +0100

meson: fix vulkan-drivers=[]

Fixes: 5608d0a2cee47c7d037f ("meson: use array type options")
Signed-off-by: Eric Engestrom 

---

 meson.build | 12 
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/meson.build b/meson.build
index a09122479d..8db260c952 100644
--- a/meson.build
+++ b/meson.build
@@ -170,9 +170,6 @@ if with_gallium and system_has_kms_drm
   endif
 endif
 
-with_intel_vk = false
-with_amd_vk = false
-with_any_vk = false
 _vulkan_drivers = get_option('vulkan-drivers')
 if _vulkan_drivers.contains('auto')
   if system_has_kms_drm
@@ -188,11 +185,10 @@ if _vulkan_drivers.contains('auto')
 error('Unknown OS. Please pass -Dvulkan-drivers to set driver options. 
Patches gladly accepted to fix this.')
   endif
 endif
-if _vulkan_drivers != ['']
-  with_intel_vk = _vulkan_drivers.contains('intel')
-  with_amd_vk = _vulkan_drivers.contains('amd')
-  with_any_vk = true
-endif
+
+with_intel_vk = _vulkan_drivers.contains('intel')
+with_amd_vk = _vulkan_drivers.contains('amd')
+with_any_vk = _vulkan_drivers.length() != 0 and _vulkan_drivers != ['']
 
 if with_dri_swrast and (with_gallium_softpipe or with_gallium_swr)
   error('Only one swrast provider can be built')

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): REVIEWERS: add root meson.build to the Meson reviewers group

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 8faa22c146c2190e42236b96c266964448508c29
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=8faa22c146c2190e42236b96c266964448508c29

Author: Eric Engestrom 
Date:   Thu May 31 11:18:31 2018 +0100

REVIEWERS: add root meson.build to the Meson reviewers group

Reviewed-by: Dylan Baker 
Signed-off-by: Eric Engestrom 

---

 REVIEWERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/REVIEWERS b/REVIEWERS
index 638b8b71b5..beece0a7ae 100644
--- a/REVIEWERS
+++ b/REVIEWERS
@@ -116,6 +116,7 @@ MESON BUILD
 R: Dylan Baker 
 R: Eric Engestrom 
 F: */meson.build
+F: meson.build
 F: meson_options.txt
 
 ANDROID EGL SUPPORT

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): dri: replace two-way switch case with a table lookup

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 51a17e7feec4f9c693a070df1a957ca8a1f3ab1e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=51a17e7feec4f9c693a070df1a957ca8a1f3ab1e

Author: Eric Engestrom 
Date:   Fri May 18 15:58:58 2018 +0100

dri: replace two-way switch case with a table lookup

Signed-off-by: Eric Engestrom 
Reviewed-by: Marek Olšák 
---
v2: rebased on top of 432df741e0b85c021da0 "dri_util: Add
R10G10B10{A,X}2 translation between DRI and mesa_format."

---

 src/mesa/drivers/dri/common/dri_util.c | 158 ++---
 1 file changed, 84 insertions(+), 74 deletions(-)

diff --git a/src/mesa/drivers/dri/common/dri_util.c 
b/src/mesa/drivers/dri/common/dri_util.c
index d7dff235f2..a591dfcd7d 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -864,88 +864,98 @@ driUpdateFramebufferSize(struct gl_context *ctx, const 
__DRIdrawable *dPriv)
}
 }
 
+/*
+ * Note: the first match is returned, which is important for formats like
+ * __DRI_IMAGE_FORMAT_R8 which maps to both MESA_FORMAT_{R,L}_UNORM8
+ */
+static const struct {
+   uint32_timage_format;
+   mesa_format mesa_format;
+} format_mapping[] = {
+   {
+  .image_format = __DRI_IMAGE_FORMAT_RGB565,
+  .mesa_format  =MESA_FORMAT_B5G6R5_UNORM,
+   },
+   {
+  .image_format = __DRI_IMAGE_FORMAT_ARGB1555,
+  .mesa_format  =MESA_FORMAT_B5G5R5A1_UNORM,
+   },
+   {
+  .image_format = __DRI_IMAGE_FORMAT_XRGB,
+  .mesa_format  =MESA_FORMAT_B8G8R8X8_UNORM,
+   },
+   {
+  .image_format = __DRI_IMAGE_FORMAT_ARGB2101010,
+  .mesa_format  =MESA_FORMAT_B10G10R10A2_UNORM,
+   },
+   {
+  .image_format = __DRI_IMAGE_FORMAT_XRGB2101010,
+  .mesa_format  =MESA_FORMAT_B10G10R10X2_UNORM,
+   },
+   {
+  .image_format = __DRI_IMAGE_FORMAT_ABGR2101010,
+  .mesa_format  =MESA_FORMAT_R10G10B10A2_UNORM,
+   },
+   {
+  .image_format = __DRI_IMAGE_FORMAT_XBGR2101010,
+  .mesa_format  =MESA_FORMAT_R10G10B10X2_UNORM,
+   },
+   {
+  .image_format = __DRI_IMAGE_FORMAT_ARGB,
+  .mesa_format  =MESA_FORMAT_B8G8R8A8_UNORM,
+   },
+   {
+  .image_format = __DRI_IMAGE_FORMAT_ABGR,
+  .mesa_format  =MESA_FORMAT_R8G8B8A8_UNORM,
+   },
+   {
+  .image_format = __DRI_IMAGE_FORMAT_XBGR,
+  .mesa_format  =MESA_FORMAT_R8G8B8X8_UNORM,
+   },
+   {
+  .image_format = __DRI_IMAGE_FORMAT_R8,
+  .mesa_format  =MESA_FORMAT_R_UNORM8,
+   },
+   {
+  .image_format = __DRI_IMAGE_FORMAT_R8,
+  .mesa_format  =MESA_FORMAT_L_UNORM8,
+   },
+   {
+  .image_format = __DRI_IMAGE_FORMAT_GR88,
+  .mesa_format  =MESA_FORMAT_R8G8_UNORM,
+   },
+   {
+  .image_format = __DRI_IMAGE_FORMAT_GR88,
+  .mesa_format  =MESA_FORMAT_L8A8_UNORM,
+   },
+   {
+  .image_format = __DRI_IMAGE_FORMAT_SABGR8,
+  .mesa_format  =MESA_FORMAT_R8G8B8A8_SRGB,
+   },
+   {
+  .image_format = __DRI_IMAGE_FORMAT_SARGB8,
+  .mesa_format  =MESA_FORMAT_B8G8R8A8_SRGB,
+   },
+};
+
 uint32_t
 driGLFormatToImageFormat(mesa_format format)
 {
-   switch (format) {
-   case MESA_FORMAT_B5G6R5_UNORM:
-  return __DRI_IMAGE_FORMAT_RGB565;
-   case MESA_FORMAT_B5G5R5A1_UNORM:
-  return __DRI_IMAGE_FORMAT_ARGB1555;
-   case MESA_FORMAT_B8G8R8X8_UNORM:
-  return __DRI_IMAGE_FORMAT_XRGB;
-   case MESA_FORMAT_B10G10R10A2_UNORM:
-  return __DRI_IMAGE_FORMAT_ARGB2101010;
-   case MESA_FORMAT_B10G10R10X2_UNORM:
-  return __DRI_IMAGE_FORMAT_XRGB2101010;
-   case MESA_FORMAT_R10G10B10A2_UNORM:
-  return __DRI_IMAGE_FORMAT_ABGR2101010;
-   case MESA_FORMAT_R10G10B10X2_UNORM:
-  return __DRI_IMAGE_FORMAT_XBGR2101010;
-   case MESA_FORMAT_B8G8R8A8_UNORM:
-  return __DRI_IMAGE_FORMAT_ARGB;
-   case MESA_FORMAT_R8G8B8A8_UNORM:
-  return __DRI_IMAGE_FORMAT_ABGR;
-   case MESA_FORMAT_R8G8B8X8_UNORM:
-  return __DRI_IMAGE_FORMAT_XBGR;
-   case MESA_FORMAT_L_UNORM8:
-   case MESA_FORMAT_R_UNORM8:
-  return __DRI_IMAGE_FORMAT_R8;
-   case MESA_FORMAT_L8A8_UNORM:
-   case MESA_FORMAT_R8G8_UNORM:
-  return __DRI_IMAGE_FORMAT_GR88;
-   case MESA_FORMAT_NONE:
-  return __DRI_IMAGE_FORMAT_NONE;
-   case MESA_FORMAT_R8G8B8A8_SRGB:
-  return __DRI_IMAGE_FORMAT_SABGR8;
-   case MESA_FORMAT_B8G8R8A8_SRGB:
-  return __DRI_IMAGE_FORMAT_SARGB8;
-   default:
-  return __DRI_IMAGE_FORMAT_NONE;
-   }
+   for (size_t i = 0; i < ARRAY_SIZE(format_mapping); i++)
+  if (format_mapping[i].mesa_format == format)
+ return format_mapping[i].image_format;
+
+   return __DRI_IMAGE_FORMAT_NONE;
 }
 
 mesa_format
 driImageFormatToGLFormat(uint32_t image_format)
 {
-   switch (image_format) {
-   case __DRI_IMAGE_FORMAT_RGB565:
-  return MESA_FORMAT_B5G6R5_UNORM;
-   case __DRI_IMAGE_FORMAT_ARGB1555:
-  return MESA_FORMAT_B5G5R5A1_UNORM;
-   case 

Mesa (master): dri: fix error value returned by driGLFormatToImageFormat()

[Eric Engeström]

Module: Mesa
Branch: master
Commit: d3ca7bd45223aefc60174ad7c5957d3d5792192a
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d3ca7bd45223aefc60174ad7c5957d3d5792192a

Author: Eric Engestrom 
Date:   Fri May 18 15:53:58 2018 +0100

dri: fix error value returned by driGLFormatToImageFormat()

0 is not a valid value for the __DRI_IMAGE_FORMAT_* enum.
It is, however, the value of MESA_FORMAT_NONE, which two of the callers
(i915 & i965) checked for.

The other callers (that check for errors, ie. st/dri) already check for
__DRI_IMAGE_FORMAT_NONE.

Signed-off-by: Eric Engestrom 
Reviewed-by: Marek Olšák 

---

 src/mesa/drivers/dri/common/dri_util.c   | 2 +-
 src/mesa/drivers/dri/i915/intel_screen.c | 2 +-
 src/mesa/drivers/dri/i965/intel_screen.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/common/dri_util.c 
b/src/mesa/drivers/dri/common/dri_util.c
index c58650491d..d7dff235f2 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -901,7 +901,7 @@ driGLFormatToImageFormat(mesa_format format)
case MESA_FORMAT_B8G8R8A8_SRGB:
   return __DRI_IMAGE_FORMAT_SARGB8;
default:
-  return 0;
+  return __DRI_IMAGE_FORMAT_NONE;
}
 }
 
diff --git a/src/mesa/drivers/dri/i915/intel_screen.c 
b/src/mesa/drivers/dri/i915/intel_screen.c
index 5024a69bd4..882c498622 100644
--- a/src/mesa/drivers/dri/i915/intel_screen.c
+++ b/src/mesa/drivers/dri/i915/intel_screen.c
@@ -415,7 +415,7 @@ intel_create_image_from_texture(__DRIcontext *context, int 
target,
image->data = loaderPrivate;
intel_setup_image_from_mipmap_tree(intel, image, iobj->mt, level, zoffset);
image->dri_format = driGLFormatToImageFormat(image->format);
-   if (image->dri_format == MESA_FORMAT_NONE) {
+   if (image->dri_format == __DRI_IMAGE_FORMAT_NONE) {
   *error = __DRI_IMAGE_ERROR_BAD_PARAMETER;
   free(image);
   return NULL;
diff --git a/src/mesa/drivers/dri/i965/intel_screen.c 
b/src/mesa/drivers/dri/i965/intel_screen.c
index ab6c003b0f..935711106c 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -591,7 +591,7 @@ intel_create_image_from_texture(__DRIcontext *context, int 
target,
image->dri_format = driGLFormatToImageFormat(image->format);
image->has_depthstencil = iobj->mt->stencil_mt? true : false;
image->planar_format = iobj->planar_format;
-   if (image->dri_format == MESA_FORMAT_NONE) {
+   if (image->dri_format == __DRI_IMAGE_FORMAT_NONE) {
   *error = __DRI_IMAGE_ERROR_BAD_PARAMETER;
   free(image);
   return NULL;

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): vulkan: don't free uninitialised memory

[Eric Engeström]

Module: Mesa
Branch: master
Commit: e4fe2fd3bb26d52e64d98207692a4469f04fe1d5
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e4fe2fd3bb26d52e64d98207692a4469f04fe1d5

Author: Eric Engestrom 
Date:   Fri May 18 17:12:53 2018 +0100

vulkan: don't free uninitialised memory

The modifiers array hasn't been initialised by then, much less with data
that would need freeing.
Move the label after the loop to fix this.

Fixes: c80c08e22603 ("vulkan/wsi/x11: Add support for DRI3 v1.2")
Signed-off-by: Eric Engestrom 
Reviewed-by: Lionel Landwerlin 

---

 src/vulkan/wsi/wsi_common_x11.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vulkan/wsi/wsi_common_x11.c b/src/vulkan/wsi/wsi_common_x11.c
index 62739b9912..1bfbc7c300 100644
--- a/src/vulkan/wsi/wsi_common_x11.c
+++ b/src/vulkan/wsi/wsi_common_x11.c
@@ -1421,10 +1421,10 @@ fail_init_images:
for (uint32_t j = 0; j < image; j++)
   x11_image_finish(chain, pAllocator, >images[j]);
 
-fail_register:
for (int i = 0; i < ARRAY_SIZE(modifiers); i++)
   vk_free(pAllocator, modifiers[i]);
 
+fail_register:
xcb_unregister_for_special_event(chain->conn, chain->special_event);
 
wsi_swapchain_finish(>base);

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): egl/x11: fix build with DRI3 disabled

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 1945231b48df8ffcfa2eb168f81c3f5984433b01
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=1945231b48df8ffcfa2eb168f81c3f5984433b01

Author: Eric Engestrom 
Date:   Tue May 29 16:59:18 2018 +0100

egl/x11: fix build with DRI3 disabled

Fixes: 473af0b541b2583f4c72 "egl/x11: deduplicate depth-to-format logic"
Signed-off-by: Eric Engestrom 
Tested-by: Vinson Lee 
Reviewed-by: Yogesh Marathe 

---

 src/egl/drivers/dri2/platform_x11.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/egl/drivers/dri2/platform_x11.c 
b/src/egl/drivers/dri2/platform_x11.c
index b2a3000b25..ea9b0cc6d6 100644
--- a/src/egl/drivers/dri2/platform_x11.c
+++ b/src/egl/drivers/dri2/platform_x11.c
@@ -55,6 +55,9 @@ static EGLBoolean
 dri2_x11_swap_interval(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf,
EGLint interval);
 
+uint32_t
+dri2_format_for_depth(uint32_t depth);
+
 static void
 swrastCreateDrawable(struct dri2_egl_display * dri2_dpy,
  struct dri2_egl_surface * dri2_surf)

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: remove unreachable with_glx == 'auto' check

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 728d1da159e072e7ef9956ba5326cc02f4d2589b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=728d1da159e072e7ef9956ba5326cc02f4d2589b

Author: Emil Velikov 
Date:   Fri Feb 23 19:32:02 2018 +

meson: remove unreachable with_glx == 'auto' check

Cannot happen since, props to the autodetection further up.

Signed-off-by: Emil Velikov 
Reviewed-by: Dylan Baker 
Reviewed-by: Eric Engestrom 

---

 meson.build | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/meson.build b/meson.build
index d0cb896163..d4f460e0b6 100644
--- a/meson.build
+++ b/meson.build
@@ -344,11 +344,7 @@ endif
 pre_args += '-DGLX_USE_TLS'
 if with_glx != 'disabled'
   if not (with_platform_x11 and with_any_opengl)
-if with_glx == 'auto'
-  with_glx = 'disabled'
-else
-  error('Cannot build GLX support without X11 platform support and at 
least one OpenGL API')
-endif
+error('Cannot build GLX support without X11 platform support and at least 
one OpenGL API')
   elif with_glx == 'gallium-xlib' 
 if not with_gallium
   error('Gallium-xlib based GLX requires at least one gallium driver')

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: require shared glapi when using DRI based libGL

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 63b95fb291d7978e300c496cedc0851261101332
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=63b95fb291d7978e300c496cedc0851261101332

Author: Emil Velikov 
Date:   Fri Feb 23 19:32:03 2018 +

meson: require shared glapi when using DRI based libGL

Just like we do in the autotools build.

Signed-off-by: Emil Velikov 
Reviewed-by: Dylan Baker 
Reviewed-by: Eric Engestrom 

---

 meson.build | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index d4f460e0b6..4aafba802a 100644
--- a/meson.build
+++ b/meson.build
@@ -357,8 +357,12 @@ if with_glx != 'disabled'
 if with_dri
   error('xlib conflicts with any dri driver')
 endif
-  elif with_glx == 'dri' and not with_dri
-error('dri based GLX requires at least one DRI driver')
+  elif with_glx == 'dri'
+if not with_dri
+  error('dri based GLX requires at least one DRI driver')
+elif not with_shared_glapi
+  error('dri based GLX requires shared-glapi')
+endif
   endif
 endif
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): docs: add favicon to the website

[Eric Engeström]

Module: Mesa
Branch: master
Commit: f736be86bbb4932e89e08f25d4430d96230b11f7
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f736be86bbb4932e89e08f25d4430d96230b11f7

Author: Eric Engestrom 
Date:   Fri May  4 12:46:17 2018 +0100

docs: add favicon to the website

favicon.png is just gears.png resized to 64x64, and favicon.ico is
generated using this command, adapted from the ImageMagick example [1]:

  $ convert favicon.png -background black \
  \( -clone 0 -resize 16x16 \) \
  \( -clone 0 -resize 32x32 \) \
  \( -clone 0 -resize 48x48 \) \
  \( -clone 0 -resize 64x64 \) \
  -delete 0 -alpha off -colors 256 favicon.ico

We could edit every html page to add ``,
but there's not much point as pretty much every browser will pick it up
automatically if the file is named `favicon.ico` and is in the root folder.

[1] http://www.imagemagick.org/Usage/thumbnails/#favicon

Signed-off-by: Eric Engestrom 

---

 docs/favicon.ico | Bin 0 -> 13094 bytes
 docs/favicon.png | Bin 0 -> 2998 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/docs/favicon.ico b/docs/favicon.ico
new file mode 100644
index 00..e7e244a161
Binary files /dev/null and b/docs/favicon.ico differ
diff --git a/docs/favicon.png b/docs/favicon.png
new file mode 100644
index 00..19898ef742
Binary files /dev/null and b/docs/favicon.png differ

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): docs: add missing html tag

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 3b5376330fb0dd7a4c1fe15160bf67e30b33cdc9
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=3b5376330fb0dd7a4c1fe15160bf67e30b33cdc9

Author: Eric Engestrom 
Date:   Tue May 29 14:47:10 2018 +0100

docs: add missing html tag

Signed-off-by: Eric Engestrom 

---

 docs/release-calendar.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/release-calendar.html b/docs/release-calendar.html
index 754696200d..4fce25ea24 100644
--- a/docs/release-calendar.html
+++ b/docs/release-calendar.html
@@ -82,6 +82,7 @@ if you'd like to nominate a patch in the next stable release.
 Emil Velikov
 
 
+
 2018-08-24
 18.1.7
 Emil Velikov

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): docs: add missing html closing tag

[Eric Engeström]

Module: Mesa
Branch: master
Commit: e6a1aca0b27305a718b8679dea10c432f1fa2fc8
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e6a1aca0b27305a718b8679dea10c432f1fa2fc8

Author: Eric Engestrom 
Date:   Tue May 29 14:47:53 2018 +0100

docs: add missing html closing tag

Signed-off-by: Eric Engestrom 

---

 docs/relnotes/18.0.0.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/relnotes/18.0.0.html b/docs/relnotes/18.0.0.html
index 6fa6370a06..9b7951bdf1 100644
--- a/docs/relnotes/18.0.0.html
+++ b/docs/relnotes/18.0.0.html
@@ -48,8 +48,8 @@ Note: some of the new features are only available with 
certain drivers.
 Disk shader cache support for i965 when MESA_GLSL_CACHE_DISABLE 
environment variable is set to "0" or "false"
 GL_ARB_shader_atomic_counters and GL_ARB_shader_atomic_counter_ops on 
r600/evergreen+
 GL_ARB_shader_image_load_store and GL_ARB_shader_image_size on 
r600/evergreen+
-GL_ARB_shader_storage_buffer_object on r600/evergreen+
-GL_ARB_compute_shader on r600/evergreen+
+GL_ARB_shader_storage_buffer_object on r600/evergreen+
+GL_ARB_compute_shader on r600/evergreen+
 GL_ARB_cull_distance on r600/evergreen+
 GL_ARB_enhanced_layouts on r600/evergreen+
 GL_ARB_bindless_texture on nvc0/kepler

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): docs: trivial typo fix

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 539aa604a0bc565481d1d38b327879a294feeec6
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=539aa604a0bc565481d1d38b327879a294feeec6

Author: Eric Engestrom 
Date:   Tue May 29 12:10:03 2018 +0100

docs: trivial typo fix

Signed-off-by: Eric Engestrom 

---

 docs/relnotes/18.2.0.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/relnotes/18.2.0.html b/docs/relnotes/18.2.0.html
index f3bdb6605c..00b253c076 100644
--- a/docs/relnotes/18.2.0.html
+++ b/docs/relnotes/18.2.0.html
@@ -50,7 +50,7 @@ Note: some of the new features are only available with 
certain drivers.
 Bug fixes
 
 
-TBD
+TBD
 
 
 Changes

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): egl/x11: deduplicate depth-to-format logic

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 473af0b541b2583f4c72ffe885cff5ec2660a45f
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=473af0b541b2583f4c72ffe885cff5ec2660a45f

Author: Eric Engestrom 
Date:   Thu May 17 16:16:34 2018 +0100

egl/x11: deduplicate depth-to-format logic

Suggested-by: Emil Velikov 
Signed-off-by: Eric Engestrom 
Reviewed-by: Tapani Pälli 

---

 src/egl/drivers/dri2/platform_x11.c  | 35 +++-
 src/egl/drivers/dri2/platform_x11_dri3.c | 21 ++-
 src/egl/drivers/dri2/platform_x11_dri3.h |  3 +++
 3 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/src/egl/drivers/dri2/platform_x11.c 
b/src/egl/drivers/dri2/platform_x11.c
index 7aca0a9020..b2a3000b25 100644
--- a/src/egl/drivers/dri2/platform_x11.c
+++ b/src/egl/drivers/dri2/platform_x11.c
@@ -1006,6 +1006,24 @@ dri2_x11_copy_buffers(_EGLDriver *drv, _EGLDisplay 
*disp, _EGLSurface *surf,
return EGL_TRUE;
 }
 
+uint32_t
+dri2_format_for_depth(uint32_t depth)
+{
+   switch (depth) {
+   case 16:
+  return __DRI_IMAGE_FORMAT_RGB565;
+   case 24:
+  return __DRI_IMAGE_FORMAT_XRGB;
+   case 30:
+  return __DRI_IMAGE_FORMAT_XRGB2101010;
+   case 32:
+  return __DRI_IMAGE_FORMAT_ARGB;
+   default:
+  return __DRI_IMAGE_FORMAT_NONE;
+   }
+}
+
+
 static _EGLImage *
 dri2_create_image_khr_pixmap(_EGLDisplay *disp, _EGLContext *ctx,
 EGLClientBuffer buffer, const EGLint *attr_list)
@@ -1050,20 +1068,9 @@ dri2_create_image_khr_pixmap(_EGLDisplay *disp, 
_EGLContext *ctx,
   return NULL;
}
 
-   switch (geometry_reply->depth) {
-   case 16:
-  format = __DRI_IMAGE_FORMAT_RGB565;
-  break;
-   case 24:
-  format = __DRI_IMAGE_FORMAT_XRGB;
-  break;
-   case 30:
-  format = __DRI_IMAGE_FORMAT_XRGB2101010;
-  break;
-   case 32:
-  format = __DRI_IMAGE_FORMAT_ARGB;
-  break;
-   default:
+   format = dri2_format_for_depth(geometry_reply->depth);
+
+   if (format == __DRI_IMAGE_FORMAT_NONE) {
   _eglError(EGL_BAD_PARAMETER,
"dri2_create_image_khr: unsupported pixmap depth");
   free(buffers_reply);
diff --git a/src/egl/drivers/dri2/platform_x11_dri3.c 
b/src/egl/drivers/dri2/platform_x11_dri3.c
index 5cb6d65c0a..0d5a9d037f 100644
--- a/src/egl/drivers/dri2/platform_x11_dri3.c
+++ b/src/egl/drivers/dri2/platform_x11_dri3.c
@@ -39,23 +39,6 @@
 #include "loader.h"
 #include "loader_dri3_helper.h"
 
-static uint32_t
-dri3_format_for_depth(uint32_t depth)
-{
-   switch (depth) {
-   case 16:
-  return __DRI_IMAGE_FORMAT_RGB565;
-   case 24:
-  return __DRI_IMAGE_FORMAT_XRGB;
-   case 30:
-  return __DRI_IMAGE_FORMAT_XRGB2101010;
-   case 32:
-  return __DRI_IMAGE_FORMAT_ARGB;
-   default:
-  return __DRI_IMAGE_FORMAT_NONE;
-   }
-}
-
 static struct dri3_egl_surface *
 loader_drawable_to_egl_surface(struct loader_dri3_drawable *draw) {
size_t offset = offsetof(struct dri3_egl_surface, loader_drawable);
@@ -298,7 +281,7 @@ dri3_create_image_khr_pixmap(_EGLDisplay *disp, _EGLContext 
*ctx,
   return NULL;
}
 
-   format = dri3_format_for_depth(bp_reply->depth);
+   format = dri2_format_for_depth(bp_reply->depth);
if (format == __DRI_IMAGE_FORMAT_NONE) {
   _eglError(EGL_BAD_PARAMETER,
 "dri3_create_image_khr: unsupported pixmap depth");
@@ -350,7 +333,7 @@ dri3_create_image_khr_pixmap_from_buffers(_EGLDisplay 
*disp, _EGLContext *ctx,
   return EGL_NO_IMAGE_KHR;
}
 
-   format = dri3_format_for_depth(bp_reply->depth);
+   format = dri2_format_for_depth(bp_reply->depth);
if (format == __DRI_IMAGE_FORMAT_NONE) {
   _eglError(EGL_BAD_PARAMETER,
 "dri3_create_image_khr: unsupported pixmap depth");
diff --git a/src/egl/drivers/dri2/platform_x11_dri3.h 
b/src/egl/drivers/dri2/platform_x11_dri3.h
index 96e7ee972d..e6fd013669 100644
--- a/src/egl/drivers/dri2/platform_x11_dri3.h
+++ b/src/egl/drivers/dri2/platform_x11_dri3.h
@@ -38,4 +38,7 @@ extern struct dri2_egl_display_vtbl dri3_x11_display_vtbl;
 EGLBoolean
 dri3_x11_connect(struct dri2_egl_display *dri2_dpy);
 
+uint32_t
+dri2_format_for_depth(uint32_t depth);
+
 #endif

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): docs: fix various html tags mistakes

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 09a6cb7be668a975a49f4c37fbffd58e47629b9f
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=09a6cb7be668a975a49f4c37fbffd58e47629b9f

Author: Eric Engestrom 
Date:   Wed May 23 12:46:44 2018 +0100

docs: fix various html tags mistakes

Signed-off-by: Eric Engestrom 
Reviewed-by: Ian Romanick 

---

 docs/egl.html | 1 +
 docs/precompiled.html | 2 ++
 docs/utilities.html   | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/egl.html b/docs/egl.html
index 3d8a85b4e7..2bc8f23727 100644
--- a/docs/egl.html
+++ b/docs/egl.html
@@ -168,6 +168,7 @@ the X server directly using (XCB-)DRI2 protocol.
 This driver can share DRI drivers with libGL.
 
 
+
 
 Packaging
 
diff --git a/docs/precompiled.html b/docs/precompiled.html
index d1f4acec4d..97dc1ff4bd 100644
--- a/docs/precompiled.html
+++ b/docs/precompiled.html
@@ -24,10 +24,12 @@ Some Linux distributions closely follow the latest Mesa 
releases. On others one
 has to use unofficial channels.
 
 There are some general directions:
+
 Debian/Ubuntu based distros - PPA: xorg-edgers, oibaf and padoka
 Fedora - Corp: erp and che
 OpenSuse/SLES - OBS: X11:XOrg and pontostroy:X11
 Gentoo/Archlinux - officially provided/supported
+
 
 
 
diff --git a/docs/utilities.html b/docs/utilities.html
index c141abeefe..222e734389 100644
--- a/docs/utilities.html
+++ b/docs/utilities.html
@@ -31,7 +31,7 @@
   is a very useful tool for tracking down
   memory-related problems in your code.
 
-  https://scan.coverity.com/projects/mesa;>Coverity
+  https://scan.coverity.com/projects/mesa;>Coverity
   provides static code analysis of Mesa.  If you create an account
   you can see the results and try to fix outstanding issues.
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): docs: drop unnecessary out-of-frame target

[Eric Engeström]

Module: Mesa
Branch: master
Commit: ec986241f317222b0d0638095a124edb2e6cb46b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ec986241f317222b0d0638095a124edb2e6cb46b

Author: Eric Engestrom 
Date:   Wed May 23 12:47:33 2018 +0100

docs: drop unnecessary out-of-frame target

I'm guessing an earlier version of the website used to have the page
contents in , but this isn't the case anymore so just drop the
unnecessary `target="_main"` :)

Signed-off-by: Eric Engestrom 
Reviewed-by: Ian Romanick 

---

 docs/viewperf.html | 21 +
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/docs/viewperf.html b/docs/viewperf.html
index 0eb51a5662..ed89ee2cfe 100644
--- a/docs/viewperf.html
+++ b/docs/viewperf.html
@@ -18,8 +18,8 @@
 
 
 This page lists known issues with
-https://www.spec.org/gwpg/gpc.static/vp11info.html; 
target="_main">SPEC Viewperf 11
-and https://www.spec.org/gwpg/gpc.static/vp12info.html; 
target="_main">SPEC Viewperf 12
+https://www.spec.org/gwpg/gpc.static/vp11info.html;>SPEC Viewperf 
11
+and https://www.spec.org/gwpg/gpc.static/vp12info.html;>SPEC Viewperf 
12
 when running on Mesa-based drivers.
 
 
@@ -66,13 +66,10 @@ either in Viewperf or the Mesa driver.
 
 
 These tests use features of the
-https://www.opengl.org/registry/specs/NV/fragment_program2.txt;
-target="_main">
-GL_NV_fragment_program2 and
-https://www.opengl.org/registry/specs/NV/vertex_program3.txt;
-target="_main">
-GL_NV_vertex_program3 extensions without checking if the driver supports
-them.
+https://www.opengl.org/registry/specs/NV/fragment_program2.txt;>GL_NV_fragment_program2
+and
+https://www.opengl.org/registry/specs/NV/vertex_program3.txt;>GL_NV_vertex_program3
+extensions without checking if the driver supports them.
 
 
 When Mesa tries to compile the vertex/fragment programs it generates errors
@@ -86,8 +83,8 @@ Subsequent drawing calls become no-ops and the rendering is 
incorrect.
 
 
 These tests depend on the
-https://www.opengl.org/registry/specs/NV/primitive_restart.txt;
-target="_main">GL_NV_primitive_restart extension.
+https://www.opengl.org/registry/specs/NV/primitive_restart.txt;>GL_NV_primitive_restart
+extension.
 
 
 
@@ -124,7 +121,7 @@ never specified.
 
 
 A trace captured with
-https://github.com/apitrace/apitrace; target="_main">API trace
+https://github.com/apitrace/apitrace;>API trace
 shows this sequences of calls like this:
 
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): docs: fix `<` & `>` used in html code

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 8034f5f6236e4a94bb49f5b467532b236d51e912
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=8034f5f6236e4a94bb49f5b467532b236d51e912

Author: Eric Engestrom 
Date:   Wed May 23 12:46:00 2018 +0100

docs: fix `<` & `>` used in html code

Signed-off-by: Eric Engestrom 
Reviewed-by: Ian Romanick 

---

 docs/codingstyle.html   | 4 ++--
 docs/submittingpatches.html | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/codingstyle.html b/docs/codingstyle.html
index 7e9f470a10..34acae27fe 100644
--- a/docs/codingstyle.html
+++ b/docs/codingstyle.html
@@ -83,7 +83,7 @@ We try to quote the OpenGL specification where prudent:
 * "An INVALID_OPERATION error is generated for any of the following
 * conditions:
 *
-* *  is zero."
+* * length is zero."
 *
 * Additionally, page 94 of the PDF of the OpenGL 4.5 core spec
 * (30.10.2014) also says this, so it's no longer allowed for desktop GL,
@@ -94,7 +94,7 @@ Function comment example:
 
/**
 * Create and initialize a new buffer object.  Called via the
-* ctx->Driver.CreateObject() driver callback function.
+* ctx-Driver.CreateObject() driver callback function.
 * \param  name  integer name of the object
 * \param  type  one of GL_FOO, GL_BAR, etc.
 * \return  pointer to new object or NULL if error
diff --git a/docs/submittingpatches.html b/docs/submittingpatches.html
index ba09aa4ad7..178ec5f89e 100644
--- a/docs/submittingpatches.html
+++ b/docs/submittingpatches.html
@@ -122,9 +122,9 @@ Please use common sense and do not blindly 
add everyone.
 
 $ scripts/get_reviewer.pl --help # to get the help screen
 $ scripts/get_reviewer.pl -f src/egl/drivers/dri2/platform_android.c
-Rob Herring  (reviewer:ANDROID EGL 
SUPPORT,added_lines:188/700=27%,removed_lines:58/283=20%)
-Tomasz Figa  (reviewer:ANDROID EGL 
SUPPORT,authored:12/41=29%,added_lines:308/700=44%,removed_lines:115/283=41%)
-Emil Velikov  
(authored:13/41=32%,removed_lines:76/283=27%)
+Rob Herring r...@kernel.org (reviewer:ANDROID EGL 
SUPPORT,added_lines:188/700=27%,removed_lines:58/283=20%)
+Tomasz Figa tf...@chromium.org (reviewer:ANDROID EGL 
SUPPORT,authored:12/41=29%,added_lines:308/700=44%,removed_lines:115/283=41%)
+Emil Velikov emil.l.veli...@gmail.com 
(authored:13/41=32%,removed_lines:76/283=27%)
 
 
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): docs/meson: mark code/commands as

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 37d44e26082e1e502259dd68bfbabb3a03e8acd7
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=37d44e26082e1e502259dd68bfbabb3a03e8acd7

Author: Eric Engestrom 
Date:   Mon May 14 16:47:57 2018 +0100

docs/meson: mark code/commands as 

Reviewed-by: Dylan Baker 
Signed-off-by: Eric Engestrom 

---

 docs/meson.html | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/meson.html b/docs/meson.html
index 9706e49c5c..f394a22fc2 100644
--- a/docs/meson.html
+++ b/docs/meson.html
@@ -33,7 +33,7 @@ out in odd ways.
 
 The meson program is used to configure the source directory and generates
 either a ninja build file or Visual Studio® build files. The latter must
-be enabled via the --backend switch, as ninja is the default backend on all
+be enabled via the --backend switch, as ninja is the default 
backend on all
 operating systems. Meson only supports out-of-tree builds, and must be passed a
 directory to put built and generated sources into. We'll call that directory
 "build" for examples.
@@ -60,7 +60,7 @@ directory, but this feature is being discussed upstream.
 
 With additional arguments meson configure is used to change
 options on already configured build directory. All options passed to this
-command are in the form -D "command"="value".
+command are in the form -D "command"="value".
 
 
 
@@ -114,13 +114,13 @@ change compiler in a configured build directory.
 CFLAGS=-Wno-typedef-redefinition ninja -C build-clang
 
 
-Meson also honors DESTDIR for installs
+Meson also honors DESTDIR for installs
 
 
 
 LLVM
 Meson includes upstream logic to wrap llvm-config using it's standard
-dependency interface. It will search $PATH (or %PATH% on windows) for
+dependency interface. It will search $PATH (or 
%PATH% on windows) for
 llvm-config, so using an LLVM from a non-standard path is as easy as
 PATH=/path/with/llvm-config:$PATH meson build.
 
@@ -152,13 +152,13 @@ configure. Mesa defined options are always passed 
as -Doption=foo.
 This option will set the compiler debug/optimisation levels to aid
 debugging the Mesa libraries.
 
-Note that in meson this defaults to "debugoptimized", and  not setting it to
-"release" will yield non-optimal performance and binary size. Not using "debug"
-may interfere with debugging as some code and validation will be optimized
-away.
+Note that in meson this defaults to debugoptimized, and
+not setting it to release will yield non-optimal
+performance and binary size. Not using debug may interfere
+with debugging as some code and validation will be optimized away.
 
 
- For those wishing to pass their own optimization flags, use the "plain"
+ For those wishing to pass their own optimization flags, use the 
plain
 buildtype, which causes meson to inject no additional compiler arguments, only
 those in the C/CXXFLAGS and those that mesa itself defines.
 
@@ -166,7 +166,7 @@ those in the C/CXXFLAGS and those that mesa itself 
defines.
 
 
 -Db_ndebug
-This option controls assertions in meson projects. When set to false
+This option controls assertions in meson projects. When set to 
false
 (the default) assertions are enabled, when set to true they are disabled. This
 is unrelated to the buildtype; setting the latter to
 release will not turn off assertions.

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): docs/meson: replace plaintext url with a link

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 5829f616ec7e80258492752ec8c4ccc3648ef017
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5829f616ec7e80258492752ec8c4ccc3648ef017

Author: Eric Engestrom 
Date:   Mon May 14 16:47:18 2018 +0100

docs/meson: replace plaintext url with a link

Reviewed-by: Dylan Baker 
Signed-off-by: Eric Engestrom 

---

 docs/meson.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/meson.html b/docs/meson.html
index 2c6ce47c2c..9706e49c5c 100644
--- a/docs/meson.html
+++ b/docs/meson.html
@@ -82,9 +82,9 @@ Without arguments, it will produce libGL.so and/or several 
other libraries
 depending on the options you have chosen. Later, if you want to rebuild for a
 different configuration, you should run ninja clean before
 changing the configuration, or create a new out of tree build directory for
-each configuration you want to build.
-
-http://mesonbuild.com/Using-multiple-build-directories.html
+each configuration you want to build
+http://mesonbuild.com/Using-multiple-build-directories.html;>as
+recommended in the documentation
 
 
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): docs/meson: fix various html issues

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 67c550708aab179c0acdfbd82c72e7ad65445bf5
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=67c550708aab179c0acdfbd82c72e7ad65445bf5

Author: Eric Engestrom 
Date:   Mon May 14 16:45:31 2018 +0100

docs/meson: fix various html issues

Reviewed-by: Dylan Baker 
Signed-off-by: Eric Engestrom 

---

 docs/meson.html | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/meson.html b/docs/meson.html
index fdad0feef9..2c6ce47c2c 100644
--- a/docs/meson.html
+++ b/docs/meson.html
@@ -87,6 +87,7 @@ each configuration you want to build.
 http://mesonbuild.com/Using-multiple-build-directories.html
 
 
+
 Environment Variables
 Meson supports the standard CC and CXX environment variables for
 changing the default compiler, and CFLAGS, CXXFLAGS, and LDFLAGS for setting
@@ -117,7 +118,6 @@ change compiler in a configured build directory.
 
 
 
-
 LLVM
 Meson includes upstream logic to wrap llvm-config using it's standard
 dependency interface. It will search $PATH (or %PATH% on windows) for
@@ -143,7 +143,7 @@ One of the oddities of meson is that some options are 
different when passed to
 the meson than to meson configure. These options are
 passed as --option=foo to meson, but -Doption=foo to meson
 configure. Mesa defined options are always passed as -Doption=foo.
-
+
 
 For those coming from autotools be aware of the following:
 
@@ -173,3 +173,7 @@ is unrelated to the buildtype; setting the 
latter to
 
 
 
+
+
+
+

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): docs/meson: fix various typos

[Eric Engeström]

Module: Mesa
Branch: master
Commit: dc2dc1fa3043abef35b45a50d46d9de9135b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=dc2dc1fa3043abef35b45a50d46d9de9135b

Author: Eric Engestrom 
Date:   Mon May 14 16:44:08 2018 +0100

docs/meson: fix various typos

Reviewed-by: Dylan Baker 
Signed-off-by: Eric Engestrom 

---

 docs/meson.html | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/meson.html b/docs/meson.html
index d05b5fe347..fdad0feef9 100644
--- a/docs/meson.html
+++ b/docs/meson.html
@@ -49,7 +49,7 @@ along with a build directory to view the selected options 
for. This will show
 your meson global arguments and project arguments, along with their defaults
 and your local settings.
 
-Moes does not currently support listing options before configure a build
+Meson does not currently support listing options before configure a build
 directory, but this feature is being discussed upstream.
 
 
@@ -88,7 +88,7 @@ http://mesonbuild.com/Using-multiple-build-directories.html
 
 
 Environment Variables
-Meson supports the standard CC and CXX envrionment variables for
+Meson supports the standard CC and CXX environment variables for
 changing the default compiler, and CFLAGS, CXXFLAGS, and LDFLAGS for setting
 options to the compiler and linker.
 
@@ -99,9 +99,9 @@ the popular compilers, a complete list is available
 These arguments are consumed and stored by meson when it is initialized or
 re-initialized. Therefore passing them to meson configure will not do anything,
 and passing them to ninja will only do something if ninja decides to
-re-initialze meson, for example, if a meson.build file has been changed.
+re-initialize meson, for example, if a meson.build file has been changed.
 Changing these variables will not cause all targets to be rebuilt, so running
-ninja clean is recomended when changing CFLAGS or CXXFLAGS. meson will never
+ninja clean is recommended when changing CFLAGS or CXXFLAGS. Meson will never
 change compiler in a configured build directory.
 
 
@@ -120,7 +120,7 @@ change compiler in a configured build directory.
 
 LLVM
 Meson includes upstream logic to wrap llvm-config using it's standard
-dependncy interface. It will search $PATH (or %PATH% on windows) for
+dependency interface. It will search $PATH (or %PATH% on windows) for
 llvm-config, so using an LLVM from a non-standard path is as easy as
 PATH=/path/with/llvm-config:$PATH meson build.
 
@@ -154,7 +154,7 @@ debugging the Mesa libraries.
 
 Note that in meson this defaults to "debugoptimized", and  not setting it to
 "release" will yield non-optimal performance and binary size. Not using "debug"
-may interfer with debbugging as some code and validation will be optimized
+may interfere with debugging as some code and validation will be optimized
 away.
 
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: fix copyright symbol

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 6c5df78d8b3ebd65545bf0a5c58530b8c178e566
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=6c5df78d8b3ebd65545bf0a5c58530b8c178e566

Author: Eric Engestrom 
Date:   Tue May 15 10:29:36 2018 +0100

meson: fix copyright symbol

Fixes: bd68f1013cea8742390c "autotools, meson: add tileset.h"
Signed-off-by: Eric Engestrom 

---

 src/gallium/drivers/swr/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/swr/meson.build 
b/src/gallium/drivers/swr/meson.build
index 5b3b53d0ac..9b272aaebd 100644
--- a/src/gallium/drivers/swr/meson.build
+++ b/src/gallium/drivers/swr/meson.build
@@ -1,4 +1,4 @@
-# Copyright © 2017-2018 Intel Corporation
+# Copyright © 2017-2018 Intel Corporation
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: remove dependency antipattern

[Eric Engeström]

Module: Mesa
Branch: master
Commit: f0cdc39b134dfc38f84b0f6dc1eaad86d28d4170
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f0cdc39b134dfc38f84b0f6dc1eaad86d28d4170

Author: Eric Engestrom 
Date:   Tue May  8 16:40:24 2018 +0100

meson: remove dependency antipattern

`dep_valgrind != []` now (0.45) produces a warning that is quite explicit:
  WARNING: Trying to compare values of different types (DependencyHolder, list) 
using !=.
  The result of this is undefined and will become a hard error in a future 
Meson release.

`dep_valgrind = []` used to be the recommended way to deal with
non-existant dependency, but these don't work with `.found()`, so now
the recommended way is to declare a impossible dependency, which
null_dep does for us in Mesa.

In short, we don't need and shouldn't check for `!= []` anywhere anymore.

Reviewed-by: Dylan Baker 
Signed-off-by: Eric Engestrom 

---

 src/compiler/glsl/glcpp/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/glsl/glcpp/meson.build 
b/src/compiler/glsl/glcpp/meson.build
index e6a3dc8675..09d44ddd68 100644
--- a/src/compiler/glsl/glcpp/meson.build
+++ b/src/compiler/glsl/glcpp/meson.build
@@ -57,7 +57,7 @@ glcpp = executable(
 
 if with_tests
   modes = ['unix', 'windows', 'oldmac', 'bizarro']
-  if dep_valgrind != [] and dep_valgrind.found()
+  if dep_valgrind.found()
 modes += ['valgrind']
   endif
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): docs: fix 18.0 release note version

[Eric Engeström]

Module: Mesa
Branch: master
Commit: d77844a5290948a490ce6921c1623d1dd7af6c31
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d77844a5290948a490ce6921c1623d1dd7af6c31

Author: Eric Engestrom 
Date:   Wed Mar 28 11:14:40 2018 +0100

docs: fix 18.0 release note version

Fixes: 839fb3a696679bfe975c2 "docs: Update 18.0.0 release notes"
Cc: "18.0" 
Signed-off-by: Eric Engestrom 
Reviewed-by: Emil Velikov 

---

 docs/relnotes/18.0.0.html | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/relnotes/18.0.0.html b/docs/relnotes/18.0.0.html
index 2b374be632..6fa6370a06 100644
--- a/docs/relnotes/18.0.0.html
+++ b/docs/relnotes/18.0.0.html
@@ -14,15 +14,15 @@
 
 
 
-Mesa 17.4.0 Release Notes / March 27 2018
+Mesa 18.0.0 Release Notes / March 27 2018
 
 
-Mesa 17.4.0 is a new development release.
+Mesa 18.0.0 is a new development release.
 People who are concerned with stability and reliability should stick
-with a previous release or wait for Mesa 17.4.1.
+with a previous release or wait for Mesa 18.0.1.
 
 
-Mesa 17.4.0 implements the OpenGL 4.5 API, but the version reported by
+Mesa 18.0.0 implements the OpenGL 4.5 API, but the version reported by
 glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
 glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
 Some drivers don't support all the features required in OpenGL 4.5.  OpenGL

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): gbm: remove never-implemented function

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 431a1d12cc48060366caf49da76108cd0406b0f6
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=431a1d12cc48060366caf49da76108cd0406b0f6

Author: Eric Engestrom 
Date:   Mon Mar 26 15:11:45 2018 +0100

gbm: remove never-implemented function

I assume this was implemented in a previous version of that commit, but
was removed in the version that actually landed.

Fixes: 8430af5ebe1ee8119e14 "Add support for swrast to the DRM EGL platform"
Cc: Giovanni Campagna 
Signed-off-by: Eric Engestrom 
Reviewed-by: Emil Velikov 

---

 src/gbm/gbm-symbols-check | 1 -
 src/gbm/main/gbm.h| 2 --
 2 files changed, 3 deletions(-)

diff --git a/src/gbm/gbm-symbols-check b/src/gbm/gbm-symbols-check
index 5adeadaed0..9b1508ede0 100755
--- a/src/gbm/gbm-symbols-check
+++ b/src/gbm/gbm-symbols-check
@@ -40,7 +40,6 @@ gbm_bo_get_user_data
 gbm_bo_destroy
 gbm_surface_create
 gbm_surface_create_with_modifiers
-gbm_surface_needs_lock_front_buffer
 gbm_surface_lock_front_buffer
 gbm_surface_release_buffer
 gbm_surface_has_free_buffers
diff --git a/src/gbm/main/gbm.h b/src/gbm/main/gbm.h
index 7710e61b13..e95f9e3496 100644
--- a/src/gbm/main/gbm.h
+++ b/src/gbm/main/gbm.h
@@ -386,8 +386,6 @@ gbm_surface_create_with_modifiers(struct gbm_device *gbm,
   uint32_t format,
   const uint64_t *modifiers,
   const unsigned int count);
-int
-gbm_surface_needs_lock_front_buffer(struct gbm_surface *surface);
 
 struct gbm_bo *
 gbm_surface_lock_front_buffer(struct gbm_surface *surface);

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: fix header check message

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 1e36fe5dc490ed64736591acbcd32876ea1a69dd
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=1e36fe5dc490ed64736591acbcd32876ea1a69dd

Author: Eric Engestrom 
Date:   Fri Mar 23 17:18:56 2018 +

meson: fix header check message

before: Checking if "endian.h works" compiles: YES
after:  Checking if "endian.h" compiles: YES

Signed-off-by: Eric Engestrom 
Reviewed-by: Emil Velikov 

---

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 041d2bfc70..f210eeb253 100644
--- a/meson.build
+++ b/meson.build
@@ -917,7 +917,7 @@ elif cc.has_header_symbol('sys/mkdev.h', 'major')
 endif
 
 foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h', 'endian.h']
-  if cc.compiles('#include <@0@>'.format(h), name : '@0@ works'.format(h))
+  if cc.compiles('#include <@0@>'.format(h), name : '@0@'.format(h))
 pre_args += '-DHAVE_@0@'.format(h.to_upper().underscorify())
   endif
 endforeach

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson/configure: detect endian.h instead of trying to guess when it's available

[Eric Engeström]

Module: Mesa
Branch: master
Commit: cbee1bfb34274668a05995b9d4c78ddec9e5ea4c
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=cbee1bfb34274668a05995b9d4c78ddec9e5ea4c

Author: Eric Engestrom 
Date:   Wed Mar 21 17:04:06 2018 +

meson/configure: detect endian.h instead of trying to guess when it's available

Cc: Maxin B. John 
Cc: Khem Raj 
Cc: Rob Herring 
Suggested-by: Jon Turney 
Signed-off-by: Eric Engestrom 
Reviewed-by: Emil Velikov 
Reviewed-by: Dylan Baker 
Cc: 

---

 Android.common.mk   | 1 +
 configure.ac| 1 +
 meson.build | 2 +-
 scons/gallium.py| 3 +++
 src/util/u_endian.h | 2 +-
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Android.common.mk b/Android.common.mk
index 52dc7bff3b..e8aed48c31 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -70,6 +70,7 @@ LOCAL_CFLAGS += \
-DHAVE_DLADDR \
-DHAVE_DL_ITERATE_PHDR \
-DHAVE_LINUX_FUTEX_H \
+   -DHAVE_ENDIAN_H \
-DHAVE_ZLIB \
-DMAJOR_IN_SYSMACROS \
-fvisibility=hidden \
diff --git a/configure.ac b/configure.ac
index 29d3c3457a..36c56da787 100644
--- a/configure.ac
+++ b/configure.ac
@@ -865,6 +865,7 @@ fi
 AC_HEADER_MAJOR
 AC_CHECK_HEADER([xlocale.h], [DEFINES="$DEFINES -DHAVE_XLOCALE_H"])
 AC_CHECK_HEADER([sys/sysctl.h], [DEFINES="$DEFINES -DHAVE_SYS_SYSCTL_H"])
+AC_CHECK_HEADER([endian.h], [DEFINES="$DEFINES -DHAVE_ENDIAN_H"])
 AC_CHECK_FUNC([strtof], [DEFINES="$DEFINES -DHAVE_STRTOF"])
 AC_CHECK_FUNC([mkostemp], [DEFINES="$DEFINES -DHAVE_MKOSTEMP"])
 AC_CHECK_FUNC([timespec_get], [DEFINES="$DEFINES -DHAVE_TIMESPEC_GET"])
diff --git a/meson.build b/meson.build
index 871b0d8d22..041d2bfc70 100644
--- a/meson.build
+++ b/meson.build
@@ -916,7 +916,7 @@ elif cc.has_header_symbol('sys/mkdev.h', 'major')
   pre_args += '-DMAJOR_IN_MKDEV'
 endif
 
-foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h']
+foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h', 'endian.h']
   if cc.compiles('#include <@0@>'.format(h), name : '@0@ works'.format(h))
 pre_args += '-DHAVE_@0@'.format(h.to_upper().underscorify())
   endif
diff --git a/scons/gallium.py b/scons/gallium.py
index 75200b89c1..6cb20efcbf 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -354,6 +354,9 @@ def generate(env):
 if check_header(env, 'xlocale.h'):
 cppdefines += ['HAVE_XLOCALE_H']
 
+if check_header(env, 'endian.h'):
+cppdefines += ['HAVE_ENDIAN_H']
+
 if check_functions(env, ['strtod_l', 'strtof_l']):
 cppdefines += ['HAVE_STRTOD_L']
 
diff --git a/src/util/u_endian.h b/src/util/u_endian.h
index 22d011ec00..e11b381588 100644
--- a/src/util/u_endian.h
+++ b/src/util/u_endian.h
@@ -27,7 +27,7 @@
 #ifndef U_ENDIAN_H
 #define U_ENDIAN_H
 
-#if defined(__GLIBC__) || defined(ANDROID) || defined(__CYGWIN__)
+#ifdef HAVE_ENDIAN_H
 #include 
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: merge C and C++ compiler arguments check

[Eric Engeström]

Module: Mesa
Branch: master
Commit: cb2ddcefa5196fdfeff76f405175c7a6c110eae4
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb2ddcefa5196fdfeff76f405175c7a6c110eae4

Author: Eric Engestrom 
Date:   Mon Mar 12 14:54:50 2018 +

meson: merge C and C++ compiler arguments check

Signed-off-by: Eric Engestrom 
Reviewed-by: Emil Velikov 
Reviewed-by: Dylan Baker 

---

 meson.build | 17 ++---
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/meson.build b/meson.build
index 871b0d8d22..6edb089db9 100644
--- a/meson.build
+++ b/meson.build
@@ -764,7 +764,9 @@ if ['linux', 'cygwin'].contains(host_machine.system())
   pre_args += '-D_GNU_SOURCE'
 endif
 
-# Check for generic C arguments
+# Check for generic C/C++ arguments
+cpp = meson.get_compiler('cpp')
+cpp_args = []
 c_args = []
 foreach a : ['-Wall', '-Werror=implicit-function-declaration',
  '-Werror=missing-prototypes', '-fno-math-errno',
@@ -772,22 +774,15 @@ foreach a : ['-Wall', 
'-Werror=implicit-function-declaration',
   if cc.has_argument(a)
 c_args += a
   endif
+  if cpp.has_argument(a)
+cpp_args += a
+  endif
 endforeach
 c_vis_args = []
 if cc.has_argument('-fvisibility=hidden')
   c_vis_args += '-fvisibility=hidden'
 endif
 
-# Check for generic C++ arguments
-cpp = meson.get_compiler('cpp')
-cpp_args = []
-foreach a : ['-Wall', '-fno-math-errno', '-fno-trapping-math',
- '-Qunused-arguments']
-  if cpp.has_argument(a)
-cpp_args += a
-  endif
-endforeach
-
 # For some reason, the test for -Wno-foo always succeeds with gcc, even if the
 # option is not supported. Hence, check for -Wfoo instead.
 if cpp.has_argument('-Wnon-virtual-dtor')

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): omx: always define ENABLE_ST_OMX_{BELLAGIO,TIZONIA}

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 880c1718b6d14b33fe5ba918af70fea5be890c6b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=880c1718b6d14b33fe5ba918af70fea5be890c6b

Author: Mathias Fröhlich 
Date:   Fri Mar 16 06:34:35 2018 +0100

omx: always define ENABLE_ST_OMX_{BELLAGIO,TIZONIA}

We're trying to be -Wundef clean so that we can turn it on (and
eventually make it an error).

Note that the OMX code already used `#if ENABLE_ST_OMX_BELLAGIO` instead
of #ifdef; I could've changed these, but the point of -Wundef is to
catch typos, so we might as well make the change the right way.

Fixes: 83d4a5d5aea5a8a05be2 "st/omx/tizonia: Add H.264 decoder"
Fixes: b2f2236dc565dd1460f0 "st/omx/tizonia: Add H.264 encoder"
Fixes: c62cf1f165919bc74296 "st/omx/tizonia/h264d: Add EGLImage support"
Cc: Gurkirpal Singh 
Signed-off-by: Eric Engestrom 
Reviewed-by: Emil Velikov 
Reviewed-by: Dylan Baker 

---

 configure.ac | 4 
 meson.build  | 9 +++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5074275211..29d3c3457a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2286,6 +2286,8 @@ if test "x$enable_omx_bellagio" = xyes; then
 PKG_CHECK_MODULES([OMX_BELLAGIO], [libomxil-bellagio >= 
$LIBOMXIL_BELLAGIO_REQUIRED])
 gallium_st="$gallium_st omx_bellagio"
 AC_DEFINE([ENABLE_ST_OMX_BELLAGIO], 1, [Use Bellagio for OMX IL])
+else
+AC_DEFINE([ENABLE_ST_OMX_BELLAGIO], 0)
 fi
 AM_CONDITIONAL(HAVE_ST_OMX_BELLAGIO, test "x$enable_omx_bellagio" = xyes)
 
@@ -2299,6 +2301,8 @@ if test "x$enable_omx_tizonia" = xyes; then
libtizplatform >= $LIBOMXIL_TIZONIA_REQUIRED])
 gallium_st="$gallium_st omx_tizonia"
 AC_DEFINE([ENABLE_ST_OMX_TIZONIA], 1, [Use Tizoina for OMX IL])
+else
+AC_DEFINE([ENABLE_ST_OMX_TIZONIA], 0)
 fi
 AM_CONDITIONAL(HAVE_ST_OMX_TIZONIA, test "x$enable_omx_tizonia" = xyes)
 
diff --git a/meson.build b/meson.build
index 0a94eec514..871b0d8d22 100644
--- a/meson.build
+++ b/meson.build
@@ -503,7 +503,6 @@ if ['auto', 'bellagio'].contains(_omx)
 'libomxil-bellagio', required : _omx == 'bellagio'
   )
   if dep_omx.found()
-pre_args += '-DENABLE_ST_OMX_BELLAGIO'
 with_gallium_omx = 'bellagio'
   endif
 endif
@@ -518,7 +517,6 @@ if ['auto', 'tizonia'].contains(_omx)
   dependency('tizilheaders', required : _omx == 'tizonia'),
 ]
 if dep_omx.found() and dep_omx_other[0].found() and 
dep_omx_other[1].found()
-  pre_args += '-DENABLE_ST_OMX_TIZONIA'
   with_gallium_omx = 'tizonia'
 endif
   elif _omx == 'tizonia'
@@ -531,7 +529,14 @@ else
   with_gallium_omx = _omx
 endif
 
+pre_args += [
+  '-DENABLE_ST_OMX_BELLAGIO=' + (with_gallium_omx == 'bellagio' ? '1' : '0'),
+  '-DENABLE_ST_OMX_TIZONIA=' + (with_gallium_omx == 'tizonia' ? '1' : '0'),
+]
+
+
 omx_drivers_path = get_option('omx-libs-path')
+
 if with_gallium_omx != 'disabled'
   # Figure out where to put the omx driver.
   # FIXME: this could all be vastly simplified by adding a 'defined_variable'

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: simplify omx logic

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 795b465c50930a39e9040e219c0f7ee405be6ae1
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=795b465c50930a39e9040e219c0f7ee405be6ae1

Author: Mathias Fröhlich 
Date:   Fri Mar 16 06:34:35 2018 +0100

meson: simplify omx logic

and let's make sure `with_gallium_omx` is never 'auto' and can only be
one of [bellagio, tizonia, disabled].

Signed-off-by: Eric Engestrom 
Reviewed-by: Dylan Baker 

---

 meson.build | 30 ++
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/meson.build b/meson.build
index 24cad58c61..0a94eec514 100644
--- a/meson.build
+++ b/meson.build
@@ -496,42 +496,40 @@ elif not (with_gallium_r600 or with_gallium_radeonsi or 
with_gallium_nouveau)
 error('OMX state tracker requires at least one of the following gallium 
drivers: r600, radeonsi, nouveau.')
   endif
 endif
-with_gallium_omx = _omx
 dep_omx = []
 dep_omx_other = []
-if with_gallium_omx == 'bellagio' or with_gallium_omx == 'auto'
+if ['auto', 'bellagio'].contains(_omx)
   dep_omx = dependency(
-'libomxil-bellagio', required : with_gallium_omx == 'bellagio'
+'libomxil-bellagio', required : _omx == 'bellagio'
   )
   if dep_omx.found()
 pre_args += '-DENABLE_ST_OMX_BELLAGIO'
 with_gallium_omx = 'bellagio'
   endif
 endif
-if with_gallium_omx == 'tizonia' or with_gallium_omx == 'auto'
-  if not (with_dri and with_egl)
-if with_gallium_omx == 'tizonia'
-  error('OMX-Tizonia state tracker requires dri and egl')
-else
-  with_gallium_omx == 'disabled'
-endif
-  else
+if ['auto', 'tizonia'].contains(_omx)
+  if with_dri and with_egl
 dep_omx = dependency(
   'libtizonia', version : '>= 0.10.0',
-  required : with_gallium_omx == 'tizonia',
+  required : _omx == 'tizonia',
 )
 dep_omx_other = [
-  dependency('libtizplatform', required : with_gallium_omx == 'tizonia'),
-  dependency('tizilheaders', required : with_gallium_omx == 'tizonia'),
+  dependency('libtizplatform', required : _omx == 'tizonia'),
+  dependency('tizilheaders', required : _omx == 'tizonia'),
 ]
 if dep_omx.found() and dep_omx_other[0].found() and 
dep_omx_other[1].found()
   pre_args += '-DENABLE_ST_OMX_TIZONIA'
   with_gallium_omx = 'tizonia'
-else
-  with_gallium_omx = 'disabled'
 endif
+  elif _omx == 'tizonia'
+error('OMX-Tizonia state tracker requires dri and egl')
   endif
 endif
+if _omx == 'auto'
+  with_gallium_omx = 'disabled'
+else
+  with_gallium_omx = _omx
+endif
 
 omx_drivers_path = get_option('omx-libs-path')
 if with_gallium_omx != 'disabled'

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): egl: add Ozone section to eglplatform.h

[Eric Engeström]

Module: Mesa
Branch: master
Commit: ac698ae4a01b57d490501731acf97685ec3f6cdf
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ac698ae4a01b57d490501731acf97685ec3f6cdf

Author: Eric Engestrom 
Date:   Fri Mar 16 14:14:48 2018 +

egl: add Ozone section to eglplatform.h

This pulls in commit a93f559e9c11fa53fb5f1cc255b8f75433f85d2a "Add Ozone
section to eglplatform.h" from Khronos [1] added by Brian Anderson [2]
a few months ago.

[1] 
https://github.com/KhronosGroup/EGL-Registry/commit/a93f559e9c11fa53fb5f1cc255b8f75433f85d2a
[2] https://github.com/KhronosGroup/EGL-Registry/pull/26

Signed-off-by: Eric Engestrom 
Reviewed-by: Emil Velikov 

---

 include/EGL/eglplatform.h | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
index bf9ec0bf5f..8a78a9eadd 100644
--- a/include/EGL/eglplatform.h
+++ b/include/EGL/eglplatform.h
@@ -104,6 +104,12 @@ typedef struct ANativeWindow*   
EGLNativeWindowType;
 typedef struct egl_native_pixmap_t* EGLNativePixmapType;
 typedef void*   EGLNativeDisplayType;
 
+#elif defined(USE_OZONE)
+
+typedef intptr_t EGLNativeDisplayType;
+typedef intptr_t EGLNativeWindowType;
+typedef intptr_t EGLNativePixmapType;
+
 #elif defined(__unix__) || defined(__APPLE__)
 
 #if defined(MESA_EGL_NO_X11_HEADERS)

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): egl: pull update from Khronos and drop local define

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 1346a36162a87c66a92f77306d251abb2a260fa2
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=1346a36162a87c66a92f77306d251abb2a260fa2

Author: Eric Engestrom 
Date:   Fri Mar 16 15:33:04 2018 +

egl: pull update from Khronos and drop local define

Added in Khronos in 2b6bb4ee45cc46c89d4a "EGL_MESA_drm_image: add
EGL_DRM_BUFFER_USE_CURSOR_MESA to egl.xml" [1] as part of PR #36 [2].

[1] 
https://github.com/KhronosGroup/EGL-Registry/commit/2b6bb4ee45cc46c89d4a4349f2ca94e80d77cd97
[2] https://github.com/KhronosGroup/EGL-Registry/pull/36

Signed-off-by: Eric Engestrom 
Reviewed-by: Emil Velikov 

---

 include/EGL/eglext.h | 1 +
 include/EGL/eglmesaext.h | 7 ---
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/include/EGL/eglext.h b/include/EGL/eglext.h
index f7dc66884e..2f990cc54d 100644
--- a/include/EGL/eglext.h
+++ b/include/EGL/eglext.h
@@ -933,6 +933,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurfaceHI 
(EGLDisplay dpy, EGLConfi
 #define EGL_DRM_BUFFER_STRIDE_MESA0x31D4
 #define EGL_DRM_BUFFER_USE_SCANOUT_MESA   0x0001
 #define EGL_DRM_BUFFER_USE_SHARE_MESA 0x0002
+#define EGL_DRM_BUFFER_USE_CURSOR_MESA0x0004
 typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEDRMIMAGEMESAPROC) (EGLDisplay 
dpy, const EGLint *attrib_list);
 typedef EGLBoolean (EGLAPIENTRYP PFNEGLEXPORTDRMIMAGEMESAPROC) (EGLDisplay 
dpy, EGLImageKHR image, EGLint *name, EGLint *handle, EGLint *stride);
 #ifdef EGL_EGLEXT_PROTOTYPES
diff --git a/include/EGL/eglmesaext.h b/include/EGL/eglmesaext.h
index 5bf6306a38..f4332b279f 100644
--- a/include/EGL/eglmesaext.h
+++ b/include/EGL/eglmesaext.h
@@ -34,13 +34,6 @@ extern "C" {
 
 #include 
 
-#ifdef EGL_MESA_drm_image
-/* Mesa's extension to EGL_MESA_drm_image... */
-#ifndef EGL_DRM_BUFFER_USE_CURSOR_MESA
-#define EGL_DRM_BUFFER_USE_CURSOR_MESA 0x0004
-#endif
-#endif
-
 #ifndef EGL_WL_bind_wayland_display
 #define EGL_WL_bind_wayland_display 1
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): mailmap: Use Eric Engestrom's personal email address

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 6332893594924a14e984aee2b75f7a5263816b19
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=6332893594924a14e984aee2b75f7a5263816b19

Author: Eric Engestrom 
Date:   Thu Jun  2 16:46:49 2016 +0100

mailmap: Use Eric Engestrom's personal email address

Signed-off-by: Eric Engestrom 

---

 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 756b06656a..ff60ba7ea8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -148,6 +148,8 @@ Emil Velikov  

 
 Eric Anholt  Eric Anholt 
 
+Eric Engestrom  
+
 Eugeni Dodonov  
 
 Fabian Bieler  

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): vulkan/wsi: clean up cleanup path

[Eric Engeström]

Module: Mesa
Branch: master
Commit: e903a7b0bbcadc8911e1b32addd6186acd548809
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e903a7b0bbcadc8911e1b32addd6186acd548809

Author: Eric Engestrom 
Date:   Mon Feb 26 13:34:54 2018 +

vulkan/wsi: clean up cleanup path

Signed-off-by: Eric Engestrom 
Reviewed-by: Keith Packard 
Reviewed-by: Emil Velikov 

---

 src/vulkan/wsi/wsi_common.c | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/vulkan/wsi/wsi_common.c b/src/vulkan/wsi/wsi_common.c
index edba13a13d..fe262b4968 100644
--- a/src/vulkan/wsi/wsi_common.c
+++ b/src/vulkan/wsi/wsi_common.c
@@ -82,20 +82,20 @@ wsi_device_init(struct wsi_device *wsi,
 #ifdef VK_USE_PLATFORM_XCB_KHR
result = wsi_x11_init_wsi(wsi, alloc);
if (result != VK_SUCCESS)
-  return result;
+  goto fail;
 #endif
 
 #ifdef VK_USE_PLATFORM_WAYLAND_KHR
result = wsi_wl_init_wsi(wsi, alloc, pdevice);
-   if (result != VK_SUCCESS) {
-#ifdef VK_USE_PLATFORM_XCB_KHR
-  wsi_x11_finish_wsi(wsi, alloc);
-#endif
-  return result;
-   }
+   if (result != VK_SUCCESS)
+  goto fail;
 #endif
 
return VK_SUCCESS;
+
+fail:
+   wsi_device_finish(wsi, alloc);
+   return result;
 }
 
 void

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): drirc: whitespace fix

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 19dd7f007e62d3962a5a9f1d92332e8e23e0deee
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=19dd7f007e62d3962a5a9f1d92332e8e23e0deee

Author: Eric Engestrom 
Date:   Thu Mar  8 09:52:16 2018 +

drirc: whitespace fix

Signed-off-by: Eric Engestrom 

---

 src/util/drirc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/util/drirc b/src/util/drirc
index c964588e72..250cc784b3 100644
--- a/src/util/drirc
+++ b/src/util/drirc
@@ -277,9 +277,9 @@ TODO: document the other workarounds.
 
 
 
-   
+
 
-   
+
 
 
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): gbm: give a name to rgba fields

[Eric Engeström]

Module: Mesa
Branch: master
Commit: b98c905a463a1915fd15861ad2d0af180ad605ac
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=b98c905a463a1915fd15861ad2d0af180ad605ac

Author: Eric Engestrom 
Date:   Wed Feb 28 16:08:54 2018 +

gbm: give a name to rgba fields

Signed-off-by: Eric Engestrom 
Reviewed-by: Daniel Stone 

---

 src/egl/drivers/dri2/platform_drm.c | 16 
 src/gbm/backends/dri/gbm_driint.h   |  7 ++-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/egl/drivers/dri2/platform_drm.c 
b/src/egl/drivers/dri2/platform_drm.c
index 01fa1f11b9..dc4efea910 100644
--- a/src/egl/drivers/dri2/platform_drm.c
+++ b/src/egl/drivers/dri2/platform_drm.c
@@ -118,10 +118,10 @@ dri2_drm_config_is_compatible(struct dri2_egl_display 
*dri2_dpy,
if (i == dri2_dpy->gbm_dri->num_visuals)
   return false;
 
-   if (red != visual->rgba_masks[0] ||
-   green != visual->rgba_masks[1] ||
-   blue != visual->rgba_masks[2] ||
-   (alpha && visual->rgba_masks[3] && alpha != visual->rgba_masks[3])) {
+   if (red != visual->rgba_masks.red ||
+   green != visual->rgba_masks.green ||
+   blue != visual->rgba_masks.blue ||
+   (alpha && visual->rgba_masks.alpha && alpha != 
visual->rgba_masks.alpha)) {
   return false;
}
 
@@ -638,10 +638,10 @@ drm_add_configs_for_visuals(_EGLDriver *drv, _EGLDisplay 
*disp)
   for (unsigned j = 0; j < num_visuals; j++) {
  struct dri2_egl_config *dri2_conf;
 
- if (visuals[j].rgba_masks[0] != red ||
- visuals[j].rgba_masks[1] != green ||
- visuals[j].rgba_masks[2] != blue ||
-visuals[j].rgba_masks[3] != alpha)
+ if (visuals[j].rgba_masks.red != red ||
+ visuals[j].rgba_masks.green != green ||
+ visuals[j].rgba_masks.blue != blue ||
+ visuals[j].rgba_masks.alpha != alpha)
 continue;
 
  const EGLint attr_list[] = {
diff --git a/src/gbm/backends/dri/gbm_driint.h 
b/src/gbm/backends/dri/gbm_driint.h
index 84a98533c7..8497be3e8f 100644
--- a/src/gbm/backends/dri/gbm_driint.h
+++ b/src/gbm/backends/dri/gbm_driint.h
@@ -43,7 +43,12 @@ struct gbm_dri_bo;
 struct gbm_dri_visual {
uint32_t gbm_format;
int dri_image_format;
-   uint32_t rgba_masks[4];
+   struct {
+  uint32_t red;
+  uint32_t green;
+  uint32_t blue;
+  uint32_t alpha;
+   } rgba_masks;
 };
 
 struct gbm_dri_device {

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: simplify the gbm option code, and avoid changing types

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 76e8d619996a6179af7506b77edad7a9fe3dbc63
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=76e8d619996a6179af7506b77edad7a9fe3dbc63

Author: Eric Engestrom 
Date:   Fri Feb 23 17:08:20 2018 +

meson: simplify the gbm option code, and avoid changing types

v2: drop gallium comment (Dylan)

Signed-off-by: Eric Engestrom 
Reviewed-by: Dylan Baker 

---

 meson.build | 16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/meson.build b/meson.build
index 6f2615f9d1..40e9c8ff45 100644
--- a/meson.build
+++ b/meson.build
@@ -294,16 +294,14 @@ if not (with_dri or with_gallium or with_glx == 'xlib' or 
with_glx == 'gallium-x
   with_shared_glapi = false
 endif
 
-with_gbm = get_option('gbm')
-if with_gbm == 'auto' and with_dri  # TODO: or gallium
-  with_gbm = system_has_kms_drm
-elif with_gbm == 'true'
-  if not system_has_kms_drm
-error('GBM only supports DRM/KMS platforms')
-  endif
-  with_gbm = true
+_gbm = get_option('gbm')
+if _gbm == 'auto'
+  with_gbm = system_has_kms_drm and with_dri
 else
-  with_gbm = false
+  with_gbm = _gbm == 'true'
+endif
+if with_gbm and not system_has_kms_drm
+  error('GBM only supports DRM/KMS platforms')
 endif
 
 _egl = get_option('egl')

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: avoid changing types for the dri3 option

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 248c593132b4465fe70545ceea1f560ca3c6d6df
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=248c593132b4465fe70545ceea1f560ca3c6d6df

Author: Eric Engestrom 
Date:   Fri Feb 23 17:08:45 2018 +

meson: avoid changing types for the dri3 option

Signed-off-by: Eric Engestrom 
Reviewed-by: Dylan Baker 

---

 meson.build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index 40e9c8ff45..308f64cf81 100644
--- a/meson.build
+++ b/meson.build
@@ -371,11 +371,11 @@ if with_vulkan_icd_dir == ''
 endif
 
 with_dri2 = (with_dri or with_any_vk) and with_dri_platform == 'drm'
-with_dri3 = get_option('dri3')
-if with_dri3 == 'auto'
+_dri3 = get_option('dri3')
+if _dri3 == 'auto'
   with_dri3 = system_has_kms_drm and with_dri2
 else
-  with_dri3 = with_dri3 == 'true'
+  with_dri3 = _dri3 == 'true'
 endif
 
 if with_any_vk and (with_platform_x11 and not with_dri3)

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): *-symbol-check: use correct `nm` path when cross-compiling

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 11d45304fd20bbdf07222830e76d3f9977e803b4
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=11d45304fd20bbdf07222830e76d3f9977e803b4

Author: Eric Engestrom 
Date:   Fri Feb 23 17:02:08 2018 +

*-symbol-check: use correct `nm` path when cross-compiling

Inspired-by: a similar patch for libdrm by Heiko Becker
Signed-off-by: Eric Engestrom 
Reviewed-by: Emil Velikov 

---

 configure.ac  | 1 +
 meson.build   | 3 +++
 src/egl/egl-symbols-check | 2 +-
 src/egl/meson.build   | 1 +
 src/egl/wayland/wayland-egl/meson.build   | 1 +
 src/egl/wayland/wayland-egl/wayland-egl-symbols-check | 2 +-
 src/gbm/gbm-symbols-check | 3 +--
 src/gbm/meson.build   | 1 +
 src/mapi/es1api/ABI-check | 2 +-
 src/mapi/es1api/meson.build   | 1 +
 src/mapi/es2api/ABI-check | 2 +-
 src/mapi/es2api/meson.build   | 1 +
 12 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 346c813035..d8093597dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,6 +116,7 @@ dnl other CC/CXX flags related help
 AC_ARG_VAR([CXX11_CXXFLAGS], [Compiler flag to enable C++11 support (only 
needed if not
   enabled by default and different  from 
-std=c++11)])
 AM_PROG_CC_C_O
+AC_PROG_NM
 AM_PROG_AS
 AX_CHECK_GNU_MAKE
 AC_CHECK_PROGS([PYTHON2], [python2.7 python2 python])
diff --git a/meson.build b/meson.build
index 8cf67b8171..6f2615f9d1 100644
--- a/meson.build
+++ b/meson.build
@@ -1256,6 +1256,9 @@ endif
 
 pkg = import('pkgconfig')
 
+env_test = environment()
+env_test.set('NM', find_program('nm').path())
+
 subdir('include')
 subdir('bin')
 subdir('src')
diff --git a/src/egl/egl-symbols-check b/src/egl/egl-symbols-check
index ae867d04bc..460e61a357 100755
--- a/src/egl/egl-symbols-check
+++ b/src/egl/egl-symbols-check
@@ -8,7 +8,7 @@ then
   exit 1
 fi
 
-FUNCS=$(nm -D --defined-only $LIB | grep -o "T .*" | cut -c 3- | while read 
func; do
+FUNCS=$($NM -D --defined-only $LIB | grep -o "T .*" | cut -c 3- | while read 
func; do
 ( grep -q "^$func$" || echo $func )  

Mesa (master): egl/dri2: fix segfault when display initialisation fails

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 6160bf97db8bc493512795b1fa49c072a703df50
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=6160bf97db8bc493512795b1fa49c072a703df50

Author: Frank Binns 
Date:   Thu Feb 22 13:37:54 2018 +

egl/dri2: fix segfault when display initialisation fails

dri2_display_destroy() is called when platform specific display
initialisation fails. However, this would typically lead to a
segfault due to the dri2_egl_display vbtl not having been set up.

Fixes: 2db95482964 ("loader_dri3/glx/egl: Optionally use a blit
context for blitting operations")
Signed-off-by: Frank Binns 
Reviewed-by: Eric Engestrom 
Reviewed-by: Emil Velikov 

---

 src/egl/drivers/dri2/egl_dri2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 17b646e7ed..c06a0ca099 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -973,7 +973,7 @@ dri2_display_destroy(_EGLDisplay *disp)
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
 
if (dri2_dpy->own_dri_screen) {
-  if (dri2_dpy->vtbl->close_screen_notify)
+  if (dri2_dpy->vtbl && dri2_dpy->vtbl->close_screen_notify)
  dri2_dpy->vtbl->close_screen_notify(disp);
   dri2_dpy->core->destroyScreen(dri2_dpy->dri_screen);
}

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): docs: fix patent url

[Eric Engeström]

Module: Mesa
Branch: master
Commit: ac731531a1e43e4fa3e10099380a3bba68d65bfd
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ac731531a1e43e4fa3e10099380a3bba68d65bfd

Author: Eric Engestrom 
Date:   Tue Feb 20 13:35:56 2018 +

docs: fix patent url

Reported-by: Pierre Moreau 
Signed-off-by: Eric Engestrom 
Reviewed-by: Emil Velikov 

---

 docs/patents.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/patents.txt b/docs/patents.txt
index b20a045d4b..91c5757d14 100644
--- a/docs/patents.txt
+++ b/docs/patents.txt
@@ -27,5 +27,5 @@ ARB_texture_float:
 enable this extension.
 
 
-[1] https://www.google.com/patents/about?id=mIIOEBAJ=6650327
+[1] https://patents.google.com/patent/US6650327B1
 [2] https://www.opengl.org/registry/specs/ARB/texture_float.txt

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): configure.ac: pthread-stubs not present on OpenBSD

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 9401d90a537f0db62e726eeffe468a64189550f1
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=9401d90a537f0db62e726eeffe468a64189550f1

Author: Jonathan Gray 
Date:   Tue Feb 20 17:38:00 2018 +1100

configure.ac: pthread-stubs not present on OpenBSD

pthread-stubs is no longer required on OpenBSD and has been removed.
libpthread parts involved moved to libc.

Signed-off-by: Jonathan Gray 
Cc: 17.3 18.0 
Reviewed-by: Eric Engestrom 
Reviewed-by: Emil Velikov 

---

 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index d37cb67a46..8a9172690a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -939,10 +939,10 @@ dnl In practise that should be sufficient for all 
platforms, since any
 dnl platforms build with GCC and Clang support the flag.
 PTHREAD_LIBS="$PTHREAD_LIBS -pthread"
 
-dnl pthread-stubs is mandatory on BSD platforms, due to the nature of the
+dnl pthread-stubs is mandatory on some BSD platforms, due to the nature of the
 dnl project. Even then there's a notable issue as described in the project 
README
 case "$host_os" in
-linux* | cygwin* | darwin* | solaris* | *-gnu* | gnu*)
+linux* | cygwin* | darwin* | solaris* | *-gnu* | gnu* | openbsd*)
 pthread_stubs_possible="no"
 ;;
 * )

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): egl/wayland: check for invalid format index

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 65dda6c9ec1d80ee36c8bff157f49d97baffebce
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=65dda6c9ec1d80ee36c8bff157f49d97baffebce

Author: Eric Engestrom 
Date:   Thu Feb 15 11:10:22 2018 +

egl/wayland: check for invalid format index

v2: just tell the compiler to assume the format will always be found, as
it comes from the table itself to begin with. (DanielS)

CID: 1429516
Fixes: d32b23f3830099a328b91 "egl/wayland: Add bpp to visual map"
Signed-off-by: Eric Engestrom 
Reviewed-by: Daniel Stone 

---

 src/egl/drivers/dri2/platform_wayland.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/egl/drivers/dri2/platform_wayland.c 
b/src/egl/drivers/dri2/platform_wayland.c
index 5b8bec901b..877f7933b9 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -1452,6 +1452,8 @@ dri2_wl_swrast_get_stride_for_format(int format, int w)
 {
int visual_idx = dri2_wl_visual_idx_from_shm_format(format);
 
+   assume(visual_idx != -1);
+
return w * (dri2_wl_visuals[visual_idx].bpp / 8);
 }
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): glsl: fix sizeof(pointer) bug

[Eric Engeström]

Module: Mesa
Branch: master
Commit: a176b053b6f956db14becd981795e3adad969a13
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=a176b053b6f956db14becd981795e3adad969a13

Author: Eric Engestrom 
Date:   Thu Feb 15 10:59:24 2018 +

glsl: fix sizeof(pointer) bug

Doesn't really change anything to the test though ¯\_(ツ)_/¯

CID: 1429511
Fixes: e8495646afb06a9dd7786 "glsl/tests: changes to test_disk_cache_create 
test"
Signed-off-by: Eric Engestrom 
Reviewed-by: Brian Paul 
Reviewed-by: Tapani Pälli 

---

 src/compiler/glsl/tests/cache_test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/glsl/tests/cache_test.c 
b/src/compiler/glsl/tests/cache_test.c
index 3edd88b06a..9d7bde2834 100644
--- a/src/compiler/glsl/tests/cache_test.c
+++ b/src/compiler/glsl/tests/cache_test.c
@@ -186,7 +186,7 @@ static void *
 cache_exists(struct disk_cache *cache)
 {
uint8_t dummy_key[20];
-   char *data = "some test data";
+   char data[] = "some test data";
 
if (!cache)
   return NULL;

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): r200: remove left over dead code

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 111d4bf1d0f2dfab274646a6474f05198203f566
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=111d4bf1d0f2dfab274646a6474f05198203f566

Author: Eric Engestrom 
Date:   Fri Feb  9 11:38:43 2018 +

r200: remove left over dead code

0aaa27f29187ffb739c7 removed the references to this array without
removing the array itself

Cc: Ian Romanick 
Fixes: 0aaa27f29187ffb739c7 "mesa: Pass the translated color logic op 
dd_function_table::LogicOpcode"
Signed-off-by: Eric Engestrom 
Reviewed-by: Elie Tournier 

---

 src/mesa/drivers/dri/r200/r200_state.c | 20 
 1 file changed, 20 deletions(-)

diff --git a/src/mesa/drivers/dri/r200/r200_state.c 
b/src/mesa/drivers/dri/r200/r200_state.c
index 33b696347a..d53225d63a 100644
--- a/src/mesa/drivers/dri/r200/r200_state.c
+++ b/src/mesa/drivers/dri/r200/r200_state.c
@@ -1626,26 +1626,6 @@ static void r200RenderMode( struct gl_context *ctx, 
GLenum mode )
FALLBACK( rmesa, R200_FALLBACK_RENDER_MODE, (mode != GL_RENDER) );
 }
 
-
-static GLuint r200_rop_tab[] = {
-   R200_ROP_CLEAR,
-   R200_ROP_AND,
-   R200_ROP_AND_REVERSE,
-   R200_ROP_COPY,
-   R200_ROP_AND_INVERTED,
-   R200_ROP_NOOP,
-   R200_ROP_XOR,
-   R200_ROP_OR,
-   R200_ROP_NOR,
-   R200_ROP_EQUIV,
-   R200_ROP_INVERT,
-   R200_ROP_OR_REVERSE,
-   R200_ROP_COPY_INVERTED,
-   R200_ROP_OR_INVERTED,
-   R200_ROP_NAND,
-   R200_ROP_SET,
-};
-
 static void r200LogicOpCode(struct gl_context *ctx, enum gl_logicop_mode 
opcode)
 {
r200ContextPtr rmesa = R200_CONTEXT(ctx);

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: don't install windows headers on non-windows platforms

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 4c5f0b4fd45a5ca96a0e3137c177140dd85b149e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=4c5f0b4fd45a5ca96a0e3137c177140dd85b149e

Author: Marc Dietrich 
Date:   Thu Feb  1 13:27:28 2018 +0100

meson: don't install windows headers on non-windows platforms

Only dive into the windows subdir if windows platform is selected.

Signed-off-by: Marc Dietrich 
Fixes: 5ef75cb02b2b4db5506b8 "meson: build src/glx/windows"
Reviewed-by: Eric Engestrom 

---

 src/glx/meson.build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/glx/meson.build b/src/glx/meson.build
index 04cd647ee4..e645b22b5f 100644
--- a/src/glx/meson.build
+++ b/src/glx/meson.build
@@ -18,7 +18,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-subdir('windows')
+if with_dri_platform == 'windows'
+  subdir('windows')
+endif
 
 files_libglx = files(
   'clientattrib.c',

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: dedup gallium-omx logic

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 86168ed31c52ca5be3b618a5aae2e5d8990f4c31
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=86168ed31c52ca5be3b618a5aae2e5d8990f4c31

Author: Eric Engestrom 
Date:   Thu Dec  7 16:03:04 2017 +

meson: dedup gallium-omx logic

Signed-off-by: Eric Engestrom 
Reviewed-by: Dylan Baker 

---

 meson.build | 38 +++---
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/meson.build b/meson.build
index 67702bded2..94c9bdc2bb 100644
--- a/meson.build
+++ b/meson.build
@@ -445,32 +445,32 @@ if xvmc_drivers_path == ''
   xvmc_drivers_path = get_option('libdir')
 endif
 
-dep_omx = []
 _omx = get_option('gallium-omx')
-if _omx == 'auto'
-  if not system_has_kms_drm
-with_gallium_omx = false
-  elif not with_platform_x11
-with_gallium_omx = false
-  elif not (with_gallium_r600 or with_gallium_radeonsi or with_gallium_nouveau)
-with_gallium_omx = false
+if not system_has_kms_drm
+  if _omx == 'true'
+error('OMX state tracker can only be built on unix-like OSes.')
   else
-dep_omx = dependency('libomxil-bellagio', required : false)
-with_gallium_omx = dep_omx.found()
+_omx = 'false'
   endif
-elif _omx == 'true'
-  if not system_has_kms_drm
-error('OMX state tracker can only be built on DRM/KMS OSes.')
-  elif not (with_platform_x11 or with_platform_drm)
+elif not (with_platform_x11 or with_platform_drm)
+  if _omx == 'true'
 error('OMX state tracker requires X11 or drm platform support.')
-with_gallium_omx = false
-  elif not (with_gallium_r600 or with_gallium_radeonsi or with_gallium_nouveau)
+  else
+_omx = 'false'
+  endif
+elif not (with_gallium_r600 or with_gallium_radeonsi or with_gallium_nouveau)
+  if _omx == 'true'
 error('OMX state tracker requires at least one of the following gallium 
drivers: r600, radeonsi, nouveau.')
+  else
+_omx = 'false'
   endif
+elif _omx == 'auto'
+  _omx = 'true'
+endif
+with_gallium_omx = _omx == 'true'
+dep_omx = []
+if with_gallium_omx
   dep_omx = dependency('libomxil-bellagio')
-  with_gallium_omx = true
-else
-  with_gallium_omx = false
 endif
 
 omx_drivers_path = get_option('omx-libs-path')

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: dedup gallium-va logic

[Eric Engeström]

Module: Mesa
Branch: master
Commit: fa5d616bf907bedda6904cdff98832d9c8c59770
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=fa5d616bf907bedda6904cdff98832d9c8c59770

Author: Eric Engestrom 
Date:   Thu Dec  7 16:03:22 2017 +

meson: dedup gallium-va logic

Signed-off-by: Eric Engestrom 
Reviewed-by: Dylan Baker 

---

 meson.build | 38 ++
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/meson.build b/meson.build
index 94c9bdc2bb..3d048dd71b 100644
--- a/meson.build
+++ b/meson.build
@@ -503,34 +503,32 @@ if with_gallium_omx
   )
 endif
 
-dep_va = []
 _va = get_option('gallium-va')
-if _va == 'auto'
-  if not system_has_kms_drm
-with_gallium_va = false
-  elif not with_platform_x11
-with_gallium_va = false
-  elif not (with_gallium_r600 or with_gallium_radeonsi or with_gallium_nouveau)
-with_gallium_va = false
+if not system_has_kms_drm
+  if _va == 'true'
+error('VA state tracker can only be built on unix-like OSes.')
   else
-dep_va = dependency('libva', version : '>= 0.38.0', required : false)
-with_gallium_va = dep_va.found()
+_va = 'false'
   endif
-elif _va == 'true'
-  if not system_has_kms_drm
-error('VA state tracker can only be built on DRM/KMS OSes.')
-  elif not (with_platform_x11 or with_platform_drm)
+elif not (with_platform_x11 or with_platform_drm)
+  if _va == 'true'
 error('VA state tracker requires X11 or drm or wayland platform support.')
-with_gallium_va = false
-  elif not (with_gallium_r600 or with_gallium_radeonsi or with_gallium_nouveau)
+  else
+_va = 'false'
+  endif
+elif not (with_gallium_r600 or with_gallium_radeonsi or with_gallium_nouveau)
+  if _va == 'true'
 error('VA state tracker requires at least one of the following gallium 
drivers: r600, radeonsi, nouveau.')
+  else
+_va = 'false'
   endif
-  dep_va = dependency('libva', version : '>= 0.38.0')
-  with_gallium_va = true
-else
-  with_gallium_va = false
+elif _va == 'auto'
+  _va = 'true'
 endif
+with_gallium_va = _va == 'true'
+dep_va = []
 if with_gallium_va
+  dep_va = dependency('libva', version : '>= 0.38.0')
   dep_va = declare_dependency(
 compile_args : run_command(prog_pkgconfig, ['libva', 
'--cflags']).stdout().split()
   )

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: dedup gallium-xa logic

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 2f0db33527fc5415858e60d76d5b82c5492151fa
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=2f0db33527fc5415858e60d76d5b82c5492151fa

Author: Eric Engestrom 
Date:   Thu Dec  7 16:03:40 2017 +

meson: dedup gallium-xa logic

Signed-off-by: Eric Engestrom 
Reviewed-by: Dylan Baker 

---

 meson.build | 25 ++---
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/meson.build b/meson.build
index 3d048dd71b..80ea60ffa7 100644
--- a/meson.build
+++ b/meson.build
@@ -540,26 +540,21 @@ if va_drivers_path == ''
 endif
 
 _xa = get_option('gallium-xa')
-if _xa == 'auto'
-  if not system_has_kms_drm
-with_gallium_xa = false
-  elif not (with_gallium_nouveau or with_gallium_freedreno or with_gallium_i915
-or with_gallium_svga)
-with_gallium_xa = false
+if not system_has_kms_drm
+  if _xa == 'true'
+error('XA state tracker can only be built on unix-like OSes.')
   else
-with_gallium_xa = true
+_xa = 'false'
   endif
-elif _xa == 'true'
-  if not system_has_kms_drm
-error('XA state tracker can only be built on DRM/KMS OSes.')
-  elif not (with_gallium_nouveau or with_gallium_freedreno or with_gallium_i915
-or with_gallium_svga)
+elif not (with_gallium_nouveau or with_gallium_freedreno or with_gallium_i915
+  or with_gallium_svga)
+  if _xa == 'true'
 error('XA state tracker requires at least one of the following gallium 
drivers: nouveau, freedreno, i915, svga.')
+  else
+_xa = 'false'
   endif
-  with_gallium_xa = true
-else
-  with_gallium_xa = false
 endif
+with_gallium_xa = _xa != 'false'
 
 d3d_drivers_path = get_option('d3d-drivers-path')
 if d3d_drivers_path == ''

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: dedup gallium-vdpau logic

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 992af0a4b8224bdb4809e01c2f00d2f32546aee5
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=992af0a4b8224bdb4809e01c2f00d2f32546aee5

Author: Eric Engestrom 
Date:   Thu Dec  7 16:02:02 2017 +

meson: dedup gallium-vdpau logic

Signed-off-by: Eric Engestrom 
Reviewed-by: Dylan Baker 

---

 meson.build | 41 +++--
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/meson.build b/meson.build
index 824e3c46bc..5c22e80ca5 100644
--- a/meson.build
+++ b/meson.build
@@ -369,36 +369,33 @@ endif
 
 prog_pkgconfig = find_program('pkg-config')
 
-dep_vdpau = []
 _vdpau = get_option('gallium-vdpau')
-if _vdpau == 'auto'
-  if not system_has_kms_drm
-with_gallium_vdpau = false
-  elif not with_platform_x11
-with_gallium_vdpau = false
-  elif not (with_gallium_r300 or with_gallium_r600 or with_gallium_radeonsi or
-with_gallium_nouveau)
-with_gallium_vdpau = false
+if not system_has_kms_drm
+  if _vdpau == 'true'
+error('VDPAU state tracker can only be build on unix-like OSes.')
   else
-dep_vdpau = dependency('vdpau', version : '>= 1.1', required : false)
-with_gallium_vdpau = dep_vdpau.found()
+_vdpau = 'false'
   endif
-elif _vdpau == 'true'
-  if not system_has_kms_drm
-error('VDPAU state tracker can only be build on DRM/KMS OSes.')
-  elif not with_platform_x11
+elif not with_platform_x11
+  if _vdpau == 'true'
 error('VDPAU state tracker requires X11 support.')
-with_gallium_vdpau = false
-  elif not (with_gallium_r300 or with_gallium_r600 or with_gallium_radeonsi or
-with_gallium_nouveau)
+  else
+_vdpau = 'false'
+  endif
+elif not (with_gallium_r300 or with_gallium_r600 or with_gallium_radeonsi or
+  with_gallium_nouveau)
+  if _vdpau == 'true'
 error('VDPAU state tracker requires at least one of the following gallium 
drivers: r300, r600, radeonsi, nouveau.')
+  else
+_vdpau = 'false'
   endif
-  dep_vdpau = dependency('vdpau', version : '>= 1.1')
-  with_gallium_vdpau = true
-else
-  with_gallium_vdpau = false
+elif _vdpau == 'auto'
+  _vdpau = 'true'
 endif
+with_gallium_vdpau = _vdpau == 'true'
+dep_vdpau = []
 if with_gallium_vdpau
+  dep_vdpau = dependency('vdpau', version : '>= 1.1')
   dep_vdpau = declare_dependency(
 compile_args : run_command(prog_pkgconfig, ['vdpau', 
'--cflags']).stdout().split()
   )

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: dedup gallium-xvmc logic

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 724916c8a84b5bba8f880f17da936585d52c97b6
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=724916c8a84b5bba8f880f17da936585d52c97b6

Author: Eric Engestrom 
Date:   Thu Dec  7 16:02:29 2017 +

meson: dedup gallium-xvmc logic

Signed-off-by: Eric Engestrom 
Reviewed-by: Dylan Baker 

---

 meson.build | 38 ++
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/meson.build b/meson.build
index 5c22e80ca5..67702bded2 100644
--- a/meson.build
+++ b/meson.build
@@ -409,34 +409,32 @@ if vdpau_drivers_path == ''
   vdpau_drivers_path = join_paths(get_option('libdir'), 'vdpau')
 endif
 
-dep_xvmc = []
 _xvmc = get_option('gallium-xvmc')
-if _xvmc == 'auto'
-  if not system_has_kms_drm
-with_gallium_xvmc = false
-  elif not with_platform_x11
-with_gallium_xvmc = false
-  elif not (with_gallium_r600 or with_gallium_nouveau)
-with_gallium_xvmc = false
+if not system_has_kms_drm
+  if _xvmc == 'true'
+error('XVMC state tracker can only be build on unix-like OSes.')
   else
-dep_xvmc = dependency('xvmc', version : '>= 1.0.6', required : false)
-with_gallium_xvmc = dep_xvmc.found()
+_xvmc = 'false'
   endif
-elif _xvmc == 'true'
-  if not system_has_kms_drm
-error('XVMC state tracker can only be build on DRM/KMS OSes.')
-  elif not with_platform_x11
+elif not with_platform_x11
+  if _xvmc == 'true'
 error('XVMC state tracker requires X11 support.')
-with_gallium_xvmc = false
-  elif not (with_gallium_r600 or with_gallium_nouveau)
+  else
+_xvmc = 'false'
+  endif
+elif not (with_gallium_r600 or with_gallium_nouveau)
+  if _xvmc == 'true'
 error('XVMC state tracker requires at least one of the following gallium 
drivers: r600, nouveau.')
+  else
+_xvmc = 'false'
   endif
-  dep_xvmc = dependency('xvmc', version : '>= 1.0.6')
-  with_gallium_xvmc = true
-else
-  with_gallium_xvmc = false
+elif _xvmc == 'auto'
+  _xvmc = 'true'
 endif
+with_gallium_xvmc = _xvmc == 'true'
+dep_xvmc = []
 if with_gallium_xvmc
+  dep_xvmc = dependency('xvmc', version : '>= 1.0.6')
   dep_xvmc = declare_dependency(
 compile_args : run_command(prog_pkgconfig, ['xvmc', 
'--cflags']).stdout().split()
   )

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): egl: keep extension list sorted, per comment at the top

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 57223fb07af4e1666e54eff4755795dc5941c7b7
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=57223fb07af4e1666e54eff4755795dc5941c7b7

Author: Eric Engestrom 
Date:   Mon Jan  8 15:47:09 2018 +

egl: keep extension list sorted, per comment at the top

Signed-off-by: Eric Engestrom 
Reviewed-by: Adam Jackson 

---

 src/egl/main/egldisplay.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h
index addf430ffe..7eac96ed05 100644
--- a/src/egl/main/egldisplay.h
+++ b/src/egl/main/egldisplay.h
@@ -115,6 +115,7 @@ struct _egl_extensions
EGLBoolean KHR_config_attribs;
EGLBoolean KHR_context_flush_control;
EGLBoolean KHR_create_context;
+   EGLBoolean KHR_create_context_no_error;
EGLBoolean KHR_fence_sync;
EGLBoolean KHR_get_all_proc_addresses;
EGLBoolean KHR_gl_colorspace;
@@ -130,7 +131,6 @@ struct _egl_extensions
EGLBoolean KHR_reusable_sync;
EGLBoolean KHR_surfaceless_context;
EGLBoolean KHR_wait_sync;
-   EGLBoolean KHR_create_context_no_error;
 
EGLBoolean MESA_drm_image;
EGLBoolean MESA_image_dma_buf_export;

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): loader: let compiler figure out the length of the string

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 0663ae0aa1d5b8a1fb6e5da4a9f48ba99da72477
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=0663ae0aa1d5b8a1fb6e5da4a9f48ba99da72477

Author: Eric Engestrom 
Date:   Tue Dec 19 14:12:44 2017 +

loader: let compiler figure out the length of the string

Basically, turn comment into code

Signed-off-by: Eric Engestrom 
Reviewed-by: Emil Velikov 

---

 src/loader/loader.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/loader/loader.c b/src/loader/loader.c
index 3c67f9dc24..913b3dcac0 100644
--- a/src/loader/loader.c
+++ b/src/loader/loader.c
@@ -110,8 +110,7 @@ static char *loader_get_dri_config_device_id(void)
 
 static char *drm_construct_id_path_tag(drmDevicePtr device)
 {
-/* Length of "pci-_xx_xx_x\0" */
-#define PCI_ID_PATH_TAG_LENGTH 17
+#define PCI_ID_PATH_TAG_LENGTH sizeof("pci-_xx_xx_x")
char *tag = NULL;
 
if (device->bustype == DRM_BUS_PCI) {

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: simplify dri3 logic

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 57b0ccd178bca2ad34f9f02f07ca5a7db9cbeccc
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=57b0ccd178bca2ad34f9f02f07ca5a7db9cbeccc

Author: Eric Engestrom 
Date:   Thu Dec  7 16:04:14 2017 +

meson: simplify dri3 logic

Signed-off-by: Eric Engestrom 
Reviewed-by: Dylan Baker 

---

 meson.build | 10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/meson.build b/meson.build
index 8a814a596c..bc5996992a 100644
--- a/meson.build
+++ b/meson.build
@@ -353,15 +353,9 @@ endif
 with_dri2 = (with_dri or with_any_vk) and with_dri_platform == 'drm'
 with_dri3 = get_option('dri3')
 if with_dri3 == 'auto'
-  if system_has_kms_drm and with_dri2
-with_dri3 = true
-  else
-with_dri3 = false
- endif
-elif with_dri3 == 'true'
-  with_dri3 = true
+  with_dri3 = system_has_kms_drm and with_dri2
 else
-  with_dri3 = false
+  with_dri3 = with_dri3 == 'true'
 endif
 
 if with_any_vk and (with_platform_x11 and not with_dri3)

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): radeon: remove left over dead code

[Eric Engeström]

Module: Mesa
Branch: master
Commit: eee8dd7c3360ec0daf3d44168b6d1c32c52bf69b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=eee8dd7c3360ec0daf3d44168b6d1c32c52bf69b

Author: Eric Engestrom 
Date:   Tue Dec 19 13:41:35 2017 +

radeon: remove left over dead code

Fixes: 4e0d99a63588c67a955f "r100: Use shared debug code"
Cc: Pauli Nieminen 
Signed-off-by: Eric Engestrom 
Reviewed-by: Eric Anholt 

---

 src/mesa/drivers/dri/radeon/radeon_context.c | 6 --
 1 file changed, 6 deletions(-)

diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c 
b/src/mesa/drivers/dri/radeon/radeon_context.c
index 8ad0911586..8c5c167199 100644
--- a/src/mesa/drivers/dri/radeon/radeon_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_context.c
@@ -330,12 +330,6 @@ r100CreateContext( gl_api api,
 
rmesa->radeon.do_usleeps = (fthrottle_mode == DRI_CONF_FTHROTTLE_USLEEPS);
 
-
-#if DO_DEBUG
-   RADEON_DEBUG = parse_debug_string( getenv( "RADEON_DEBUG" ),
-  debug_control );
-#endif
-
tcl_mode = driQueryOptioni(>radeon.optionCache, "tcl_mode");
if (driQueryOptionb(>radeon.optionCache, "no_rast")) {
   fprintf(stderr, "disabling 3D acceleration\n");

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: fix some defines misspelled errors in meson.build

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 911ca587f8785a90702f88d3c9044b7149e6d2b3
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=911ca587f8785a90702f88d3c9044b7149e6d2b3

Author: Marc Dietrich 
Date:   Tue Jan 23 15:49:43 2018 +0100

meson: fix some defines misspelled errors in meson.build

Defines
- HAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL
- HAVE_FUNC_ATTRIBUTE_VISIBILITY
were misspelled.

Signed-off-by: Marc Dietrich 
Reviewed-by: Eric Engestrom 

---

 meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index f3179c3806..97619f786b 100644
--- a/meson.build
+++ b/meson.build
@@ -692,14 +692,14 @@ if cc.compiles('struct __attribute__((packed)) foo { int 
bar; };',
 endif
 if cc.compiles('int *foo(void) __attribute__((returns_nonnull));',
name : '__attribute__((returns_nonnull))')
-  pre_args += '-DHAVE_FUNC_ATTRIBUTE_NONNULL'
+  pre_args += '-DHAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL'
 endif
 if cc.compiles('''int foo_def(void) __attribute__((visibility("default")));
   int foo_hid(void) __attribute__((visibility("hidden")));
   int foo_int(void) __attribute__((visibility("internal")));
   int foo_pro(void) 
__attribute__((visibility("protected")));''',
name : '__attribute__((visibility(...)))')
-  pre_args += '-DHAVE_FUNC_ATTRIBUTE_VISBILITY'
+  pre_args += '-DHAVE_FUNC_ATTRIBUTE_VISIBILITY'
 endif
 if cc.compiles('int foo(void) { return 0; } int bar(void) 
__attribute__((alias("foo")));',
name : '__attribute__((alias(...)))')

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): docs: ask for backport nominations to cc: the author

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 10f5e0dce25edc6e7a1e02cbe9a6e685e75ca361
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=10f5e0dce25edc6e7a1e02cbe9a6e685e75ca361

Author: Eric Engestrom 
Date:   Fri Jan 12 15:10:28 2018 +

docs: ask for backport nominations to cc: the author

Signed-off-by: Eric Engestrom 
Reviewed-by: Kenneth Graunke 

---

 docs/submittingpatches.html | 4 
 1 file changed, 4 insertions(+)

diff --git a/docs/submittingpatches.html b/docs/submittingpatches.html
index 0581391b29..ba09aa4ad7 100644
--- a/docs/submittingpatches.html
+++ b/docs/submittingpatches.html
@@ -246,6 +246,10 @@ release.
 Note: resending patch identical to one on mesa-dev@ or one that differs only
 by the extra mesa-stable@ tag is not recommended.
 
+
+If you are not the author of the original patch, please Cc: them in your
+nomination request.
+
 
 
 The stable tag

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): i915: add missing 0 defines

[Eric Engeström]

Module: Mesa
Branch: master
Commit: ec0a4fcec03cacfc3e075cf9e5e6584b672e4c82
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ec0a4fcec03cacfc3e075cf9e5e6584b672e4c82

Author: Eric Engestrom 
Date:   Mon Dec  4 14:30:13 2017 +

i915: add missing 0 defines

Thanks to Emil's -Wundef, t_dd_dmatmp.h now complains that intel_render.c
is missing a couple `#define`s.

Assigning them to 0 keeps the existing behaviour; I'll let someone else
turn them on if this is the behaviour that was intended.

Signed-off-by: Eric Engestrom 
Reviewed-by: Ian Romanick 

---

 src/mesa/drivers/dri/i915/intel_render.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/mesa/drivers/dri/i915/intel_render.c 
b/src/mesa/drivers/dri/i915/intel_render.c
index c1603565cc..a395282624 100644
--- a/src/mesa/drivers/dri/i915/intel_render.c
+++ b/src/mesa/drivers/dri/i915/intel_render.c
@@ -62,6 +62,8 @@
 #define HAVE_TRI_FANS1
 #define HAVE_POLYGONS1
 
+#define HAVE_QUADS   0
+#define HAVE_QUAD_STRIPS 0
 #define HAVE_ELTS0
 
 static const uint32_t hw_prim[GL_POLYGON + 1] = {

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): docs/llvmpipe: document ppc64le as alternative architecture to x86.

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 060eb314eb4e551cf870ad6a6e7e1363d4228efe
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=060eb314eb4e551cf870ad6a6e7e1363d4228efe

Author: Ben Crocker 
Date:   Mon Nov 27 14:44:58 2017 -0500

docs/llvmpipe: document ppc64le as alternative architecture to x86.

Power8, Power8NV, and Power9 are supported on an equal footing
with X86.

Cc: "17.2" "17.3" 
Signed-off-by: Ben Crocker 
Reviewed-by: Eric Engestrom 

[Eric: changed formatting, reworded a bit (with Ben's ack)]
Signed-off-by: Eric Engestrom 

---

 docs/llvmpipe.html | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/llvmpipe.html b/docs/llvmpipe.html
index 5468736b72..28c0c2b001 100644
--- a/docs/llvmpipe.html
+++ b/docs/llvmpipe.html
@@ -20,7 +20,7 @@
 The Gallium llvmpipe driver is a software rasterizer that uses LLVM to
 do runtime code generation.
 Shaders, point/line/triangle rasterization and vertex processing are
-implemented with LLVM IR which is translated to x86 or x86-64 machine
+implemented with LLVM IR which is translated to x86, x86-64, or ppc64le machine
 code.
 Also, the driver is multithreaded to take advantage of multiple CPU cores
 (up to 8 at this time).
@@ -32,18 +32,24 @@ It's the fastest software rasterizer for Mesa.
 
 
 
-   For x86 or amd64 processors, 64-bit mode is recommended.

+   For x86 or amd64 processors, 64-bit mode is recommended.
Support for SSE2 is strongly encouraged.  Support for SSE3 and SSE4.1 will
yield the most efficient code.  The fewer features the CPU has the more
likely it is that you will run into underperforming, buggy, or incomplete 
code.


+   For ppc64le processors, use of the Altivec feature (the Vector
+   Facility) is recommended if supported; use of the VSX feature (the
+   Vector-Scalar Facility) is recommended if supported AND Mesa is
+   built with LLVM version 4.0 or later.
+   
+   
See /proc/cpuinfo to know what your CPU supports.

 
 
-   LLVM: version 3.4 recommended; 3.3 or later required.
+   Unless otherwise stated, LLVM version 3.4 is recommended; 3.3 or later 
is required.

For Linux, on a recent Debian based distribution do:


___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: add dep_thread to every lib that includes threads.h

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 4cba39331d206f3d6ab2d3c8869ecc289116a862
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=4cba39331d206f3d6ab2d3c8869ecc289116a862

Author: Eric Engestrom 
Date:   Thu Dec  7 14:47:46 2017 +

meson: add dep_thread to every lib that includes threads.h

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104141
Signed-off-by: Eric Engestrom 
Reviewed-by: Dylan Baker 

---

 src/broadcom/meson.build| 2 +-
 src/gallium/auxiliary/meson.build   | 2 +-
 src/gallium/state_trackers/nine/meson.build | 1 +
 src/gallium/targets/xa/meson.build  | 2 +-
 src/gallium/targets/xvmc/meson.build| 2 +-
 src/gbm/meson.build | 2 +-
 src/intel/common/meson.build| 2 +-
 src/loader/meson.build  | 2 +-
 src/util/meson.build| 2 +-
 9 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/broadcom/meson.build b/src/broadcom/meson.build
index dbeee09113..6072fd1b99 100644
--- a/src/broadcom/meson.build
+++ b/src/broadcom/meson.build
@@ -39,6 +39,6 @@ if with_gallium_vc5
 c_args : [c_vis_args, no_override_init_args],
 link_whole : [libbroadcom_compiler, libbroadcom_qpu],
 build_by_default : false,
-dependencies: dep_valgrind,
+dependencies: [dep_valgrind, dep_thread],
   )
 endif
diff --git a/src/gallium/auxiliary/meson.build 
b/src/gallium/auxiliary/meson.build
index 3e623fd099..4d59f07fd3 100644
--- a/src/gallium/auxiliary/meson.build
+++ b/src/gallium/auxiliary/meson.build
@@ -495,7 +495,7 @@ libgallium = static_library(
   ],
   c_args : [c_vis_args, c_msvc_compat_args],
   cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
-  dependencies : [dep_libdrm, dep_llvm, dep_unwind, dep_dl, dep_m],
+  dependencies : [dep_libdrm, dep_llvm, dep_unwind, dep_dl, dep_m, dep_thread],
   build_by_default : false,
 )
 
diff --git a/src/gallium/state_trackers/nine/meson.build 
b/src/gallium/state_trackers/nine/meson.build
index 797ef389a6..491b7937ab 100644
--- a/src/gallium/state_trackers/nine/meson.build
+++ b/src/gallium/state_trackers/nine/meson.build
@@ -66,4 +66,5 @@ libnine_st = static_library(
   include_directories : [
 inc_d3d9, inc_gallium, inc_include, inc_src, inc_gallium_aux,
   ],
+  dependencies : dep_thread,
 )
diff --git a/src/gallium/targets/xa/meson.build 
b/src/gallium/targets/xa/meson.build
index f16921dfc9..f25999d160 100644
--- a/src/gallium/targets/xa/meson.build
+++ b/src/gallium/targets/xa/meson.build
@@ -45,7 +45,7 @@ libxatracker = shared_library(
   ],
   link_depends : xa_link_depends,
   dependencies : [
-dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_libdrm,
+dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_libdrm, dep_thread,
 driver_nouveau, driver_i915, driver_svga, driver_freedreno,
   ],
   install : true,
diff --git a/src/gallium/targets/xvmc/meson.build 
b/src/gallium/targets/xvmc/meson.build
index 76de816efe..48759de910 100644
--- a/src/gallium/targets/xvmc/meson.build
+++ b/src/gallium/targets/xvmc/meson.build
@@ -45,7 +45,7 @@ libxvmc_gallium = shared_library(
 libpipe_loader_static, libws_null, libwsw,
   ],
   dependencies : [
-dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_libdrm,
+dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_libdrm, dep_thread,
 driver_r600, driver_nouveau,
   ],
   link_depends : xvmc_link_depends,
diff --git a/src/gbm/meson.build b/src/gbm/meson.build
index 4b550e06f2..6e512996ad 100644
--- a/src/gbm/meson.build
+++ b/src/gbm/meson.build
@@ -54,7 +54,7 @@ libgbm = shared_library(
   c_args : [c_vis_args, args_gbm],
   link_args : [ld_args_gc_sections],
   link_with : [libloader, libmesa_util, libxmlconfig],
-  dependencies : [deps_gbm, dep_dl],
+  dependencies : [deps_gbm, dep_dl, dep_thread],
   version : '1.0.0',
   install : true,
 )
diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build
index cbcf664753..19472e306f 100644
--- a/src/intel/common/meson.build
+++ b/src/intel/common/meson.build
@@ -40,5 +40,5 @@ libintel_common = static_library(
   files_libintel_common,
   include_directories : [inc_common, inc_intel],
   c_args : [c_vis_args, no_override_init_args],
-  dependencies : [dep_expat, dep_libdrm],
+  dependencies : [dep_expat, dep_libdrm, dep_thread],
 )
diff --git a/src/loader/meson.build b/src/loader/meson.build
index 05268f58f3..e4455e9a72 100644
--- a/src/loader/meson.build
+++ b/src/loader/meson.build
@@ -41,6 +41,6 @@ libloader = static_library(
xmlpool_options_h],
   c_args : [c_vis_args, '-DUSE_DRICONF'],
   include_directories : [inc_include, inc_src, inc_util],
-  dependencies : dep_libdrm,
+  dependencies : [dep_libdrm, dep_thread],
   build_by_default : false,
 )
diff --git a/src/util/meson.build b/src/util/meson.build
index b54c20796f..225593f5d3 100644
--- a/src/util/meson.build
+++ 

Mesa (master): meson: fix pl111 dependency on vc4

[Eric Engeström]

Module: Mesa
Branch: master
Commit: f0337f0f701fc904d7c32556b8621438b2a45b3f
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f0337f0f701fc904d7c32556b8621438b2a45b3f

Author: Eric Engestrom 
Date:   Mon Dec  4 15:06:03 2017 +

meson: fix pl111 dependency on vc4

src/gallium/winsys/pl111/drm/libpl111winsys.a(pl111_drm_winsys.c.o): In 
function `pl111_drm_screen_create':
pl111_drm_winsys.c:(.text+0x33): undefined reference to 
`vc4_drm_screen_create_renderonly'

Signed-off-by: Eric Engestrom 
Reviewed-by: Dylan Baker 

---

 meson.build  |  3 +++
 src/gallium/meson.build  | 10 +-
 src/gallium/winsys/pl111/drm/meson.build |  1 +
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/meson.build b/meson.build
index 3e8ea7d17e..1ea63fb129 100644
--- a/meson.build
+++ b/meson.build
@@ -190,6 +190,9 @@ endif
 if with_gallium_imx and not with_gallium_etnaviv
   error('IMX driver requires etnaviv driver')
 endif
+if with_gallium_pl111 and not with_gallium_vc4
+  error('pl111 driver requires vc4 driver')
+endif
 
 dep_libdrm_intel = []
 if with_dri_i915 or with_gallium_i915
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index 7e841633a9..2baca8a97c 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -72,17 +72,17 @@ if with_gallium_freedreno
 else
   driver_freedreno = declare_dependency()
 endif
-if with_gallium_pl111
-  subdir('winsys/pl111/drm')
-else
-  driver_pl111 = declare_dependency()
-endif
 if with_gallium_vc4
   subdir('winsys/vc4/drm')
   subdir('drivers/vc4')
 else
   driver_vc4 = declare_dependency()
 endif
+if with_gallium_pl111
+  subdir('winsys/pl111/drm')
+else
+  driver_pl111 = declare_dependency()
+endif
 if with_gallium_vc5
   subdir('winsys/vc5/drm')
   subdir('drivers/vc5')
diff --git a/src/gallium/winsys/pl111/drm/meson.build 
b/src/gallium/winsys/pl111/drm/meson.build
index 8ba03e3f97..9cb6faf31e 100644
--- a/src/gallium/winsys/pl111/drm/meson.build
+++ b/src/gallium/winsys/pl111/drm/meson.build
@@ -27,6 +27,7 @@ libpl111winsys = static_library(
   ],
   c_args : [c_vis_args],
   dependencies: dep_libdrm,
+  link_with : libvc4winsys,
 )
 
 driver_pl111 = declare_dependency(

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): util/disk_cache: Remove unneeded free() on always null string

[Eric Engeström]

Module: Mesa
Branch: master
Commit: b2490a326c28652b85400da0e1bbff108167d140
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=b2490a326c28652b85400da0e1bbff108167d140

Author: Vadym Shovkoplias 
Date:   Mon Dec  4 11:47:33 2017 +0200

util/disk_cache: Remove unneeded free() on always null string

At this point dc_job->cache_item_metadata.keys always equals
NULL, so call to free() is useless

Fixes: b86ecea3446 ("util/disk_cache: write cache item metadata to disk")
Signed-off-by: Vadym Shovkoplias 
Reviewed-by: Eric Engestrom 

---

 src/util/disk_cache.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
index e95406565e..7ebfa8c045 100644
--- a/src/util/disk_cache.c
+++ b/src/util/disk_cache.c
@@ -811,7 +811,6 @@ create_put_job(struct disk_cache *cache, const cache_key 
key,
return dc_job;
 
 fail:
-   free(dc_job->cache_item_metadata.keys);
free(dc_job);
 
return NULL;

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: fix keyword argument in declare_dependency()

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 31d403160f3e9d3ebf45e755366c7c068790319a
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=31d403160f3e9d3ebf45e755366c7c068790319a

Author: Eric Engestrom 
Date:   Wed Dec  6 13:27:52 2017 +

meson: fix keyword argument in declare_dependency()

`declare_dependency()` takes `compile_args`, not `c_args`.
It was correct in all the other `declare_dependency()` from that commit.

Fixes: 0bbecc5a8548883f76a71 "meson: define driver dependencies"
Signed-off-by: Eric Engestrom 
Reviewed-by: Dylan Baker 

---

 src/gallium/winsys/imx/drm/meson.build   | 2 +-
 src/gallium/winsys/pl111/drm/meson.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/winsys/imx/drm/meson.build 
b/src/gallium/winsys/imx/drm/meson.build
index a4af468869..4efd7bb066 100644
--- a/src/gallium/winsys/imx/drm/meson.build
+++ b/src/gallium/winsys/imx/drm/meson.build
@@ -28,6 +28,6 @@ libimxdrm = static_library(
 )
 
 driver_imx = declare_dependency(
-  c_args : '-DGALLIUM_IMX',
+  compile_args : '-DGALLIUM_IMX',
   link_with : libimxdrm,
 )
diff --git a/src/gallium/winsys/pl111/drm/meson.build 
b/src/gallium/winsys/pl111/drm/meson.build
index 2c981e8c34..8ba03e3f97 100644
--- a/src/gallium/winsys/pl111/drm/meson.build
+++ b/src/gallium/winsys/pl111/drm/meson.build
@@ -30,6 +30,6 @@ libpl111winsys = static_library(
 )
 
 driver_pl111 = declare_dependency(
-  c_args : '-DGALLIUM_PL111',
+  compile_args : '-DGALLIUM_PL111',
   link_with : libpl111winsys,
 )

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): egl/x11: Remove unneeded free() on always null string

[Eric Engeström]

Module: Mesa
Branch: master
Commit: a1b4f1877f2ef7f0e1e10fdcef854391547f1018
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=a1b4f1877f2ef7f0e1e10fdcef854391547f1018

Author: Vadym Shovkoplias 
Date:   Fri Dec  1 17:08:53 2017 +0200

egl/x11: Remove unneeded free() on always null string

In this condition dri2_dpy->driver_name string always equals
NULL, so call to free() is useless

Signed-off-by: Vadym Shovkoplias 
Reviewed-by: Eric Engestrom 

---

 src/egl/drivers/dri2/platform_x11.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/egl/drivers/dri2/platform_x11.c 
b/src/egl/drivers/dri2/platform_x11.c
index c49cb1fd8e..8ede590bfa 100644
--- a/src/egl/drivers/dri2/platform_x11.c
+++ b/src/egl/drivers/dri2/platform_x11.c
@@ -704,7 +704,6 @@ dri2_x11_connect(struct dri2_egl_display *dri2_dpy)
 
if (dri2_dpy->driver_name == NULL) {
   close(dri2_dpy->fd);
-  free(dri2_dpy->driver_name);
   free(connect);
   return EGL_FALSE;
}

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): glx/dri3: Remove unused deviceName variable

[Eric Engeström]

Module: Mesa
Branch: master
Commit: d5559292394f0e9b1c682baca05f81366fb389af
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d5559292394f0e9b1c682baca05f81366fb389af

Author: Vadym Shovkoplias 
Date:   Fri Dec  1 13:23:02 2017 +0200

glx/dri3: Remove unused deviceName variable

deviceName string is declared, assigned and freed but actually
never used in dri3_create_screen() function.

Fixes: 2d94601582e ("Add DRI3+Present loader")
Signed-off-by: Vadym Shovkoplias 
Reviewed-by: Eric Engestrom 

---

 src/glx/dri3_glx.c | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
index a10306fe32..f280a8cef7 100644
--- a/src/glx/dri3_glx.c
+++ b/src/glx/dri3_glx.c
@@ -800,7 +800,7 @@ dri3_create_screen(int screen, struct glx_display * priv)
struct dri3_screen *psc;
__GLXDRIscreen *psp;
struct glx_config *configs = NULL, *visuals = NULL;
-   char *driverName, *deviceName, *tmp;
+   char *driverName, *tmp;
int i;
unsigned char disable;
 
@@ -830,7 +830,6 @@ dri3_create_screen(int screen, struct glx_display * priv)
}
 
psc->fd = loader_get_user_preferred_fd(psc->fd, >is_different_gpu);
-   deviceName = NULL;
 
driverName = loader_get_driver_for_fd(psc->fd);
if (!driverName) {
@@ -956,7 +955,6 @@ dri3_create_screen(int screen, struct glx_display * priv)
   __glXEnableDirectExtension(>base, "GLX_EXT_buffer_age");
 
free(driverName);
-   free(deviceName);
 
tmp = getenv("LIBGL_SHOW_FPS");
psc->show_fps_interval = tmp ? atoi(tmp) : 0;
@@ -983,7 +981,6 @@ handle_error:
   dlclose(psc->driver);
 
free(driverName);
-   free(deviceName);
glx_screen_cleanup(>base);
free(psc);
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): amd: remove always-true BRAHMA_BUILD define

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 13a7a2d4557a068fbf86af9eaa43b600fa8bce88
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=13a7a2d4557a068fbf86af9eaa43b600fa8bce88

Author: Eric Engestrom 
Date:   Fri Nov 24 16:23:03 2017 +

amd: remove always-true BRAHMA_BUILD define

Signed-off-by: Eric Engestrom 
Reviewed-by: Marek Olšák 

---

 src/amd/Android.addrlib.mk   |  2 --
 src/amd/Makefile.addrlib.am  |  3 +--
 src/amd/addrlib/core/addrcommon.h| 15 ++-
 src/amd/addrlib/meson.build  |  2 +-
 src/gallium/winsys/amdgpu/drm/Android.mk |  4 +---
 5 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/amd/Android.addrlib.mk b/src/amd/Android.addrlib.mk
index a29f7c16d1..a37112d715 100644
--- a/src/amd/Android.addrlib.mk
+++ b/src/amd/Android.addrlib.mk
@@ -30,8 +30,6 @@ LOCAL_MODULE := libmesa_amdgpu_addrlib
 
 LOCAL_SRC_FILES := $(ADDRLIB_FILES)
 
-LOCAL_CFLAGS := -DBRAHMA_BUILD=1
-
 LOCAL_C_INCLUDES := \
$(MESA_TOP)/src \
$(MESA_TOP)/src/amd/common \
diff --git a/src/amd/Makefile.addrlib.am b/src/amd/Makefile.addrlib.am
index 90dfe96344..322a5c8697 100644
--- a/src/amd/Makefile.addrlib.am
+++ b/src/amd/Makefile.addrlib.am
@@ -29,8 +29,7 @@ addrlib_libamdgpu_addrlib_la_CPPFLAGS = \
-I$(srcdir)/addrlib/inc/chip/gfx9 \
-I$(srcdir)/addrlib/inc/chip/r800 \
-I$(srcdir)/addrlib/gfx9/chip \
-   -I$(srcdir)/addrlib/r800/chip \
-   -DBRAHMA_BUILD=1
+   -I$(srcdir)/addrlib/r800/chip
 
 addrlib_libamdgpu_addrlib_la_CXXFLAGS = \
$(VISIBILITY_CXXFLAGS) $(CXX11_CXXFLAGS)
diff --git a/src/amd/addrlib/core/addrcommon.h 
b/src/amd/addrlib/core/addrcommon.h
index 62f8ac6161..99bb62e77f 100644
--- a/src/amd/addrlib/core/addrcommon.h
+++ b/src/amd/addrlib/core/addrcommon.h
@@ -40,7 +40,7 @@
 #include 
 #include 
 
-#if BRAHMA_BUILD && !defined(DEBUG)
+#if !defined(DEBUG)
 #ifdef NDEBUG
 #define DEBUG 0
 #else
@@ -73,18 +73,7 @@
 #define ADDR_ANALYSIS_ASSUME(expr) do { (void)(expr); } while (0)
 #endif
 
-#if BRAHMA_BUILD
-#define ADDR_ASSERT(__e) assert(__e)
-#elif DEBUG
-#define ADDR_ASSERT(__e)\
-do {\
-ADDR_ANALYSIS_ASSUME(__e);  \
-if ( !((__e) ? TRUE : FALSE)) { ADDR_DBG_BREAK(); } \
-} while (0)
-#else //DEBUG
-#define ADDR_ASSERT(__e) ADDR_ANALYSIS_ASSUME(__e)
-#endif //DEBUG
-
+#define ADDR_ASSERT(__e) assert(__e)
 #define ADDR_ASSERT_ALWAYS() ADDR_DBG_BREAK()
 #define ADDR_UNHANDLED_CASE() ADDR_ASSERT(!"Unhandled case")
 #define ADDR_NOT_IMPLEMENTED() ADDR_ASSERT(!"Not implemented");
diff --git a/src/amd/addrlib/meson.build b/src/amd/addrlib/meson.build
index 1a7f2fdef5..ed0dde6245 100644
--- a/src/amd/addrlib/meson.build
+++ b/src/amd/addrlib/meson.build
@@ -56,5 +56,5 @@ libamdgpu_addrlib = static_library(
   include_directories : include_directories(
 'core', 'inc/chip/gfx9', 'inc/chip/r800', 'gfx9/chip', 'r800/chip',
 '../common', '../../'),
-  cpp_args : [cpp_vis_args, '-DBRAHMA_BUILD=1'],
+  cpp_args : cpp_vis_args,
 )
diff --git a/src/gallium/winsys/amdgpu/drm/Android.mk 
b/src/gallium/winsys/amdgpu/drm/Android.mk
index a05304ae5d..6e84a0c8de 100644
--- a/src/gallium/winsys/amdgpu/drm/Android.mk
+++ b/src/gallium/winsys/amdgpu/drm/Android.mk
@@ -30,9 +30,7 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(C_SOURCES)
 
-LOCAL_CFLAGS := \
-   $(AMDGPU_CFLAGS) \
-   -DBRAHMA_BUILD=1
+LOCAL_CFLAGS := $(AMDGPU_CFLAGS)
 
 LOCAL_STATIC_LIBRARIES := libmesa_amdgpu_addrlib
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): gallium/hud: use #ifdef to test for macro existence

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 29ee934331ce624ce4c30750ce0e8d4baa5eb2fa
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=29ee934331ce624ce4c30750ce0e8d4baa5eb2fa

Author: Eric Engestrom 
Date:   Wed Nov 29 14:19:26 2017 +

gallium/hud: use #ifdef to test for macro existence

Signed-off-by: Eric Engestrom 
Reviewed-by: Nicolai Hähnle 

---

 src/gallium/auxiliary/hud/hud_context.c  | 10 +-
 src/gallium/auxiliary/hud/hud_cpufreq.c  |  2 +-
 src/gallium/auxiliary/hud/hud_diskstat.c |  2 +-
 src/gallium/auxiliary/hud/hud_nic.c  |  2 +-
 src/gallium/auxiliary/hud/hud_private.h  |  4 ++--
 src/gallium/auxiliary/hud/hud_sensors_temp.c |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/gallium/auxiliary/hud/hud_context.c 
b/src/gallium/auxiliary/hud/hud_context.c
index bd7c8cbb38..64e5579b4e 100644
--- a/src/gallium/auxiliary/hud/hud_context.c
+++ b/src/gallium/auxiliary/hud/hud_context.c
@@ -1201,7 +1201,7 @@ hud_parse_env_var(struct hud_context *hud, struct 
pipe_screen *screen,
   }
 
   /* Add a graph. */
-#if HAVE_GALLIUM_EXTRA_HUD || HAVE_LIBSENSORS
+#if defined(HAVE_GALLIUM_EXTRA_HUD) || defined(HAVE_LIBSENSORS)
   char arg_name[64];
 #endif
   /* IF YOU CHANGE THIS, UPDATE print_help! */
@@ -1229,7 +1229,7 @@ hud_parse_env_var(struct hud_context *hud, struct 
pipe_screen *screen,
   else if (strcmp(name, "main-thread-busy") == 0) {
  hud_thread_busy_install(pane, name, true);
   }
-#if HAVE_GALLIUM_EXTRA_HUD
+#ifdef HAVE_GALLIUM_EXTRA_HUD
   else if (sscanf(name, "nic-rx-%s", arg_name) == 1) {
  hud_nic_graph_install(pane, arg_name, NIC_DIRECTION_RX);
   }
@@ -1261,7 +1261,7 @@ hud_parse_env_var(struct hud_context *hud, struct 
pipe_screen *screen,
  pane->type = PIPE_DRIVER_QUERY_TYPE_HZ;
   }
 #endif
-#if HAVE_LIBSENSORS
+#ifdef HAVE_LIBSENSORS
   else if (sscanf(name, "sensors_temp_cu-%s", arg_name) == 1) {
  hud_sensors_temp_graph_install(pane, arg_name,
 SENSORS_TEMP_CURRENT);
@@ -1536,12 +1536,12 @@ print_help(struct pipe_screen *screen)
   puts("cs-invocations");
}
 
-#if HAVE_GALLIUM_EXTRA_HUD
+#ifdef HAVE_GALLIUM_EXTRA_HUD
hud_get_num_disks(1);
hud_get_num_nics(1);
hud_get_num_cpufreq(1);
 #endif
-#if HAVE_LIBSENSORS
+#ifdef HAVE_LIBSENSORS
hud_get_num_sensors(1);
 #endif
 
diff --git a/src/gallium/auxiliary/hud/hud_cpufreq.c 
b/src/gallium/auxiliary/hud/hud_cpufreq.c
index 2b881a850e..f5b7c0f2eb 100644
--- a/src/gallium/auxiliary/hud/hud_cpufreq.c
+++ b/src/gallium/auxiliary/hud/hud_cpufreq.c
@@ -26,7 +26,7 @@
  *
  **/
 
-#if HAVE_GALLIUM_EXTRA_HUD
+#ifdef HAVE_GALLIUM_EXTRA_HUD
 
 /* Purpose:
  * Reading /sys/devices/system/cpu/cpu?/cpufreq/scaling_???_freq
diff --git a/src/gallium/auxiliary/hud/hud_diskstat.c 
b/src/gallium/auxiliary/hud/hud_diskstat.c
index 53b32baef2..44174d655d 100644
--- a/src/gallium/auxiliary/hud/hud_diskstat.c
+++ b/src/gallium/auxiliary/hud/hud_diskstat.c
@@ -26,7 +26,7 @@
  *
  **/
 
-#if HAVE_GALLIUM_EXTRA_HUD
+#ifdef HAVE_GALLIUM_EXTRA_HUD
 
 /* Purpose: Reading /sys/block/<*>/stat MB/s read/write throughput per second,
  * displaying on the HUD.
diff --git a/src/gallium/auxiliary/hud/hud_nic.c 
b/src/gallium/auxiliary/hud/hud_nic.c
index bb29a90dbc..1de5705edf 100644
--- a/src/gallium/auxiliary/hud/hud_nic.c
+++ b/src/gallium/auxiliary/hud/hud_nic.c
@@ -26,7 +26,7 @@
  *
  **/
 
-#if HAVE_GALLIUM_EXTRA_HUD
+#ifdef HAVE_GALLIUM_EXTRA_HUD
 
 /* Purpose: Reading network interface RX/TX throughput per second,
  * displaying on the HUD.
diff --git a/src/gallium/auxiliary/hud/hud_private.h 
b/src/gallium/auxiliary/hud/hud_private.h
index 7f0294badd..9e8d74c2f8 100644
--- a/src/gallium/auxiliary/hud/hud_private.h
+++ b/src/gallium/auxiliary/hud/hud_private.h
@@ -178,7 +178,7 @@ void hud_batch_query_update(struct hud_batch_query_context 
*bq,
 void hud_batch_query_cleanup(struct hud_batch_query_context **pbq,
  struct pipe_context *pipe);
 
-#if HAVE_GALLIUM_EXTRA_HUD
+#ifdef HAVE_GALLIUM_EXTRA_HUD
 int hud_get_num_nics(bool displayhelp);
 #define NIC_DIRECTION_RX 1
 #define NIC_DIRECTION_TX 2
@@ -199,7 +199,7 @@ int hud_get_num_cpufreq(bool displayhelp);
 void hud_cpufreq_graph_install(struct hud_pane *pane, int cpu_index, unsigned 
int mode);
 #endif
 
-#if HAVE_LIBSENSORS
+#ifdef HAVE_LIBSENSORS
 int hud_get_num_sensors(bool displayhelp);
 #define SENSORS_TEMP_CURRENT 1
 #define SENSORS_TEMP_CRITICAL2
diff --git a/src/gallium/auxiliary/hud/hud_sensors_temp.c 
b/src/gallium/auxiliary/hud/hud_sensors_temp.c
index 

Mesa (master): broadcom: use NDEBUG to guard asserts

[Eric Engeström]

Module: Mesa
Branch: master
Commit: bb46111c01479d831932eb63f69da5ccda29f6fc
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=bb46111c01479d831932eb63f69da5ccda29f6fc

Author: Eric Engestrom 
Date:   Fri Nov 24 17:59:23 2017 +

broadcom: use NDEBUG to guard asserts

Signed-off-by: Eric Engestrom 
Reviewed-by: Eric Anholt 

---

 src/broadcom/cle/v3d_packet_helpers.h | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/broadcom/cle/v3d_packet_helpers.h 
b/src/broadcom/cle/v3d_packet_helpers.h
index c86cad8526..bc1bf3eb76 100644
--- a/src/broadcom/cle/v3d_packet_helpers.h
+++ b/src/broadcom/cle/v3d_packet_helpers.h
@@ -64,7 +64,7 @@ __gen_uint(uint64_t v, uint32_t start, uint32_t end)
 {
__gen_validate_value(v);
 
-#if DEBUG
+#ifndef NDEBUG
const int width = end - start + 1;
if (width < 64) {
   const uint64_t max = (1ull << width) - 1;
@@ -82,7 +82,7 @@ __gen_sint(int64_t v, uint32_t start, uint32_t end)
 
__gen_validate_value(v);
 
-#if DEBUG
+#ifndef NDEBUG
if (width < 64) {
   const int64_t max = (1ll << (width - 1)) - 1;
   const int64_t min = -(1ll << (width - 1));
@@ -99,7 +99,7 @@ static inline uint64_t
 __gen_offset(uint64_t v, uint32_t start, uint32_t end)
 {
__gen_validate_value(v);
-#if DEBUG
+#ifndef NDEBUG
uint64_t mask = (~0ull >> (64 - (end - start + 1))) << start;
 
assert((v & ~mask) == 0);
@@ -122,7 +122,7 @@ __gen_sfixed(float v, uint32_t start, uint32_t end, 
uint32_t fract_bits)
 
const float factor = (1 << fract_bits);
 
-#if DEBUG
+#ifndef NDEBUG
const float max = ((1 << (end - start)) - 1) / factor;
const float min = -(1 << (end - start)) / factor;
assert(min <= v && v <= max);
@@ -141,7 +141,7 @@ __gen_ufixed(float v, uint32_t start, uint32_t end, 
uint32_t fract_bits)
 
const float factor = (1 << fract_bits);
 
-#if DEBUG
+#ifndef NDEBUG
const float max = ((1 << (end - start + 1)) - 1) / factor;
const float min = 0.0f;
assert(min <= v && v <= max);

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): compiler: use NDEBUG to guard asserts

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 7b85b9b8773b119360a31b66b321ae560a77cb6d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=7b85b9b8773b119360a31b66b321ae560a77cb6d

Author: Eric Engestrom 
Date:   Thu Nov 23 13:16:43 2017 +

compiler: use NDEBUG to guard asserts

nir_validate.c's #endif already had the correct NDEBUG comment

Fixes: dcb1acdea00a8f2c29777 "nir/validate: Only build in debug mode"
Fixes: 9ff71b649b4b3808a9e17 "i965/nir: Validate that NIR passes call 
nir_metadata_preserve()"
Signed-off-by: Eric Engestrom 
Reviewed-by: Matt Turner 

---

 src/compiler/nir/nir.h  | 8 
 src/compiler/nir/nir_metadata.c | 2 +-
 src/compiler/nir/nir_validate.c | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index cf200fdc66..c01fa6707a 100644
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -41,9 +41,9 @@
 #include "compiler/shader_info.h"
 #include 
 
-#ifdef DEBUG
+#ifndef NDEBUG
 #include "util/debug.h"
-#endif /* DEBUG */
+#endif /* NDEBUG */
 
 #include "nir_opcodes.h"
 
@@ -2336,7 +2336,7 @@ nir_deref_var *nir_deref_var_clone(const nir_deref_var 
*deref, void *mem_ctx);
 
 nir_shader *nir_shader_serialize_deserialize(void *mem_ctx, nir_shader *s);
 
-#ifdef DEBUG
+#ifndef NDEBUG
 void nir_validate_shader(nir_shader *shader);
 void nir_metadata_set_validation_flag(nir_shader *shader);
 void nir_metadata_check_validation_flag(nir_shader *shader);
@@ -2377,7 +2377,7 @@ static inline void 
nir_metadata_check_validation_flag(nir_shader *shader) { (voi
 static inline bool should_clone_nir(void) { return false; }
 static inline bool should_serialize_deserialize_nir(void) { return false; }
 static inline bool should_print_nir(void) { return false; }
-#endif /* DEBUG */
+#endif /* NDEBUG */
 
 #define _PASS(nir, do_pass) do { \
do_pass   \
diff --git a/src/compiler/nir/nir_metadata.c b/src/compiler/nir/nir_metadata.c
index f71cf432b7..e681ba34f7 100644
--- a/src/compiler/nir/nir_metadata.c
+++ b/src/compiler/nir/nir_metadata.c
@@ -59,7 +59,7 @@ nir_metadata_preserve(nir_function_impl *impl, nir_metadata 
preserved)
impl->valid_metadata &= preserved;
 }
 
-#ifdef DEBUG
+#ifndef NDEBUG
 /**
  * Make sure passes properly invalidate metadata (part 1).
  *
diff --git a/src/compiler/nir/nir_validate.c b/src/compiler/nir/nir_validate.c
index 9bf8c70290..a49948fbb4 100644
--- a/src/compiler/nir/nir_validate.c
+++ b/src/compiler/nir/nir_validate.c
@@ -35,7 +35,7 @@
 /* Since this file is just a pile of asserts, don't bother compiling it if
  * we're not building a debug build.
  */
-#ifdef DEBUG
+#ifndef NDEBUG
 
 /*
  * Per-register validation state.

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): vc4: check preprocessor token existence using #ifdef instead of #if

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 7bb89e1c8f314a9d8e591a7531722a15f0ac72d0
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=7bb89e1c8f314a9d8e591a7531722a15f0ac72d0

Author: Eric Engestrom 
Date:   Fri Nov 24 16:58:43 2017 +

vc4: check preprocessor token existence using #ifdef instead of #if

(other uses of USE_VC4_SIMULATOR are already correct)

Signed-off-by: Eric Engestrom 
Reviewed-by: Eric Anholt 

---

 src/gallium/drivers/vc4/vc4_screen.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/vc4/vc4_screen.c 
b/src/gallium/drivers/vc4/vc4_screen.c
index a42ba675c1..74dd9d5767 100644
--- a/src/gallium/drivers/vc4/vc4_screen.c
+++ b/src/gallium/drivers/vc4/vc4_screen.c
@@ -64,7 +64,7 @@ static const struct debug_named_value debug_options[] = {
   "Flush after each draw call" },
 { "always_sync", VC4_DEBUG_ALWAYS_SYNC,
   "Wait for finish after each flush" },
-#if USE_VC4_SIMULATOR
+#ifdef USE_VC4_SIMULATOR
 { "dump", VC4_DEBUG_DUMP,
   "Write a GPU command stream trace file" },
 #endif
@@ -105,7 +105,7 @@ vc4_screen_destroy(struct pipe_screen *pscreen)
 slab_destroy_parent(>transfer_pool);
 free(screen->ro);
 
-#if USE_VC4_SIMULATOR
+#ifdef USE_VC4_SIMULATOR
 vc4_simulator_destroy(screen);
 #endif
 
@@ -710,7 +710,7 @@ vc4_screen_create(int fd, struct renderonly *ro)
 if (vc4_debug & VC4_DEBUG_SHADERDB)
 vc4_debug |= VC4_DEBUG_NORAST;
 
-#if USE_VC4_SIMULATOR
+#ifdef USE_VC4_SIMULATOR
 vc4_simulator_init(screen);
 #endif
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): util: add mesa-sha1 test to meson

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 44fbbd6fd07e5784b05e08e762e54b6c71f95ab1
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=44fbbd6fd07e5784b05e08e762e54b6c71f95ab1

Author: Eric Engestrom 
Date:   Mon Nov 27 11:33:48 2017 +

util: add mesa-sha1 test to meson

Fixes: 513d7ffa23d42e96f831 "util: Add a SHA1 unit test program"
Signed-off-by: Eric Engestrom 
Reviewed-by: Matt Turner 

---

 src/util/meson.build | 9 +
 1 file changed, 9 insertions(+)

diff --git a/src/util/meson.build b/src/util/meson.build
index ac86c9e111..b54c20796f 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -134,8 +134,17 @@ if with_tests
 dependencies : [dep_m],
   )
 
+  mesa_sha1_test = executable(
+'mesa-sha1_test',
+files('mesa-sha1_test.c'),
+include_directories : inc_common,
+link_with : libmesa_util,
+c_args : [c_msvc_compat_args],
+  )
+
   test('u_atomic', u_atomic_test)
   test('roundeven', roundeven_test)
+  test('mesa-sha1', mesa_sha1_test)
 
   subdir('tests/hash_table')
   subdir('tests/string_buffer')

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): docs/llvmpipe.html: Minor edits

[Eric Engeström]

Module: Mesa
Branch: master
Commit: b43daf7bf6cb505ece025c718ac6f074c38b2d49
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=b43daf7bf6cb505ece025c718ac6f074c38b2d49

Author: Ben Crocker 
Date:   Mon Nov 27 14:44:59 2017 -0500

docs/llvmpipe.html: Minor edits

Language and spelling fixups in three places.

Cc: "17.2" "17.3" 
Signed-off-by: Ben Crocker 
Reviewed-by: Eric Engestrom 

[Eric: move two fixes from the other patch to this one.]
Signed-off-by: Eric Engestrom 

---

 docs/llvmpipe.html | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/llvmpipe.html b/docs/llvmpipe.html
index 12dccb5eae..5468736b72 100644
--- a/docs/llvmpipe.html
+++ b/docs/llvmpipe.html
@@ -32,11 +32,11 @@ It's the fastest software rasterizer for Mesa.
 
 
 
-   An x86 or amd64 processor; 64-bit mode recommended.
+   For x86 or amd64 processors, 64-bit mode is recommended.

Support for SSE2 is strongly encouraged.  Support for SSE3 and SSE4.1 will
yield the most efficient code.  The fewer features the CPU has the more
-   likely is that you run into underperforming, buggy, or incomplete code.
+   likely it is that you will run into underperforming, buggy, or incomplete 
code.


See /proc/cpuinfo to know what your CPU supports.
@@ -51,7 +51,7 @@ It's the fastest software rasterizer for Mesa.
  aptitude install llvm-dev
 

-   If you want development snaptshot builds of LLVM for Debian and derived
+   If you want development snapshot builds of LLVM for Debian and derived
distributions like Ubuntu, you can use the APT repository at https://apt.llvm.org/; title="Debian Development packages for LLVM"
>apt.llvm.org, which are maintained by Debian's LLVM maintainer.
@@ -234,8 +234,8 @@ build/linux-???-debug/gallium/drivers/llvmpipe:
 
 
 
-Some of this tests can output results and benchmarks to a tab-separated-file
-for posterior analysis, e.g.:
+Some of these tests can output results and benchmarks to a tab-separated file
+for later analysis, e.g.:
 
 
   build/linux-x86_64-debug/gallium/drivers/llvmpipe/lp_test_blend -o blend.tsv
@@ -246,8 +246,8 @@ for posterior analysis, e.g.:
 
 
 
-  When looking to this code by the first time start in lp_state_fs.c, and 
-  then skim through the lp_bld_* functions called in there, and the comments
+  When looking at this code for the first time, start in lp_state_fs.c, and
+  then skim through the lp_bld_* functions called there, and the comments
   at the top of the lp_bld_*.c functions.
 
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): st/dri: replace hard-coded array size with ARRAY_SIZE()

[Eric Engeström]

Module: Mesa
Branch: master
Commit: bca122902a8511c32b5fb0b8ebbdf7bce002a82b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=bca122902a8511c32b5fb0b8ebbdf7bce002a82b

Author: Eric Engestrom 
Date:   Fri Nov 24 10:49:25 2017 +

st/dri: replace hard-coded array size with ARRAY_SIZE()

Signed-off-by: Eric Engestrom 
Reviewed-by: Marek Olšák 

---

 src/gallium/state_trackers/dri/dri_screen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/state_trackers/dri/dri_screen.c 
b/src/gallium/state_trackers/dri/dri_screen.c
index 91f50fe8e3..31b2c37bfd 100644
--- a/src/gallium/state_trackers/dri/dri_screen.c
+++ b/src/gallium/state_trackers/dri/dri_screen.c
@@ -219,7 +219,7 @@ dri_fill_in_modes(struct dri_screen *screen)
if (dri_loader_get_cap(screen, DRI_LOADER_CAP_RGBA_ORDERING))
   num_formats = ARRAY_SIZE(mesa_formats);
else
-  num_formats = 5;
+  num_formats = ARRAY_SIZE(mesa_formats) - 2;
 
/* Add configs. */
for (format = 0; format < num_formats; format++) {

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): REVIEWERS: add Alexander von Gluck IV as a reviewer for Haiku

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 99aea1e3ded03d7a51459efd085842ffedff590b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=99aea1e3ded03d7a51459efd085842ffedff590b

Author: Eric Engestrom 
Date:   Thu Nov  9 17:38:25 2017 +

REVIEWERS: add Alexander von Gluck IV as a reviewer for Haiku

There's been some Haiku-related activity lately, so let's document who
to cc on these patches.

Signed-off-by: Eric Engestrom 
Acked-by: Alexander von Gluck IV 

---

 REVIEWERS | 9 +
 1 file changed, 9 insertions(+)

diff --git a/REVIEWERS b/REVIEWERS
index 960c9ce7c5..638b8b71b5 100644
--- a/REVIEWERS
+++ b/REVIEWERS
@@ -74,6 +74,15 @@ EGL
 R: Eric Engestrom 
 F: src/egl/
 
+HAIKU
+R: Alexander von Gluck IV 
+F: include/HaikuGL/
+F: src/egl/drivers/haiku/
+F: src/gallium/state_trackers/hgl/
+F: src/gallium/targets/haiku-softpipe/
+F: src/gallium/winsys/sw/hgl/
+F: src/hgl/
+
 GALLIUM LOADER
 R: Emil Velikov 
 F: src/gallium/auxiliary/pipe-loader/

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): genxml: fix assert guards

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 1d3944aeebb0cc68c999e0d129edbdc29381cb4d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d3944aeebb0cc68c999e0d129edbdc29381cb4d

Author: Eric Engestrom 
Date:   Wed Nov 22 10:11:13 2017 +

genxml: fix assert guards

This removes a few hundred warnings on debug builds with asserts off.

Signed-off-by: Eric Engestrom 
Reviewed-by: Kenneth Graunke 

---

 src/intel/genxml/gen_pack_header.py | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/intel/genxml/gen_pack_header.py 
b/src/intel/genxml/gen_pack_header.py
index 1a5d193d22..e6cea8646f 100644
--- a/src/intel/genxml/gen_pack_header.py
+++ b/src/intel/genxml/gen_pack_header.py
@@ -73,7 +73,7 @@ __gen_uint(uint64_t v, uint32_t start, uint32_t end)
 {
__gen_validate_value(v);
 
-#if DEBUG
+#ifndef NDEBUG
const int width = end - start + 1;
if (width < 64) {
   const uint64_t max = (1ull << width) - 1;
@@ -91,7 +91,7 @@ __gen_sint(int64_t v, uint32_t start, uint32_t end)
 
__gen_validate_value(v);
 
-#if DEBUG
+#ifndef NDEBUG
if (width < 64) {
   const int64_t max = (1ll << (width - 1)) - 1;
   const int64_t min = -(1ll << (width - 1));
@@ -108,7 +108,7 @@ static inline uint64_t
 __gen_offset(uint64_t v, uint32_t start, uint32_t end)
 {
__gen_validate_value(v);
-#if DEBUG
+#ifndef NDEBUG
uint64_t mask = (~0ull >> (64 - (end - start + 1))) << start;
 
assert((v & ~mask) == 0);
@@ -131,7 +131,7 @@ __gen_sfixed(float v, uint32_t start, uint32_t end, 
uint32_t fract_bits)
 
const float factor = (1 << fract_bits);
 
-#if DEBUG
+#ifndef NDEBUG
const float max = ((1 << (end - start)) - 1) / factor;
const float min = -(1 << (end - start)) / factor;
assert(min <= v && v <= max);
@@ -150,7 +150,7 @@ __gen_ufixed(float v, uint32_t start, uint32_t end, 
uint32_t fract_bits)
 
const float factor = (1 << fract_bits);
 
-#if DEBUG
+#ifndef NDEBUG
const float max = ((1 << (end - start + 1)) - 1) / factor;
const float min = 0.0f;
assert(min <= v && v <= max);

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: fix strtof locale support check

[Eric Engeström]

Module: Mesa
Branch: master
Commit: ab0809e5529725bd0af6f7b6ce06415020b9d32e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ab0809e5529725bd0af6f7b6ce06415020b9d32e

Author: Eric Engestrom 
Date:   Tue Nov 21 14:24:01 2017 +

meson: fix strtof locale support check

Fixes: d1992255bb29054fa5176 "meson: Add build Intel "anv" vulkan driver"
Signed-off-by: Eric Engestrom 
Reviewed-by: Dylan Baker 

---

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 6c273ed20c..53013e47ec 100644
--- a/meson.build
+++ b/meson.build
@@ -619,7 +619,7 @@ if cc.links('''
   const char *s = "1.0";
   char *end;
   double d = strtod_l(s, end, loc);
-  float f = strtod_l(s, end, loc);
+  float f = strtof_l(s, end, loc);
   freelocale(loc);
   return 0;
 }''',

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: reorder subdirs to avoid directly including more than one level

[Eric Engeström]

Module: Mesa
Branch: master
Commit: d16af7355900703514d95411b222e6e028252d66
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d16af7355900703514d95411b222e6e028252d66

Author: Eric Engestrom 
Date:   Tue Nov 21 15:07:11 2017 +

meson: reorder subdirs to avoid directly including more than one level

Signed-off-by: Eric Engestrom 
Reviewed-by: Dylan Baker 

---

 src/mapi/glapi/meson.build | 2 ++
 src/mapi/meson.build   | 2 +-
 src/meson.build| 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mapi/glapi/meson.build b/src/mapi/glapi/meson.build
index f201264478..14ffa68ad0 100644
--- a/src/mapi/glapi/meson.build
+++ b/src/mapi/glapi/meson.build
@@ -18,6 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+subdir('gen')
+
 inc_glapi = include_directories('.')
 
 static_glapi_files = []
diff --git a/src/mapi/meson.build b/src/mapi/meson.build
index ce94ee4b27..afdde3dd8c 100644
--- a/src/mapi/meson.build
+++ b/src/mapi/meson.build
@@ -25,10 +25,10 @@ files_mapi_util = files(
   'u_execmem.h',
 )
 
+subdir('glapi')
 if with_shared_glapi
   subdir('shared-glapi')
 endif
-subdir('glapi')
 if with_gles1
   subdir('es1api')
 endif
diff --git a/src/meson.build b/src/meson.build
index 00bbaa8989..db36866df6 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -45,7 +45,6 @@ sha1_h = custom_target(
 
 subdir('gtest')
 subdir('util')
-subdir('mapi/glapi/gen')
 subdir('mapi')
 # TODO: opengl
 subdir('compiler')

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: add variable for mapi_abi.py instead of going back up the tree

[Eric Engeström]

Module: Mesa
Branch: master
Commit: f9cb2370f3404501c2b594ac116bfb6bfe878e87
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f9cb2370f3404501c2b594ac116bfb6bfe878e87

Author: Eric Engestrom 
Date:   Tue Nov 21 15:07:50 2017 +

meson: add variable for mapi_abi.py instead of going back up the tree

Signed-off-by: Eric Engestrom 
Reviewed-by: Dylan Baker 

---

 src/mapi/es1api/meson.build   | 2 +-
 src/mapi/es2api/meson.build   | 2 +-
 src/mapi/glapi/gen/meson.build| 2 +-
 src/mapi/meson.build  | 2 ++
 src/mapi/shared-glapi/meson.build | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build
index e8b9066a5f..36adde4c48 100644
--- a/src/mapi/es1api/meson.build
+++ b/src/mapi/es1api/meson.build
@@ -20,7 +20,7 @@
 
 es1_glapi_mapi_tmp_h = custom_target(
   'es1_glapi_mapi_tmp.h',
-  input : ['../mapi_abi.py', gl_and_es_api_files],
+  input : [mapi_abi_py, gl_and_es_api_files],
   output : 'glapi_mapi_tmp.h',
   command : [prog_python2, '@INPUT0@', '--printer', 'es1api', '@INPUT1@'],
   depend_files : api_xml_files,
diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build
index 7e868d77b3..be5b8ab204 100644
--- a/src/mapi/es2api/meson.build
+++ b/src/mapi/es2api/meson.build
@@ -20,7 +20,7 @@
 
 es2_glapi_mapi_tmp_h = custom_target(
   'es2_glapi_mapi_tmp.h',
-  input : ['../mapi_abi.py', gl_and_es_api_files],
+  input : [mapi_abi_py, gl_and_es_api_files],
   output : 'glapi_mapi_tmp.h',
   command : [prog_python2, '@INPUT0@', '--printer', 'es2api', '@INPUT1@'],
   depend_files : api_xml_files,
diff --git a/src/mapi/glapi/gen/meson.build b/src/mapi/glapi/gen/meson.build
index 69ef57bc14..599f094e99 100644
--- a/src/mapi/glapi/gen/meson.build
+++ b/src/mapi/glapi/gen/meson.build
@@ -146,7 +146,7 @@ glx_gen_depends = files(
 
 glapi_mapi_tmp_h = custom_target(
   'glapi_mapi_tmp.h',
-  input : ['../../mapi_abi.py', 'gl_and_es_API.xml'],
+  input : [mapi_abi_py, 'gl_and_es_API.xml'],
   output : 'glapi_mapi_tmp.h',
   command : [prog_python2, '@INPUT0@', '--printer', 'glapi', '@INPUT1@'],
   depend_files : glapi_gen_depends,
diff --git a/src/mapi/meson.build b/src/mapi/meson.build
index afdde3dd8c..798586bfb0 100644
--- a/src/mapi/meson.build
+++ b/src/mapi/meson.build
@@ -25,6 +25,8 @@ files_mapi_util = files(
   'u_execmem.h',
 )
 
+mapi_abi_py = files('mapi_abi.py')
+
 subdir('glapi')
 if with_shared_glapi
   subdir('shared-glapi')
diff --git a/src/mapi/shared-glapi/meson.build 
b/src/mapi/shared-glapi/meson.build
index 05fd53b7a2..eca2bd2943 100644
--- a/src/mapi/shared-glapi/meson.build
+++ b/src/mapi/shared-glapi/meson.build
@@ -29,7 +29,7 @@ files_mapi_glapi = files(
 
 shared_glapi_mapi_tmp_h = custom_target(
   'shared_glapi_mapi_tmp.h',
-  input : ['../mapi_abi.py', gl_and_es_api_files],
+  input : [mapi_abi_py, gl_and_es_api_files],
   output : 'glapi_mapi_tmp.h',
   command : [prog_python2, '@INPUT0@', '--printer', 'shared-glapi', 
'@INPUT1@'],
   depend_files : api_xml_files,

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): docs: Point to apt.llvm.org for development snapshot packages

[Eric Engeström]

Module: Mesa
Branch: master
Commit: d25123e23a77e216b45f8e1a83ac32805b07be82
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d25123e23a77e216b45f8e1a83ac32805b07be82

Author: Kai Wasserbäch 
Date:   Thu Nov 16 12:58:50 2017 +0100

docs: Point to apt.llvm.org for development snapshot packages

Signed-off-by: Kai Wasserbäch 
Reviewed-by: Eric Engestrom 

---

 docs/llvmpipe.html | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/docs/llvmpipe.html b/docs/llvmpipe.html
index e4676920ed..12dccb5eae 100644
--- a/docs/llvmpipe.html
+++ b/docs/llvmpipe.html
@@ -51,6 +51,12 @@ It's the fastest software rasterizer for Mesa.
  aptitude install llvm-dev
 

+   If you want development snaptshot builds of LLVM for Debian and derived
+   distributions like Ubuntu, you can use the APT repository at https://apt.llvm.org/; title="Debian Development packages for LLVM"
+   >apt.llvm.org, which are maintained by Debian's LLVM maintainer.
+   
+   
For a RPM-based distribution do:

 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): egl: fix var type

[Eric Engeström]

Module: Mesa
Branch: master
Commit: ca95d7ad4e1b900eb3d559ed5bda0b96b232961d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ca95d7ad4e1b900eb3d559ed5bda0b96b232961d

Author: Eric Engestrom 
Date:   Thu Nov 16 10:02:15 2017 +

egl: fix var type

queryImage() takes an `int*`; compiler is warning about the
signed<->unsigned pointer mismatch.

Fixes: 0db36caa192b129cb4f2 "egl/wayland: Add a fallback when fourcc
   query isn't supported"
Signed-off-by: Eric Engestrom 
Reviewed-by: Frank Binns 
Reviewed-by: Tapani Pälli 
Reviewed-by: Emil Velikov 
Reviewed-by: Derek Foreman 

---

 src/egl/drivers/dri2/platform_wayland.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/egl/drivers/dri2/platform_wayland.c 
b/src/egl/drivers/dri2/platform_wayland.c
index 2aecce35f9..02b32f9888 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -676,7 +676,7 @@ get_fourcc(struct dri2_egl_display *dri2_dpy,
__DRIimage *image, int *fourcc)
 {
EGLBoolean query;
-   uint32_t dri_format;
+   int dri_format;
 
query = dri2_dpy->image->queryImage(image, __DRI_IMAGE_ATTRIB_FOURCC,
fourcc);

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: standardize .so version to major.minor.patch

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 5be1b1a8ce6c635cf0310d2b97056a2b8f11a601
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5be1b1a8ce6c635cf0310d2b97056a2b8f11a601

Author: Eric Engestrom 
Date:   Thu Nov  2 23:24:00 2017 +

meson: standardize .so version to major.minor.patch

This `version` field defines the filename for the .so.
The plan .so as well as .so.$major are always symlinks to this.

Unless I'm mistaken, only the major is ever used, so this shouldn't
matter, but for consistency with autotools (and in case it does matter),
let's always have all 3 major.minor.patch components.

(The soname isn't affected, and is always .so.$major)

Signed-off-by: Eric Engestrom 
Reviewed-by: Dylan Baker 

---

 src/egl/meson.build| 2 +-
 src/gallium/targets/osmesa/meson.build | 2 +-
 src/gbm/meson.build| 2 +-
 src/glx/meson.build| 2 +-
 src/mapi/es1api/meson.build| 2 +-
 src/mapi/es2api/meson.build| 2 +-
 src/mapi/shared-glapi/meson.build  | 1 +
 src/mesa/drivers/osmesa/meson.build| 2 +-
 8 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/egl/meson.build b/src/egl/meson.build
index 67ca8cef92..36b1d9e41b 100644
--- a/src/egl/meson.build
+++ b/src/egl/meson.build
@@ -145,7 +145,7 @@ if not with_glvnd
   egl_lib_version = '1.0.0'
 else
   egl_lib_name = 'EGL_mesa'
-  egl_lib_version = '0'
+  egl_lib_version = '0.0.0'
   files_egl += [g_egldispatchstubs_h, g_egldispatchstubs_c]
   files_egl += files('main/eglglvnd.c', 'main/egldispatchstubs.c')
   install_data(
diff --git a/src/gallium/targets/osmesa/meson.build 
b/src/gallium/targets/osmesa/meson.build
index b4b3911ffd..72f77724e4 100644
--- a/src/gallium/targets/osmesa/meson.build
+++ b/src/gallium/targets/osmesa/meson.build
@@ -62,7 +62,7 @@ libosmesa = shared_library(
 pkg.generate(
   name : 'osmesa',
   description : 'Mesa Off-screen Rendering Library',
-  version : '8',
+  version : '8.0.0',
   libraries : libosmesa,
   libraries_private : gl_priv_libs,
 )
diff --git a/src/gbm/meson.build b/src/gbm/meson.build
index 437896ef7f..f25f317202 100644
--- a/src/gbm/meson.build
+++ b/src/gbm/meson.build
@@ -57,7 +57,7 @@ libgbm = shared_library(
   link_args : [ld_args_gc_sections],
   link_with : [links_gbm, libloader, libmesa_util, libxmlconfig],
   dependencies : [deps_gbm, dep_dl],
-  version : '1.0',
+  version : '1.0.0',
   install : true,
 )
 
diff --git a/src/glx/meson.build b/src/glx/meson.build
index 573316c942..01ebc56773 100644
--- a/src/glx/meson.build
+++ b/src/glx/meson.build
@@ -112,7 +112,7 @@ if not with_glvnd
   gl_lib_version = '1.2.0'
 else
   gl_lib_name = 'GLX_mesa'
-  gl_lib_version = '0'
+  gl_lib_version = '0.0.0'
   files_libglx += files(
 'g_glxglvnddispatchfuncs.c',
 'g_glxglvnddispatchindices.h',
diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build
index 84a21cd6b7..8d95aee02f 100644
--- a/src/mapi/es1api/meson.build
+++ b/src/mapi/es1api/meson.build
@@ -36,7 +36,7 @@ libglesv1_cm = shared_library(
   include_directories : [inc_src, inc_include, inc_mapi],
   link_with : libglapi,
   dependencies : [dep_thread, dep_libdrm, dep_m, dep_dl],
-  version : '1.1',
+  version : '1.1.0',
   install : true,
 )
 
diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build
index 3d6888a4b8..7e868d77b3 100644
--- a/src/mapi/es2api/meson.build
+++ b/src/mapi/es2api/meson.build
@@ -36,7 +36,7 @@ libgles2 = shared_library(
   include_directories : [inc_src, inc_include, inc_mapi],
   link_with : libglapi,
   dependencies : [dep_thread, dep_libdrm, dep_m, dep_dl],
-  version : '2',
+  version : '2.0.0',
   install : true,
 )
 
diff --git a/src/mapi/shared-glapi/meson.build 
b/src/mapi/shared-glapi/meson.build
index 0d88de0545..05fd53b7a2 100644
--- a/src/mapi/shared-glapi/meson.build
+++ b/src/mapi/shared-glapi/meson.build
@@ -44,6 +44,7 @@ libglapi = shared_library(
   link_args : [ld_args_gc_sections],
   include_directories : [inc_src, inc_include, inc_mapi],
   dependencies : [dep_thread, dep_selinux],
+  version : '0.0.0',
   install : true,
 )
 
diff --git a/src/mesa/drivers/osmesa/meson.build 
b/src/mesa/drivers/osmesa/meson.build
index 407cda7e94..a406bb3c21 100644
--- a/src/mesa/drivers/osmesa/meson.build
+++ b/src/mesa/drivers/osmesa/meson.build
@@ -42,7 +42,7 @@ libosmesa = shared_library(
 pkg.generate(
   name : 'osmesa',
   description : 'Mesa Off-screen Rendering Library',
-  version : '8',
+  version : '8.0.0',
   libraries : libosmesa,
   libraries_private : gl_priv_libs,
 )

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: drop GLESv1 .so version back to 1.0.0

[Eric Engeström]

Module: Mesa
Branch: master
Commit: cc15460e182148292be877bec5a8a61cec57377d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=cc15460e182148292be877bec5a8a61cec57377d

Author: Eric Engestrom 
Date:   Thu Nov  2 23:38:09 2017 +

meson: drop GLESv1 .so version back to 1.0.0

autotools generates libGLESv1_CM.so.1.0.0, so let's make sure meson
does the same.

Signed-off-by: Eric Engestrom 
Reviewed-by: Dylan Baker 

---

 src/mapi/es1api/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build
index 8d95aee02f..e8b9066a5f 100644
--- a/src/mapi/es1api/meson.build
+++ b/src/mapi/es1api/meson.build
@@ -36,7 +36,7 @@ libglesv1_cm = shared_library(
   include_directories : [inc_src, inc_include, inc_mapi],
   link_with : libglapi,
   dependencies : [dep_thread, dep_libdrm, dep_m, dep_dl],
-  version : '1.1.0',
+  version : '1.0.0',
   install : true,
 )
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: only turn on Mesa's DEBUG for buildtype==debug

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 1e6f9ea21230229c0256d8189427411298132638
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=1e6f9ea21230229c0256d8189427411298132638

Author: Eric Engestrom 
Date:   Mon Nov  6 17:18:06 2017 +

meson: only turn on Mesa's DEBUG for buildtype==debug

As discussed in this thread:
https://lists.freedesktop.org/archives/mesa-dev/2017-November/175104.html

Cc: Dylan Baker 
Signed-off-by: Eric Engestrom 
Acked-by: Andres Rodriguez 
Reviewed-by: Chad Versace 
Reviewed-by: Matt Turner 
Tested-by: Chad Versace 

---

 meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 6e9a799704..44e062e01e 100644
--- a/meson.build
+++ b/meson.build
@@ -349,8 +349,8 @@ if cc.get_id() == 'gcc' and cc.version().version_compare('< 
4.4.6')
   error('When using GCC, version 4.4.6 or later is required.')
 endif
 
-# Define DEBUG for debug and debugoptimized builds
-if get_option('buildtype').startswith('debug')
+# Define DEBUG for debug builds only (debugoptimized is not included on this 
one)
+if get_option('buildtype') == 'debug'
   pre_args += '-DDEBUG'
 endif
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: switch default build type to debugoptimized

[Eric Engeström]

Module: Mesa
Branch: master
Commit: d5597f09c6a18a3ed2dd76657dd2e60806a6e4b2
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d5597f09c6a18a3ed2dd76657dd2e60806a6e4b2

Author: Eric Engestrom 
Date:   Mon Nov  6 16:49:27 2017 +

meson: switch default build type to debugoptimized

As discussed in this thread:
https://lists.freedesktop.org/archives/mesa-dev/2017-November/175104.html

Cc: Emil Velikov 
Cc: Ilia Mirkin 
Cc: Michel Dänzer 
Cc: Christian Schmidbauer 
Cc: Eero Tamminen 
Cc: Ernst Sjöstrand 
Signed-off-by: Eric Engestrom 
Acked-by: Matt Turner 
Acked-by: Andres Rodriguez 
Acked-by: Emil Velikov 
Reviewed-by: Dylan Baker 
Reviewed-by: Chad Versace 
Tested-by: Chad Versace 

---

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 3ceaec483a..6e9a799704 100644
--- a/meson.build
+++ b/meson.build
@@ -24,7 +24,7 @@ project(
   version : '17.3.0-devel',
   license : 'MIT',
   meson_version : '>= 0.42',
-  default_options : ['c_std=c99', 'cpp_std=c++11']
+  default_options : ['buildtype=debugoptimized', 'c_std=c99', 'cpp_std=c++11']
 )
 
 # Arguments for the preprocessor, put these in a separate array from the C and

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): mapi: fix .so path in ABI-check

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 5d4ffb997059fc22bd0463e648831322f939ade6
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5d4ffb997059fc22bd0463e648831322f939ade6

Author: Eric Engestrom 
Date:   Tue Oct 31 18:47:00 2017 +

mapi: fix .so path in ABI-check

Signed-off-by: Eric Engestrom 
Reviewed-and-Tested-by: Michel Dänzer 

---

 src/mapi/es1api/ABI-check | 2 +-
 src/mapi/es2api/ABI-check | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mapi/es1api/ABI-check b/src/mapi/es1api/ABI-check
index 25970bc414..bd9d0288d6 100755
--- a/src/mapi/es1api/ABI-check
+++ b/src/mapi/es1api/ABI-check
@@ -9,7 +9,7 @@ set -eu
 # or in extensions that are part of the ES 1.1 extension pack.
 # (see 
http://www.khronos.org/registry/gles/specs/1.1/opengles_spec_1_1_extension_pack.pdf)
 
-LIB=${1-.libs/libGLESv1_CM.so.1}
+LIB=${1-es1api/.libs/libGLESv1_CM.so.1}
 
 if ! [ -f "$LIB" ]
 then
diff --git a/src/mapi/es2api/ABI-check b/src/mapi/es2api/ABI-check
index 2c2764e7fb..835882c954 100755
--- a/src/mapi/es2api/ABI-check
+++ b/src/mapi/es2api/ABI-check
@@ -6,7 +6,7 @@ set -eu
 # GL_EXT_multi_draw_arrays
 # GL_OES_EGL_image
 
-LIB=${1-.libs/libGLESv2.so.2}
+LIB=${1-es2api/.libs/libGLESv2.so.2}
 
 if ! [ -f "$LIB" ]
 then

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: bump libdrm version required by amdgpu

[Eric Engeström]

Module: Mesa
Branch: master
Commit: d364684711a5894fd3221191811d56713d6abdee
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d364684711a5894fd3221191811d56713d6abdee

Author: Eric Engestrom 
Date:   Tue Oct 31 16:25:52 2017 +

meson: bump libdrm version required by amdgpu

Fixes: f03b7c9ad92c1656a221 "winsys/amdgpu: Add R600_DEBUG flag to
 reserve VMID per ctx."
Cc: Andrey Grodzovsky 
Signed-off-by: Eric Engestrom 
Reviewed-by: Dylan Baker 

---

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index d22d49535a..6ad8c8bbf4 100644
--- a/meson.build
+++ b/meson.build
@@ -638,7 +638,7 @@ dep_libdrm_nouveau = []
 dep_libdrm_etnaviv = []
 dep_libdrm_freedreno = []
 if with_amd_vk or with_gallium_radeonsi
-  dep_libdrm_amdgpu = dependency('libdrm_amdgpu', version : '>= 2.4.85')
+  dep_libdrm_amdgpu = dependency('libdrm_amdgpu', version : '>= 2.4.86')
 endif
 if with_gallium_radeonsi or with_dri_r100 or with_dri_r200
   dep_libdrm_radeon = dependency('libdrm_radeon', version : '>= 2.4.71')

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): gbm: fail symbol check if lib is missing

[Eric Engeström]

Module: Mesa
Branch: master
Commit: d830351bfa454a560aa0566a9d22aff910bcf456
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d830351bfa454a560aa0566a9d22aff910bcf456

Author: Eric Engestrom 
Date:   Mon Oct 30 15:27:25 2017 +

gbm: fail symbol check if lib is missing

Signed-off-by: Eric Engestrom 
Reviewed-by: Dylan Baker 
Reviewed-by: Emil Velikov 

---

 src/gbm/gbm-symbols-check | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/gbm/gbm-symbols-check b/src/gbm/gbm-symbols-check
index 2444131e99..cf57a08d57 100755
--- a/src/gbm/gbm-symbols-check
+++ b/src/gbm/gbm-symbols-check
@@ -1,6 +1,15 @@
 #!/bin/sh
+set -eu
 
-FUNCS=$(nm -D --defined-only ${1-.libs/libgbm.so} | grep -o "T .*" | cut -c 3- 
| while read func; do
+LIB=${1-.libs/libgbm.so}
+
+if ! [ -f "$LIB" ]
+then
+  exit 1
+fi
+
+
+FUNCS=$(nm -D --defined-only $LIB | grep -o "T .*" | cut -c 3- | while read 
func; do
 ( grep -q "^$func$" || echo $func )  

Mesa (master): meson: pass correct args to gles1 ABI test

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 8a3022ffa05a7951a0929ff292f201b4260a6023
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=8a3022ffa05a7951a0929ff292f201b4260a6023

Author: Eric Engestrom 
Date:   Mon Oct 30 15:46:05 2017 +

meson: pass correct args to gles1 ABI test

Signed-off-by: Eric Engestrom 
Reviewed-by: Dylan Baker 
Reviewed-by: Emil Velikov 

---

 src/mapi/es1api/meson.build | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build
index 57cfb1e8d8..84a21cd6b7 100644
--- a/src/mapi/es1api/meson.build
+++ b/src/mapi/es1api/meson.build
@@ -50,5 +50,8 @@ pkg.generate(
 )
 
 if with_tests
-  test('es1-ABI-check', find_program('ABI-check'))
+  test('es1-ABI-check',
+find_program('ABI-check'),
+args : libglesv1_cm
+  )
 endif

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: pass correct args to wayland-egl symbol test

[Eric Engeström]

Module: Mesa
Branch: master
Commit: be301ab724ce3a582a9a33f311893f3c6b55e964
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=be301ab724ce3a582a9a33f311893f3c6b55e964

Author: Eric Engestrom 
Date:   Mon Oct 30 15:47:26 2017 +

meson: pass correct args to wayland-egl symbol test

Signed-off-by: Eric Engestrom 
Reviewed-by: Dylan Baker 
Reviewed-by: Emil Velikov 

---

 src/egl/wayland/wayland-egl/meson.build | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/egl/wayland/wayland-egl/meson.build 
b/src/egl/wayland/wayland-egl/meson.build
index f380e96ee3..14c78a3ecb 100644
--- a/src/egl/wayland/wayland-egl/meson.build
+++ b/src/egl/wayland/wayland-egl/meson.build
@@ -38,6 +38,9 @@ pkg.generate(
 )
 
 if with_tests
-  test('wayland-egl-symbols-check', find_program('wayland-egl-symbols-check'))
+  test('wayland-egl-symbols-check',
+find_program('wayland-egl-symbols-check'),
+args : libwayland_egl
+  )
   test('wayland-egl-abi-check', executable('wayland-egl-abi-check', 
'wayland-egl-abi-check.c'))
 endif

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): automake+meson: don't run egl symbol check on libglvnd lib

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 64f17440b65b3065ba3d14155cd3da831200e49c
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=64f17440b65b3065ba3d14155cd3da831200e49c

Author: Eric Engestrom 
Date:   Mon Oct 30 15:43:10 2017 +

automake+meson: don't run egl symbol check on libglvnd lib

We might want to add a symbol check for the glvnd variant though.

Signed-off-by: Eric Engestrom 
Reviewed-by: Dylan Baker 
Reviewed-by: Emil Velikov 

---

 src/egl/Makefile.am |  9 +++--
 src/egl/meson.build | 12 
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index eeb745f973..eaec4ff946 100644
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -201,8 +201,13 @@ egl_HEADERS = \
$(top_srcdir)/include/EGL/eglmesaext.h \
$(top_srcdir)/include/EGL/eglplatform.h
 
-TESTS = egl-symbols-check \
-   egl-entrypoint-check
+TESTS = egl-entrypoint-check
+
+if USE_LIBGLVND
+#TODO: glvnd symbol check
+else
+TESTS += egl-symbols-check
+endif
 
 EXTRA_DIST = \
$(TESTS) \
diff --git a/src/egl/meson.build b/src/egl/meson.build
index 254e7e7a17..67ca8cef92 100644
--- a/src/egl/meson.build
+++ b/src/egl/meson.build
@@ -183,10 +183,14 @@ pkg.generate(
 )
 
 if with_tests
-  test('egl-symbols-check',
-find_program('egl-symbols-check'),
-args : libegl
-  )
+  if with_glvnd
+# TODO: add glvnd symbol check
+  else
+test('egl-symbols-check',
+  find_program('egl-symbols-check'),
+  args : libegl
+)
+  endif
   test('egl-entrypoint-check',
 find_program('egl-entrypoint-check'),
 env : [ 'srcdir=' + meson.current_source_dir() ]

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): gles1: fail symbol check if lib is missing

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 4e7612c54d6a121a5e45985709c33bcd7f8af995
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=4e7612c54d6a121a5e45985709c33bcd7f8af995

Author: Eric Engestrom 
Date:   Mon Oct 30 15:28:08 2017 +

gles1: fail symbol check if lib is missing

Signed-off-by: Eric Engestrom 
Reviewed-by: Dylan Baker 
Reviewed-by: Emil Velikov 

---

 src/mapi/es1api/ABI-check | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/mapi/es1api/ABI-check b/src/mapi/es1api/ABI-check
index 223658b32e..25970bc414 100755
--- a/src/mapi/es1api/ABI-check
+++ b/src/mapi/es1api/ABI-check
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -eu
 
 # Print defined gl.* functions not in GL ES 1.1 or in
 # (FIXME, none of these should be part of the ABI)
@@ -8,7 +9,14 @@
 # or in extensions that are part of the ES 1.1 extension pack.
 # (see 
http://www.khronos.org/registry/gles/specs/1.1/opengles_spec_1_1_extension_pack.pdf)
 
-FUNCS=$(nm -D --defined-only ${1-.libs/libGLESv1_CM.so.1} | grep -o 'T gl.*' | 
cut -c 3- | while read func; do
+LIB=${1-.libs/libGLESv1_CM.so.1}
+
+if ! [ -f "$LIB" ]
+then
+  exit 1
+fi
+
+FUNCS=$(nm -D --defined-only $LIB | grep -o 'T gl.*' | cut -c 3- | while read 
func; do
 ( grep -q "^$func$" || echo $func )  

Mesa (master): meson: pass correct args to gles2 ABI test

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 3ba973fe3784438690c4029f18ab5b514f7ae5d1
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=3ba973fe3784438690c4029f18ab5b514f7ae5d1

Author: Eric Engestrom 
Date:   Mon Oct 30 15:46:15 2017 +

meson: pass correct args to gles2 ABI test

Signed-off-by: Eric Engestrom 
Reviewed-by: Dylan Baker 
Reviewed-by: Emil Velikov 

---

 src/mapi/es2api/meson.build | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build
index f4922d755a..3d6888a4b8 100644
--- a/src/mapi/es2api/meson.build
+++ b/src/mapi/es2api/meson.build
@@ -50,5 +50,8 @@ pkg.generate(
 )
 
 if with_tests
-  test('es2-ABI-check', find_program('ABI-check'))
+  test('es2-ABI-check',
+find_program('ABI-check'),
+args : libgles2
+  )
 endif

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit