Mesa (master): glsl: remove unreachable assert()

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Wed Mar 28 18:21:59 2018 +0100

glsl: remove unreachable assert()

Earlier commit enforced that we'll bail out if the number of terminators
is different than 2. With that in mind, the assert() will never trigger.

Fixes: 56b867395de ("glsl: fix infinite loop caused by bug in loop
unrolling pass")
Reviewed-by: Timothy Arceri <tarc...@itsqueeze.com>
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 src/compiler/glsl/loop_unroll.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/compiler/glsl/loop_unroll.cpp 
b/src/compiler/glsl/loop_unroll.cpp
index f6efe6475a..874f418568 100644
--- a/src/compiler/glsl/loop_unroll.cpp
+++ b/src/compiler/glsl/loop_unroll.cpp
@@ -528,8 +528,6 @@ loop_unroll_visitor::visit_leave(ir_loop *ir)
unsigned term_count = 0;
bool first_term_then_continue = false;
foreach_in_list(loop_terminator, t, >terminators) {
-  assert(term_count < 2);
-
   ir_if *ir_if = t->ir->as_if();
   assert(ir_if != NULL);
 

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

Mesa (master): docs/release-calendar: update to include 18.1 and 18.2

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Mon Apr  9 17:45:52 2018 +0100

docs/release-calendar: update to include 18.1 and 18.2

Dylan has kindly stepped up to help with 18.1.0, while I've taken the
liberty to nominate Andres for 18.2.0 ;-)

As always, people are welcome to swap/adjust where needed.

v2: Add Juan for 18.0.x (Juan)

Cc: Andres Gomez <ago...@igalia.com>
Reviewed-by: Juan A. Suarez <jasua...@igalia.com>
Acked-by: Dylan Baker <dy...@pnwbakers.com> (v1)
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 docs/release-calendar.html | 88 +++---
 1 file changed, 84 insertions(+), 4 deletions(-)

diff --git a/docs/release-calendar.html b/docs/release-calendar.html
index 8f588ab46c..b363c822ea 100644
--- a/docs/release-calendar.html
+++ b/docs/release-calendar.html
@@ -43,27 +43,107 @@ if you'd like to nominate a patch in the next stable 
release.
 2018-04-06
 17.3.9
 Juan A. Suarez Romero
-Final planned release for the 17.3 series
+Last planned 17.3.x release
 
 
-18.0
+18.0
 2018-04-06
 18.0.1
-Andres Gomez
+Juan A. Suarez Romero
 
 
 
 2018-04-20
 18.0.2
-Andres Gomez
+Juan A. Suarez Romero
 
 
 
 2018-05-04
 18.0.3
+Juan A. Suarez Romero
+
+
+
+2018-05-18
+18.0.4
+Juan A. Suarez Romero
+Last planned 18.0.x release
+
+
+18.1
+2018-04-20
+18.1.0rc1
+Dylan Baker
+
+
+
+2018-04-27
+18.1.0rc2
+Dylan Baker
+
+
+
+2018-05-04
+18.1.0rc3
+Dylan Baker
+
+
+
+2018-05-11
+18.1.0rc4
+Dylan Baker
+Last planned RC/Final release
+
+
+TBD
+18.1.1
+Emil Velikov
+
+
+
+TBD
+18.1.2
+Emil Velikov
+
+
+
+TBD
+18.1.3
+Emil Velikov
+
+
+
+TBD
+18.1.4
+Emil Velikov
+Last planned RC/Final release
+
+
+18.2
+2018-07-20
+18.2.0rc1
 Andres Gomez
 
 
+
+2018-07-27
+18.2.0rc2
+Andres Gomez
+
+
+
+2018-08-03
+18.2.0rc3
+Andres Gomez
+
+
+
+2018-08-10
+18.2.0rc4
+Andres Gomez
+Last planned RC/Final release
+
 
 
 

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

Mesa (master): docs: update calendar 18.0.0 is out

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Tue Mar 27 19:11:45 2018 +0100

docs: update calendar 18.0.0 is out

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 docs/release-calendar.html | 26 --
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/docs/release-calendar.html b/docs/release-calendar.html
index 6d0b618176..37a523e904 100644
--- a/docs/release-calendar.html
+++ b/docs/release-calendar.html
@@ -52,38 +52,20 @@ if you'd like to nominate a patch in the next stable 
release.
 Final planned release for the 17.3 series
 
 
-18.0
-2018-01-26
-18.0.0-rc2
-Emil Velikov
-
-
-
-2018-02-02
-18.0.0-rc3
-Emil Velikov
-
-
-
-2018-02-09
-18.0.0-rc4
-Emil Velikov
-May be promoted to 18.0.0 final
-
-
-2018-02-23
+18.0
+2018-04-06
 18.0.1
 Andres Gomez
 
 
 
-2018-03-09
+2018-04-20
 18.0.2
 Andres Gomez
 
 
 
-2018-03-23
+2018-05-04
 18.0.3
 Andres Gomez
 

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

Mesa (master): docs: add sha256 checksums for 18.0.0

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Tue Mar 27 19:02:59 2018 +0100

docs: add sha256 checksums for 18.0.0

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
(cherry picked from commit fb64913d195112462786c0459d12f4bc8e7adee7)

---

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

diff --git a/docs/relnotes/18.0.0.html b/docs/relnotes/18.0.0.html
index 99ab27664b..2b374be632 100644
--- a/docs/relnotes/18.0.0.html
+++ b/docs/relnotes/18.0.0.html
@@ -33,7 +33,8 @@ because compatibility contexts are not supported.
 
 SHA256 checksums
 
-TBD.
+93c2d3504b2871ac2146603fb1270f341d36a39695e2950a469c5eac74f98457  
mesa-18.0.0.tar.gz
+694e5c3d37717d23258c1f88bc134223c5d1aac70518d2f9134d6df3ee791eea  
mesa-18.0.0.tar.xz
 
 
 

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

Mesa (18.0): docs: add sha256 checksums for 18.0.0

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Tue Mar 27 19:02:59 2018 +0100

docs: add sha256 checksums for 18.0.0

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

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

diff --git a/docs/relnotes/18.0.0.html b/docs/relnotes/18.0.0.html
index 99ab27664b..2b374be632 100644
--- a/docs/relnotes/18.0.0.html
+++ b/docs/relnotes/18.0.0.html
@@ -33,7 +33,8 @@ because compatibility contexts are not supported.
 
 SHA256 checksums
 
-TBD.
+93c2d3504b2871ac2146603fb1270f341d36a39695e2950a469c5eac74f98457  
mesa-18.0.0.tar.gz
+694e5c3d37717d23258c1f88bc134223c5d1aac70518d2f9134d6df3ee791eea  
mesa-18.0.0.tar.xz
 
 
 

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

Mesa (master): docs: add news item and link release notes for 18.0.0

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Tue Mar 27 19:08:48 2018 +0100

docs: add news item and link release notes for 18.0.0

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 docs/index.html| 7 +++
 docs/relnotes.html | 1 +
 2 files changed, 8 insertions(+)

diff --git a/docs/index.html b/docs/index.html
index 5c54a73646..9061c2e055 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -16,6 +16,13 @@
 
 News
 
+March 27, 2018
+
+Mesa 18.0.0 is released.  This is a
+new development release.  See the release notes for more information
+about the release.
+
+
 March 21, 2018
 
 Mesa 17.3.7 is released.
diff --git a/docs/relnotes.html b/docs/relnotes.html
index 96bf3fec45..5358ef0ef3 100644
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@ -21,6 +21,7 @@ The release notes summarize what's new or changed in each 
Mesa release.
 
 
 
+18.0.0 release notes
 17.3.7 release notes
 17.3.6 release notes
 17.3.5 release notes

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

Mesa (master): docs: Update 18.0.0 release notes

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Tue Mar 27 17:19:58 2018 +0100

docs: Update 18.0.0 release notes

Note: the file was originally 17.4.0, yet git stuggles to detect the
move :-\

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
(cherry picked from commit dceb1ce807a8b0ab32dc16b38040969bdbcc0d1b)

---

 docs/relnotes/17.4.0.html |  74 ---
 docs/relnotes/18.0.0.html | 320 ++
 2 files changed, 320 insertions(+), 74 deletions(-)

diff --git a/docs/relnotes/17.4.0.html b/docs/relnotes/17.4.0.html
deleted file mode 100644
index 6bebb514bd..00
--- a/docs/relnotes/17.4.0.html
+++ /dev/null
@@ -1,74 +0,0 @@
-http://www.w3.org/TR/html4/loose.dtd;>
-
-
-  
-  Mesa Release Notes
-  
-
-
-
-
-  The Mesa 3D Graphics Library
-
-
-
-
-
-Mesa 17.4.0 Release Notes / TBD
-
-
-Mesa 17.4.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.
-
-
-Mesa 17.4.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
-4.5 is only available if requested at context creation
-because compatibility contexts are not supported.
-
-
-
-SHA256 checksums
-
-TBD.
-
-
-
-New features
-
-
-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_cull_distance on r600/evergreen+
-GL_ARB_enhanced_layouts on r600/evergreen+
-GL_ARB_bindless_texture on nvc0/kepler
-OpenGL 4.3 on r600/evergreen with hw fp64 support
-Support 1 binary format for GL_ARB_get_program_binary on i965
-Cannonlake support on i965 and anv
-
-
-Bug fixes
-
-
-TBD
-
-
-Changes
-
-
-Remove incomplete GLX_MESA_set_3dfx_mode from the Xlib libGL
-
-
-
-
-
diff --git a/docs/relnotes/18.0.0.html b/docs/relnotes/18.0.0.html
new file mode 100644
index 00..99ab27664b
--- /dev/null
+++ b/docs/relnotes/18.0.0.html
@@ -0,0 +1,320 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+  
+  Mesa Release Notes
+  
+
+
+
+
+  The Mesa 3D Graphics Library
+
+
+
+
+
+Mesa 17.4.0 Release Notes / March 27 2018
+
+
+Mesa 17.4.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.
+
+
+Mesa 17.4.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
+4.5 is only available if requested at context creation
+because compatibility contexts are not supported.
+
+
+
+SHA256 checksums
+
+TBD.
+
+
+
+New features
+
+
+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_cull_distance on r600/evergreen+
+GL_ARB_enhanced_layouts on r600/evergreen+
+GL_ARB_bindless_texture on nvc0/kepler
+OpenGL 4.3 on r600/evergreen with hw fp64 support
+Support 1 binary format for GL_ARB_get_program_binary on i965.
+(For the 18.0 release, 0 formats continue to be supported in
+compatibility profiles.)
+Cannonlake support on i965 and anv
+
+
+Bug fixes
+
+
+
+https://bugs.freedesktop.org/show_bug.cgi?id=85564;>Bug 85564 
- Dead Island rendering issues
+
+https://bugs.freedesktop.org/show_bug.cgi?id=90311;>Bug 90311 
- Fail to build libglx with clang at linking stage
+
+https://bugs.freedesktop.org/show_bug.cgi?id=92363;>Bug 92363 
- [BSW/BDW] ogles1conform Gets test fails
+
+https://bugs.freedesktop.org/show_bug.cgi?id=94739;>Bug 94739 
- Mesa 11.1.2 implementation error: bad format MESA_FORMAT_Z_FLOAT32 in 
_mesa_unpack_uint_24_8_depth_stencil_row
+
+https://bugs.freedesktop.org/show_bug.cgi?id=97532;>Bug 97532 
- Regression: GLB 2.7  Glmark-2

Mesa: tag mesa-18.0.0: mesa-18.0.0

[Emil Velikov]

Module: Mesa
Branch: refs/tags/mesa-18.0.0
Tag:d23dc99cc8ab9a31853db66d2bf09c1ff7f2594e
URL:
http://cgit.freedesktop.org/mesa/mesa/tag/?id=d23dc99cc8ab9a31853db66d2bf09c1ff7f2594e

Tagger: Emil Velikov <emil.l.veli...@gmail.com>
Date:   Tue Mar 27 18:24:25 2018 +0100

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

Mesa (18.0): docs: Update 18.0.0 release notes

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Tue Mar 27 17:19:58 2018 +0100

docs: Update 18.0.0 release notes

Note: the file was originally 17.4.0, yet git stuggles to detect the
move :-\

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 docs/relnotes/17.4.0.html |  76 ---
 docs/relnotes/18.0.0.html | 320 ++
 2 files changed, 320 insertions(+), 76 deletions(-)

diff --git a/docs/relnotes/17.4.0.html b/docs/relnotes/17.4.0.html
deleted file mode 100644
index 529774efdd..00
--- a/docs/relnotes/17.4.0.html
+++ /dev/null
@@ -1,76 +0,0 @@
-http://www.w3.org/TR/html4/loose.dtd;>
-
-
-  
-  Mesa Release Notes
-  
-
-
-
-
-  The Mesa 3D Graphics Library
-
-
-
-
-
-Mesa 17.4.0 Release Notes / TBD
-
-
-Mesa 17.4.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.
-
-
-Mesa 17.4.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
-4.5 is only available if requested at context creation
-because compatibility contexts are not supported.
-
-
-
-SHA256 checksums
-
-TBD.
-
-
-
-New features
-
-
-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_cull_distance on r600/evergreen+
-GL_ARB_enhanced_layouts on r600/evergreen+
-GL_ARB_bindless_texture on nvc0/kepler
-OpenGL 4.3 on r600/evergreen with hw fp64 support
-Support 1 binary format for GL_ARB_get_program_binary on i965.
-(For the 18.0 release, 0 formats continue to be supported in
-compatibility profiles.)
-Cannonlake support on i965 and anv
-
-
-Bug fixes
-
-
-TBD
-
-
-Changes
-
-
-Remove incomplete GLX_MESA_set_3dfx_mode from the Xlib libGL
-
-
-
-
-
diff --git a/docs/relnotes/18.0.0.html b/docs/relnotes/18.0.0.html
new file mode 100644
index 00..99ab27664b
--- /dev/null
+++ b/docs/relnotes/18.0.0.html
@@ -0,0 +1,320 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+  
+  Mesa Release Notes
+  
+
+
+
+
+  The Mesa 3D Graphics Library
+
+
+
+
+
+Mesa 17.4.0 Release Notes / March 27 2018
+
+
+Mesa 17.4.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.
+
+
+Mesa 17.4.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
+4.5 is only available if requested at context creation
+because compatibility contexts are not supported.
+
+
+
+SHA256 checksums
+
+TBD.
+
+
+
+New features
+
+
+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_cull_distance on r600/evergreen+
+GL_ARB_enhanced_layouts on r600/evergreen+
+GL_ARB_bindless_texture on nvc0/kepler
+OpenGL 4.3 on r600/evergreen with hw fp64 support
+Support 1 binary format for GL_ARB_get_program_binary on i965.
+(For the 18.0 release, 0 formats continue to be supported in
+compatibility profiles.)
+Cannonlake support on i965 and anv
+
+
+Bug fixes
+
+
+
+https://bugs.freedesktop.org/show_bug.cgi?id=85564;>Bug 85564 
- Dead Island rendering issues
+
+https://bugs.freedesktop.org/show_bug.cgi?id=90311;>Bug 90311 
- Fail to build libglx with clang at linking stage
+
+https://bugs.freedesktop.org/show_bug.cgi?id=92363;>Bug 92363 
- [BSW/BDW] ogles1conform Gets test fails
+
+https://bugs.freedesktop.org/show_bug.cgi?id=94739;>Bug 94739 
- Mesa 11.1.2 implementation error: bad format MESA_FORMAT_Z_FLOAT32 in 
_mesa_unpack_uint_24_8_depth_stencil_row
+
+https://bugs.freedesktop.org/show_bug.cgi?id=97532;>Bug 97532 
- Regr

Mesa (18.0): Update version to 18.0.0(final)

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Tue Mar 27 17:12:42 2018 +0100

Update version to 18.0.0(final)

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 593b157732..7eae4e2e91 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.0.0-rc5
+18.0.0

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

Mesa (master): configure: use AC_CHECK_HEADERS to check for endian.h

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.co.uk>
Date:   Fri Mar 23 17:37:39 2018 +

configure: use AC_CHECK_HEADERS to check for endian.h

The currently we use the singular CHECK_HEADER combined with explicit
append to the DEFINES variable. That is a legacy misnomer, since it
requires us to add $DEFINES to every piece that we build.

Using the plural version of the helper sets the HAVE_ macro for us, plus
ensures it's passed to the compiler - if config.h is available in there
(not in the case of mesa) otherwise on the command line.

In hindsight, we should replace all the AC_CHECK_{FUNC,HEADER} instances
with the plural version (or even the _ONCE suffixed version) and drop
the DEFINES hacks.

Fixes: cbee1bfb342 ("meson/configure: detect endian.h instead of trying
to guess when it's available")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105717
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Acked-by: Eric Engestrom <eric.engest...@imgtec.com>
Tested-by: Clayton Craft <clayton.a.cr...@intel.com>

---

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 36c56da787..99805e0f2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -865,7 +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_HEADERS([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"])

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

Mesa (master): gallium/winsys/kms: Fix possible leak in map/unmap.

[Emil Velikov]

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

Author: Lepton Wu <lep...@chromium.org>
Date:   Mon Mar 19 15:01:30 2018 -0700

gallium/winsys/kms: Fix possible leak in map/unmap.

If user calls map twice for kms_sw_displaytarget, the first mapped
buffer could get leaked. Instead of calling mmap every time, just
reuse previous mapping. Since user could map same displaytarget with
different flags, we have to keep two different pointers, one for rw
mapping and one for ro mapping. Also introduce reference count for
mapped buffer so we can unmap them at right time.

v2:
 - avoid duplicated mapping and leaked mapping (Tomasz)
v3:
 - split from larger patch (Emil)
v4:
 - remove munmap from dt_destory (Emil)
v5:
 - introduce reference count for mapping (Tomasz)
 - add back munmap in dt_destory
v6:
 - remove change-id in commit message (Tomasz)
v7:
 - remove munmap from dt_destory again (Emil)
 - add revision history in commit message (Emil)

Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Tomasz Figa <tf...@chromium.org>
Signed-off-by: Lepton Wu <lep...@chromium.org>

---

 src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c | 38 ++-
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c 
b/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
index 22e1c936ac..f7bad06edb 100644
--- a/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
+++ b/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
@@ -70,8 +70,10 @@ struct kms_sw_displaytarget
 
uint32_t handle;
void *mapped;
+   void *ro_mapped;
 
int ref_count;
+   int map_count;
struct list_head link;
 };
 
@@ -170,6 +172,10 @@ kms_sw_displaytarget_destroy(struct sw_winsys *ws,
if (kms_sw_dt->ref_count > 0)
   return;
 
+   if (kms_sw_dt->map_count > 0) {
+  DEBUG_PRINT("KMS-DEBUG: leaked map buffer %u\n", kms_sw_dt->handle);
+   }
+
memset(_req, 0, sizeof destroy_req);
destroy_req.handle = kms_sw_dt->handle;
drmIoctl(kms_sw->fd, DRM_IOCTL_MODE_DESTROY_DUMB, _req);
@@ -198,16 +204,21 @@ kms_sw_displaytarget_map(struct sw_winsys *ws,
   return NULL;
 
prot = (flags == PIPE_TRANSFER_READ) ? PROT_READ : (PROT_READ | PROT_WRITE);
-   kms_sw_dt->mapped = mmap(0, kms_sw_dt->size, prot, MAP_SHARED,
-kms_sw->fd, map_req.offset);
-
-   if (kms_sw_dt->mapped == MAP_FAILED)
-  return NULL;
+   void **ptr = (flags == PIPE_TRANSFER_READ) ? _sw_dt->ro_mapped : 
_sw_dt->mapped;
+   if (!*ptr) {
+  void *tmp = mmap(0, kms_sw_dt->size, prot, MAP_SHARED,
+   kms_sw->fd, map_req.offset);
+  if (tmp == MAP_FAILED)
+ return NULL;
+  *ptr = tmp;
+   }
 
DEBUG_PRINT("KMS-DEBUG: mapped buffer %u (size %u) at %p\n",
- kms_sw_dt->handle, kms_sw_dt->size, kms_sw_dt->mapped);
+ kms_sw_dt->handle, kms_sw_dt->size, *ptr);
+
+   kms_sw_dt->map_count++;
 
-   return kms_sw_dt->mapped;
+   return *ptr;
 }
 
 static struct kms_sw_displaytarget *
@@ -277,10 +288,23 @@ kms_sw_displaytarget_unmap(struct sw_winsys *ws,
 {
struct kms_sw_displaytarget *kms_sw_dt = kms_sw_displaytarget(dt);
 
+   if (!kms_sw_dt->map_count)  {
+  DEBUG_PRINT("KMS-DEBUG: ignore duplicated unmap %u", kms_sw_dt->handle);
+  return;
+   }
+   kms_sw_dt->map_count--;
+   if (kms_sw_dt->map_count) {
+  DEBUG_PRINT("KMS-DEBUG: ignore unmap for busy buffer %u", 
kms_sw_dt->handle);
+  return;
+   }
+
DEBUG_PRINT("KMS-DEBUG: unmapped buffer %u (was %p)\n", kms_sw_dt->handle, 
kms_sw_dt->mapped);
+   DEBUG_PRINT("KMS-DEBUG: unmapped buffer %u (was %p)\n", kms_sw_dt->handle, 
kms_sw_dt->ro_mapped);
 
munmap(kms_sw_dt->mapped, kms_sw_dt->size);
kms_sw_dt->mapped = NULL;
+   munmap(kms_sw_dt->ro_mapped, kms_sw_dt->size);
+   kms_sw_dt->ro_mapped = NULL;
 }
 
 static struct sw_displaytarget *

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

Mesa (master): gallium/winsys/kms: Add support for multi-planes

[Emil Velikov]

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

Author: Lepton Wu <lep...@chromium.org>
Date:   Mon Mar 19 15:01:31 2018 -0700

gallium/winsys/kms: Add support for multi-planes

Add a new struct kms_sw_plane which delegate a plane and use it
in place of sw_displaytarget. Multiple planes share same underlying
kms_sw_displaytarget.

v2:
 - add more check for plane size (Tomasz)
v3:
 - split from larger patch (Emil)
v4:
 - no change from v3
v5:
 - remove mapped field (Tomasz)
v6:
 - remove change-id in commit message (Tomasz)
v7:
 - add revision history in commit message (Emil)

Reviewed-by: Tomasz Figa <tf...@chromium.org>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
Signed-off-by: Lepton Wu <lep...@chromium.org>

---

 src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c | 152 --
 1 file changed, 112 insertions(+), 40 deletions(-)

diff --git a/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c 
b/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
index f7bad06edb..d842fe3257 100644
--- a/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
+++ b/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
@@ -59,13 +59,21 @@
 #define DEBUG_PRINT(msg, ...)
 #endif
 
+struct kms_sw_displaytarget;
 
-struct kms_sw_displaytarget
+struct kms_sw_plane
 {
-   enum pipe_format format;
unsigned width;
unsigned height;
unsigned stride;
+   unsigned offset;
+   struct kms_sw_displaytarget *dt;
+   struct list_head link;
+};
+
+struct kms_sw_displaytarget
+{
+   enum pipe_format format;
unsigned size;
 
uint32_t handle;
@@ -75,6 +83,7 @@ struct kms_sw_displaytarget
int ref_count;
int map_count;
struct list_head link;
+   struct list_head planes;
 };
 
 struct kms_sw_winsys
@@ -85,10 +94,16 @@ struct kms_sw_winsys
struct list_head bo_list;
 };
 
-static inline struct kms_sw_displaytarget *
-kms_sw_displaytarget( struct sw_displaytarget *dt )
+static inline struct kms_sw_plane *
+kms_sw_plane( struct sw_displaytarget *dt )
+{
+   return (struct kms_sw_plane *)dt;
+}
+
+static inline struct sw_displaytarget *
+sw_displaytarget( struct kms_sw_plane *pl)
 {
-   return (struct kms_sw_displaytarget *)dt;
+   return (struct sw_displaytarget *)pl;
 }
 
 static inline struct kms_sw_winsys *
@@ -107,6 +122,39 @@ kms_sw_is_displaytarget_format_supported( struct sw_winsys 
*ws,
return TRUE;
 }
 
+static struct kms_sw_plane *get_plane(struct kms_sw_displaytarget *kms_sw_dt,
+  enum pipe_format format,
+  unsigned width, unsigned height,
+  unsigned stride, unsigned offset)
+{
+   struct kms_sw_plane *plane = NULL;
+
+   if (offset + util_format_get_2d_size(format, stride, height) >
+   kms_sw_dt->size) {
+  DEBUG_PRINT("KMS-DEBUG: plane too big. format: %d stride: %d height: %d "
+  "offset: %d size:%d\n", format, stride, height, offset,
+  kms_sw_dt->size);
+  return NULL;
+   }
+
+   LIST_FOR_EACH_ENTRY(plane, _sw_dt->planes, link) {
+  if (plane->offset == offset)
+ return plane;
+   }
+
+   plane = CALLOC_STRUCT(kms_sw_plane);
+   if (!plane)
+  return NULL;
+
+   plane->width = width;
+   plane->height = height;
+   plane->stride = stride;
+   plane->offset = offset;
+   plane->dt = kms_sw_dt;
+   list_add(>link, _sw_dt->planes);
+   return plane;
+}
+
 static struct sw_displaytarget *
 kms_sw_displaytarget_create(struct sw_winsys *ws,
 unsigned tex_usage,
@@ -126,11 +174,10 @@ kms_sw_displaytarget_create(struct sw_winsys *ws,
if (!kms_sw_dt)
   goto no_dt;
 
+   list_inithead(_sw_dt->planes);
kms_sw_dt->ref_count = 1;
 
kms_sw_dt->format = format;
-   kms_sw_dt->width = width;
-   kms_sw_dt->height = height;
 
memset(_req, 0, sizeof(create_req));
create_req.bpp = 32;
@@ -140,16 +187,19 @@ kms_sw_displaytarget_create(struct sw_winsys *ws,
if (ret)
   goto free_bo;
 
-   kms_sw_dt->stride = create_req.pitch;
kms_sw_dt->size = create_req.size;
kms_sw_dt->handle = create_req.handle;
+   struct kms_sw_plane *plane = get_plane(kms_sw_dt, format, width, height,
+  create_req.pitch, 0);
+   if (!plane)
+  goto free_bo;
 
list_add(_sw_dt->link, _sw->bo_list);
 
DEBUG_PRINT("KMS-DEBUG: created buffer %u (size %u)\n", kms_sw_dt->handle, 
kms_sw_dt->size);
 
-   *stride = kms_sw_dt->stride;
-   return (struct sw_displaytarget *)kms_sw_dt;
+   *stride = create_req.pitch;
+   return sw_displaytarget(plane);
 
  free_bo:
memset(_req, 0, sizeof destroy_req);
@@ -165,7 +215,8 @@ kms_sw_displaytarget_destroy(struct sw_winsys *ws,
  

Mesa: tag mesa-18.0.0-rc5: mesa-18.0.0-rc5

[Emil Velikov]

Module: Mesa
Branch: refs/tags/mesa-18.0.0-rc5
Tag:b9ce7ec11f55e36e26b23f3d4c65721fa721b1a3
URL:
http://cgit.freedesktop.org/mesa/mesa/tag/?id=b9ce7ec11f55e36e26b23f3d4c65721fa721b1a3

Tagger: Emil Velikov <emil.l.veli...@gmail.com>
Date:   Wed Mar 21 14:25:00 2018 +

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

Mesa (18.0): 120 new commits

[Emil Velikov]

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=15f1b50cee1ae0cfe5ba571272d41c371e8814f0
Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Wed Mar 21 14:17:29 2018 +

Update version to 18.0.0-rc5

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=05ae1d463faef1ab5dd5e7078d874eb8f4a5ed23
Author: Marek Olšák <marek.ol...@amd.com>
Date:   Thu Feb 22 20:21:42 2018 +0100

radeonsi: prevent a negative buffer offset in si_upload_descriptors

(cherry picked from commit 16856a1ee86f364212674dddf154caa374310a6b)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=3d4383f1399f9bd3cdaea794b0fa9be87f3d80f8
Author: Marek Olšák <marek.ol...@amd.com>
Date:   Wed Feb 21 23:33:38 2018 +0100

radeonsi: fix vertex buffer address computation with full 64-bit addresses

(cherry picked from commit 2a47660754ba49d5998929550f639677506c4515)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=3fec971d712c604adb0bd33def50d97b56da0b66
Author: Andres Gomez <ago...@igalia.com>
Date:   Mon Mar 5 17:25:36 2018 +0200

travis: keep meson version below 0.45.0

Recently Meson upgraded to 0.45.0 and it needs python 3.5+, which is
not available in Trusty.

Cc: Eric Engestrom <eric.engest...@imgtec.com>
Cc: Dylan Baker <dy...@pnwbakers.com>
Cc: Emil Velikov <emil.veli...@collabora.com>
Cc: Jon Turney <jon.tur...@dronecode.org.uk>
Signed-off-by: Andres Gomez <ago...@igalia.com>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com>
Reviewed-by: Dylan Baker <dy...@pnwbakers.com>
(cherry picked from commit 72552012c7b461b887c44b3f90e2744bc7512a74)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=9f86aee1d16d3c1eb296a8549587d98285991553
Author: Andres Gomez <ago...@igalia.com>
Date:   Wed Feb 28 23:18:59 2018 +0200

travis: make Meson find the proper llvm-config

Travis CI has moved to LLVM 5.0, and meson is detecting automatically
the available version in /usr/local/bin based on the PATH env variable
order preference.

As for 0.44.x, Meson cannot receive the path to the llvm-config binary
as a configuration parameter. See
https://github.com/mesonbuild/meson/issues/2887 and

https://github.com/dcbaker/meson/commit/7c8b6ee3fa42f43c9ac7dcacc61a77eca3f1bcef

We want to use the custom (APT) installed version. Therefore, let's
make Meson find our wanted version sooner than the one at
/usr/local/bin

Once this is corrected, we would still need a patch similar to:
https://lists.freedesktop.org/archives/mesa-dev/2017-December/180217.html

v2: Create the link only to the specificly wanted LLVM version (Gert).

Cc: Eric Engestrom <eric.engest...@imgtec.com>
Cc: Dylan Baker <dy...@pnwbakers.com>
Cc: Emil Velikov <emil.veli...@collabora.com>
Cc: Juan A. Suarez Romero <jasua...@igalia.com>
Cc: Gert Wollny <gw.foss...@gmail.com>
Cc: Jon Turney <jon.tur...@dronecode.org.uk>
Signed-off-by: Andres Gomez <ago...@igalia.com>
Reviewed-and-Tested-by: Eric Engestrom <eric.engest...@imgtec.com>
Reviewed-by: Dylan Baker <dy...@pnwbakers.com>
Reviewed-by: Juan A. Suarez <jasua...@igalia.com>
Reviewed-By: Gert Wollny <gw.foss...@gmail.com>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
(cherry picked from commit b5b912dfeebabafbaff176fe4205eb74607f709b)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=282591dd00775c39eb21754cec8dd95fc7960319
Author: Vadym Shovkoplias <vadim.shovkopl...@gmail.com>
Date:   Tue Feb 13 11:38:22 2018 -0700

mesa: add glsl version query (v4)

Add support for GL_NUM_SHADING_LANGUAGE_VERSIONS
and glGetStringi for GL_SHADING_LANGUAGE_VERSION

v2:
  - Combine similar functionality into
_mesa_get_shading_language_version() function.
  - Change GLSL version return mechanism.
v3:
  - Add return of empty string for GLSL ver 1.10.
  - Move _mesa_get_shading_language_version() function
to src/mesa/main/version.c.
v4:
  - Add OpenGL version check.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104915
Signed-off-by: Andriy Khulap <andriy.khu...@globallogic.com>
Signed-off-by: Vadym Shovkoplias <vadym.shovkopl...@globallogic.com>
Reviewed-by: Brian Paul <bri...@vmware.com>
(cherry picked from commit a553c54abf92533daf442073dd3408c35f57d8ba)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=4f49caf17a8983e652f290f468c78acfae2e6625
Author: Eric Anholt <e...@anholt.net>
Date:   Sat Feb 10 11:22:53 2018 +

i965: Silence compiler warning about pro

Mesa (master): i965: annotate brw_oa.py's --header and --code as required

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Tue Mar 20 16:23:05 2018 +

i965: annotate brw_oa.py's --header and --code as required

As of earlier commit, the --header was made a hard requirement when
using --code.

Hence - annotate both as required and drop a few no longer needed
checks.

Fixes: 035cc7a12dc0 ("i965: perf: reduce i965 binary size")
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com>

---

 src/mesa/drivers/dri/i965/brw_oa.py | 35 ++-
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_oa.py 
b/src/mesa/drivers/dri/i965/brw_oa.py
index 63db28bba9..b0b2be2af0 100644
--- a/src/mesa/drivers/dri/i965/brw_oa.py
+++ b/src/mesa/drivers/dri/i965/brw_oa.py
@@ -32,19 +32,16 @@ c_file = None
 _c_indent = 0
 
 def c(*args):
-if c_file:
-code = ' '.join(map(str,args))
-for line in code.splitlines():
-text = ''.rjust(_c_indent) + line
-c_file.write(text.rstrip() + "\n")
+code = ' '.join(map(str,args))
+for line in code.splitlines():
+text = ''.rjust(_c_indent) + line
+c_file.write(text.rstrip() + "\n")
 
 # indented, but no trailing newline...
 def c_line_start(code):
-if c_file:
-c_file.write(''.rjust(_c_indent) + code)
+c_file.write(''.rjust(_c_indent) + code)
 def c_raw(code):
-if c_file:
-c_file.write(code)
+c_file.write(code)
 
 def c_indent(n):
 global _c_indent
@@ -57,11 +54,10 @@ header_file = None
 _h_indent = 0
 
 def h(*args):
-if header_file:
-code = ' '.join(map(str,args))
-for line in code.splitlines():
-text = ''.rjust(_h_indent) + line
-header_file.write(text.rstrip() + "\n")
+code = ' '.join(map(str,args))
+for line in code.splitlines():
+text = ''.rjust(_h_indent) + line
+header_file.write(text.rstrip() + "\n")
 
 def h_indent(n):
 global _c_indent
@@ -556,17 +552,14 @@ def main():
 global header_file
 
 parser = argparse.ArgumentParser()
-parser.add_argument("--header", help="Header file to write")
-parser.add_argument("--code", help="C file to write")
+parser.add_argument("--header", help="Header file to write", required=True)
+parser.add_argument("--code", help="C file to write", required=True)
 parser.add_argument("xml_files", nargs='+', help="List of xml metrics 
files to process")
 
 args = parser.parse_args()
 
-if args.header:
-header_file = open(args.header, 'w')
-
-if args.code:
-c_file = open(args.code, 'w')
+header_file = open(args.header, 'w')
+c_file = open(args.code, 'w')
 
 gens = []
 for xml_file in args.xml_files:

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

Mesa (master): st/mesa: add compiler/nir/ prefix for nir includes

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Tue Mar 20 11:39:57 2018 +

st/mesa: add compiler/nir/ prefix for nir includes

Stay consistent with the rest of the codebase, effectively fixing the
autotools build.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105621
Fixes: ffa4bbe4665 ("st/nir/radeonsi: move nir_lower_uniforms_to_ubo()
to the state tracker")
Cc: Timothy Arceri <tarc...@itsqueeze.com>
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Brian Paul <bri...@vmware.com>

---

 src/mesa/state_tracker/st_nir_lower_uniforms_to_ubo.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/state_tracker/st_nir_lower_uniforms_to_ubo.c 
b/src/mesa/state_tracker/st_nir_lower_uniforms_to_ubo.c
index e2a477ecc7..b2f8f833bb 100644
--- a/src/mesa/state_tracker/st_nir_lower_uniforms_to_ubo.c
+++ b/src/mesa/state_tracker/st_nir_lower_uniforms_to_ubo.c
@@ -29,8 +29,8 @@
  * point by 1.
  */
 
-#include "nir.h"
-#include "nir_builder.h"
+#include "compiler/nir/nir.h"
+#include "compiler/nir/nir_builder.h"
 #include "st_nir.h"
 
 #include "program/prog_parameter.h"

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

Mesa (master): egl/dri2: move wayland header inclusion where applicable

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Wed Mar 14 17:31:27 2018 +

egl/dri2: move wayland header inclusion where applicable

Instead of indirectly pulling the wayland headers everywhere, use
forward declarations and #include only as needed.

Should effectively fix build errors like the following:

make[5]: Entering directory
'/.../src/gallium/state_trackers/omx/tizonia'
   CC   h264dprc.lo
In file included from h264dprc.c:45:0:
.../src/egl/drivers/dri2/egl_dri2.h:47:10: fatal error:
wayland/wayland-egl/wayland-egl-backend.h: No such file or directory
  #include "wayland/wayland-egl/wayland-egl-backend.h"

Cc: Dylan Baker <dy...@pnwbakers.com>
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Acked-by: Eric Engestrom <eric.engest...@imgtec.com>
Tested-by: Andy Furniss <adf.li...@gmail.com>

---

 src/egl/drivers/dri2/egl_dri2.c |  1 +
 src/egl/drivers/dri2/egl_dri2.h | 12 +---
 src/egl/drivers/dri2/platform_wayland.c |  2 ++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 864f7eb0c6..535806e4bf 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -48,6 +48,7 @@
 #include 
 
 #ifdef HAVE_WAYLAND_PLATFORM
+#include 
 #include "wayland-drm.h"
 #include "wayland-drm-client-protocol.h"
 #include "linux-dmabuf-unstable-v1-client-protocol.h"
diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h
index bd637f73c9..adabc527f8 100644
--- a/src/egl/drivers/dri2/egl_dri2.h
+++ b/src/egl/drivers/dri2/egl_dri2.h
@@ -43,9 +43,15 @@
 #endif
 
 #ifdef HAVE_WAYLAND_PLATFORM
-#include 
-#include "wayland/wayland-egl/wayland-egl-backend.h"
-/* forward declarations of protocol elements */
+/* forward declarations to avoid pulling wayland headers everywhere */
+struct wl_egl_window;
+struct wl_event_queue;
+struct wl_callback;
+struct wl_display;
+struct wl_drm;
+struct wl_registry;
+struct wl_shm;
+struct wl_surface;
 struct zwp_linux_dmabuf_v1;
 #endif
 
diff --git a/src/egl/drivers/dri2/platform_wayland.c 
b/src/egl/drivers/dri2/platform_wayland.c
index 877f7933b9..94f7defa65 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -49,6 +49,8 @@
 #include "wayland-drm-client-protocol.h"
 #include "linux-dmabuf-unstable-v1-client-protocol.h"
 
+#include "wayland/wayland-egl/wayland-egl-backend.h"
+
 #ifndef DRM_FORMAT_MOD_INVALID
 #define DRM_FORMAT_MOD_INVALID ((1ULL << 56) - 1)
 #endif

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

Mesa (master): tgsi: move tgsi_processor_to_shader_stage() to a header

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Thu Mar 15 12:12:58 2018 +

tgsi: move tgsi_processor_to_shader_stage() to a header

This way we can utilise it with later patches.

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Brian Paul <bri...@vmware.com>
Reviewed-by: Marek Olšák <marek.ol...@amd.com>

---

 src/gallium/auxiliary/nir/tgsi_to_nir.c | 16 +---
 src/gallium/auxiliary/tgsi/tgsi_from_mesa.h | 15 +++
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c 
b/src/gallium/auxiliary/nir/tgsi_to_nir.c
index f8df4c1013..bbbf101157 100644
--- a/src/gallium/auxiliary/nir/tgsi_to_nir.c
+++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c
@@ -34,6 +34,7 @@
 #include "tgsi/tgsi_dump.h"
 #include "tgsi/tgsi_info.h"
 #include "tgsi/tgsi_scan.h"
+#include "tgsi/tgsi_from_mesa.h"
 
 #define SWIZ(X, Y, Z, W) (unsigned[4]){  \
   TGSI_SWIZZLE_##X,  \
@@ -1887,21 +1888,6 @@ ttn_add_output_stores(struct ttn_compile *c)
}
 }
 
-static gl_shader_stage
-tgsi_processor_to_shader_stage(unsigned processor)
-{
-   switch (processor) {
-   case PIPE_SHADER_FRAGMENT:  return MESA_SHADER_FRAGMENT;
-   case PIPE_SHADER_VERTEX:return MESA_SHADER_VERTEX;
-   case PIPE_SHADER_GEOMETRY:  return MESA_SHADER_GEOMETRY;
-   case PIPE_SHADER_TESS_CTRL: return MESA_SHADER_TESS_CTRL;
-   case PIPE_SHADER_TESS_EVAL: return MESA_SHADER_TESS_EVAL;
-   case PIPE_SHADER_COMPUTE:   return MESA_SHADER_COMPUTE;
-   default:
-  unreachable("invalid TGSI processor");
-   }
-}
-
 struct nir_shader *
 tgsi_to_nir(const void *tgsi_tokens,
 const nir_shader_compiler_options *options)
diff --git a/src/gallium/auxiliary/tgsi/tgsi_from_mesa.h 
b/src/gallium/auxiliary/tgsi/tgsi_from_mesa.h
index bfaa48d7fa..b4d540baab 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_from_mesa.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_from_mesa.h
@@ -68,4 +68,19 @@ pipe_shader_type_from_mesa(gl_shader_stage stage)
}
 }
 
+static inline gl_shader_stage
+tgsi_processor_to_shader_stage(unsigned processor)
+{
+   switch (processor) {
+   case PIPE_SHADER_FRAGMENT:  return MESA_SHADER_FRAGMENT;
+   case PIPE_SHADER_VERTEX:return MESA_SHADER_VERTEX;
+   case PIPE_SHADER_GEOMETRY:  return MESA_SHADER_GEOMETRY;
+   case PIPE_SHADER_TESS_CTRL: return MESA_SHADER_TESS_CTRL;
+   case PIPE_SHADER_TESS_EVAL: return MESA_SHADER_TESS_EVAL;
+   case PIPE_SHADER_COMPUTE:   return MESA_SHADER_COMPUTE;
+   default:
+  unreachable("invalid TGSI processor");
+   }
+}
+
 #endif /* TGSI_FROM_MESA_H */

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

Mesa (master): vulkan/wsi/x11: use ARRAY_SIZE where applicable

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Tue Mar 13 11:06:28 2018 +

vulkan/wsi/x11: use ARRAY_SIZE where applicable

Use the handy macro instead of hard coded numbers.

Fixes: c80c08e2260 ("vulkan/wsi/x11: Add support for DRI3 v1.2")
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Daniel Stone <dani...@collabora.com>

---

 src/vulkan/wsi/wsi_common_x11.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vulkan/wsi/wsi_common_x11.c b/src/vulkan/wsi/wsi_common_x11.c
index 5f29ead3f2..e7a7da1928 100644
--- a/src/vulkan/wsi/wsi_common_x11.c
+++ b/src/vulkan/wsi/wsi_common_x11.c
@@ -1398,7 +1398,7 @@ x11_surface_create_swapchain(VkIcdSurfaceBase 
*icd_surface,
   }
}
 
-   for (int i = 0; i < 2; i++)
+   for (int i = 0; i < ARRAY_SIZE(modifiers); i++)
   vk_free(pAllocator, modifiers[i]);
*swapchain_out = >base;
 
@@ -1409,7 +1409,7 @@ fail_init_images:
   x11_image_finish(chain, pAllocator, >images[j]);
 
 fail_register:
-   for (int i = 0; i < 2; i++)
+   for (int i = 0; i < ARRAY_SIZE(modifiers); i++)
   vk_free(pAllocator, modifiers[i]);
 
xcb_unregister_for_special_event(chain->conn, chain->special_event);

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

Mesa (master): vulkan/wsi/x11: correct DRI3 version in comment

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Tue Mar 13 11:29:52 2018 +

vulkan/wsi/x11: correct DRI3 version in comment

During development the version was bumped, yet the comment did not get
an update.

Fixes: c80c08e2260 ("vulkan/wsi/x11: Add support for DRI3 v1.2")
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Daniel Stone <dani...@collabora.com>

---

 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 e7a7da1928..0667aa1dbc 100644
--- a/src/vulkan/wsi/wsi_common_x11.c
+++ b/src/vulkan/wsi/wsi_common_x11.c
@@ -1047,7 +1047,7 @@ x11_image_init(VkDevice device_h, struct x11_swapchain 
*chain,
image->pixmap = xcb_generate_id(chain->conn);
 
if (image->base.drm_modifier != DRM_FORMAT_MOD_INVALID) {
-  /* If the image has a modifier, we must have DRI3 v1.1. */
+  /* If the image has a modifier, we must have DRI3 v1.2. */
   assert(chain->has_dri3_modifiers);
 
   cookie =

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

Mesa (master): st/mesa: simplify st_init_limits() via tgsi_processor_to_shader_stage

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Thu Mar 15 12:51:03 2018 +

st/mesa: simplify st_init_limits() via tgsi_processor_to_shader_stage

Reuse the tgis helper and remove a bunch of duplicated code.

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Brian Paul <bri...@vmware.com>
Reviewed-by: Marek Olšák <marek.ol...@amd.com>

---

 src/mesa/state_tracker/st_extensions.c | 45 +-
 1 file changed, 6 insertions(+), 39 deletions(-)

diff --git a/src/mesa/state_tracker/st_extensions.c 
b/src/mesa/state_tracker/st_extensions.c
index 3b8e226e67..bea61f21cb 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -36,6 +36,7 @@
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_screen.h"
+#include "tgsi/tgsi_from_mesa.h"
 #include "util/u_math.h"
 
 #include "st_context.h"
@@ -166,52 +167,18 @@ void st_init_limits(struct pipe_screen *screen,
 screen->get_compiler_options(screen, PIPE_SHADER_IR_NIR, sh);
   }
 
-  switch (sh) {
-  case PIPE_SHADER_FRAGMENT:
- pc = >Program[MESA_SHADER_FRAGMENT];
- options = >ShaderCompilerOptions[MESA_SHADER_FRAGMENT];
- c->ShaderCompilerOptions[MESA_SHADER_FRAGMENT].NirOptions =
-nir_options;
- break;
-  case PIPE_SHADER_VERTEX:
- pc = >Program[MESA_SHADER_VERTEX];
- options = >ShaderCompilerOptions[MESA_SHADER_VERTEX];
- c->ShaderCompilerOptions[MESA_SHADER_VERTEX].NirOptions =
-nir_options;
- break;
-  case PIPE_SHADER_GEOMETRY:
- pc = >Program[MESA_SHADER_GEOMETRY];
- options = >ShaderCompilerOptions[MESA_SHADER_GEOMETRY];
- c->ShaderCompilerOptions[MESA_SHADER_GEOMETRY].NirOptions =
-nir_options;
- break;
-  case PIPE_SHADER_TESS_CTRL:
- pc = >Program[MESA_SHADER_TESS_CTRL];
- options = >ShaderCompilerOptions[MESA_SHADER_TESS_CTRL];
- c->ShaderCompilerOptions[MESA_SHADER_TESS_CTRL].NirOptions =
-nir_options;
- break;
-  case PIPE_SHADER_TESS_EVAL:
- pc = >Program[MESA_SHADER_TESS_EVAL];
- options = >ShaderCompilerOptions[MESA_SHADER_TESS_EVAL];
- c->ShaderCompilerOptions[MESA_SHADER_TESS_EVAL].NirOptions =
-nir_options;
- break;
-  case PIPE_SHADER_COMPUTE:
- pc = >Program[MESA_SHADER_COMPUTE];
- options = >ShaderCompilerOptions[MESA_SHADER_COMPUTE];
- c->ShaderCompilerOptions[MESA_SHADER_COMPUTE].NirOptions =
-nir_options;
+  const gl_shader_stage stage = tgsi_processor_to_shader_stage(sh);
+  pc = >Program[stage];
+  options = >ShaderCompilerOptions[stage];
+  c->ShaderCompilerOptions[stage].NirOptions = nir_options;
 
+  if (sh == PIPE_SHADER_COMPUTE) {
  if (!screen->get_param(screen, PIPE_CAP_COMPUTE))
 continue;
  supported_irs =
 screen->get_shader_param(screen, sh, 
PIPE_SHADER_CAP_SUPPORTED_IRS);
  if (!(supported_irs & (1 << PIPE_SHADER_IR_TGSI)))
 continue;
- break;
-  default:
- assert(0);
   }
 
   pc->MaxTextureImageUnits =

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

Mesa (master): egl/android: Implement the eglSwapinterval for Android.

[Emil Velikov]

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

Author: Wu, Zhongmin <zhongmin...@intel.com>
Date:   Thu Jan 18 15:39:22 2018 +0800

egl/android: Implement the eglSwapinterval for Android.

Implement the eglSwapinterval for Android platform to
enable the async mode for some GFX benchmarks such as
Daimler C217, CityBench.

Results of the dEQP-EGL.*swap_interval tests

'dEQP-EGL.functional.query_config.get_config_attrib.max_swap_interval'..
'dEQP-EGL.functional.query_config.get_config_attrib.min_swap_interval'..
'dEQP-EGL.functional.choose_config.simple.selection_only.max_swap_interval'..
'dEQP-EGL.functional.choose_config.simple.selection_only.min_swap_interval'..
'dEQP-EGL.functional.choose_config.simple.selection_and_sort.max_swap_interval'..
'dEQP-EGL.functional.choose_config.simple.selection_and_sort.min_swap_interval'..
'dEQP-EGL.functional.negative_api.swap_interval'..

 Test run totals:
   Passed:7/7 (100.0%)
   Failed:0/7 (0.0%)
   Not supported: 0/7 (0.0%)
   Warnings:  0/7 (0.0%)

Signed-off-by: Zhongmin Wu <zhongmin...@intel.com>
Reviewed-by: Eric Engestrom <e...@engestrom.ch>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Tomasz Figa <tf...@chromium.org>
[Emil Velikov: polish inline comment, add dEQP stats, s/dpy/disp/]
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

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

diff --git a/src/egl/drivers/dri2/platform_android.c 
b/src/egl/drivers/dri2/platform_android.c
index 4f25cb7469..7f1a496ea2 100644
--- a/src/egl/drivers/dri2/platform_android.c
+++ b/src/egl/drivers/dri2/platform_android.c
@@ -417,6 +417,20 @@ droid_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, 
_EGLSurface *surf)
return EGL_TRUE;
 }
 
+static EGLBoolean
+droid_swap_interval(_EGLDriver *drv, _EGLDisplay *dpy,
+   _EGLSurface *surf, EGLint interval)
+{
+   struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
+   struct ANativeWindow *window = dri2_surf->window;
+
+   if (window->setSwapInterval(window, interval))
+  return EGL_FALSE;
+
+   surf->SwapInterval = interval;
+   return EGL_TRUE;
+}
+
 static int
 update_buffers(struct dri2_egl_surface *dri2_surf)
 {
@@ -1127,6 +1141,7 @@ static const struct dri2_egl_display_vtbl 
droid_display_vtbl = {
.swap_buffers = droid_swap_buffers,
.swap_buffers_with_damage = dri2_fallback_swap_buffers_with_damage, /* 
Android implements the function */
.swap_buffers_region = dri2_fallback_swap_buffers_region,
+   .swap_interval = droid_swap_interval,
 #if ANDROID_API_LEVEL >= 23
.set_damage_region = droid_set_damage_region,
 #else
@@ -1241,6 +1256,12 @@ dri2_initialize_android(_EGLDriver *drv, _EGLDisplay 
*disp)
 
dri2_setup_screen(disp);
 
+   /* We set the maximum swap interval as 1 for Android platform, since it is
+* the maximum value supported by Android according to the value of
+* ANativeWindow::maxSwapInterval.
+*/
+   dri2_setup_swap_interval(disp, 1);
+
if (!droid_add_configs_for_visuals(drv, disp)) {
   err = "DRI2: failed to add configs";
   goto cleanup;

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

Mesa (master): gallium/x11: remove empty GLX_SGIX_swap_barrier stubs

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Mon Mar  5 18:22:38 2018 +

gallium/x11: remove empty GLX_SGIX_swap_barrier stubs

The extension was never implemented. Quick search suggests:
 - no actual users (on my Arch setup)
 - the Nvidia driver does not implement the extension

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Acked-by: Ian Romanick <ian.d.roman...@intel.com>
Acked-by: Brian Paul <bri...@vmware.com>
Reviewed-by: Adam Jackson <a...@redhat.com>

---

 src/gallium/state_trackers/glx/xlib/glx_api.c | 21 -
 src/gallium/state_trackers/glx/xlib/glx_getproc.c |  4 
 2 files changed, 25 deletions(-)

diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c 
b/src/gallium/state_trackers/glx/xlib/glx_api.c
index 6ec3a31d5f..80bf3e5494 100644
--- a/src/gallium/state_trackers/glx/xlib/glx_api.c
+++ b/src/gallium/state_trackers/glx/xlib/glx_api.c
@@ -2659,27 +2659,6 @@ glXJoinSwapGroupSGIX(Display *dpy, GLXDrawable drawable, 
GLXDrawable member)
 
 
 
-/*** GLX_SGIX_swap_barrier ***/
-
-PUBLIC void
-glXBindSwapBarrierSGIX(Display *dpy, GLXDrawable drawable, int barrier)
-{
-   (void) dpy;
-   (void) drawable;
-   (void) barrier;
-}
-
-PUBLIC Bool
-glXQueryMaxSwapBarriersSGIX(Display *dpy, int screen, int *max)
-{
-   (void) dpy;
-   (void) screen;
-   (void) max;
-   return False;
-}
-
-
-
 /*** GLX_SUN_get_transparent_index ***/
 
 PUBLIC Status
diff --git a/src/gallium/state_trackers/glx/xlib/glx_getproc.c 
b/src/gallium/state_trackers/glx/xlib/glx_getproc.c
index e7564ad9cd..71d3ad8c8a 100644
--- a/src/gallium/state_trackers/glx/xlib/glx_getproc.c
+++ b/src/gallium/state_trackers/glx/xlib/glx_getproc.c
@@ -150,10 +150,6 @@ static struct name_address_pair GLX_functions[] = {
/*** GLX_SGIX_swap_group ***/
{ "glXJoinSwapGroupSGIX", (__GLXextFuncPtr) glXJoinSwapGroupSGIX },
 
-   /*** GLX_SGIX_swap_barrier ***/
-   { "glXBindSwapBarrierSGIX", (__GLXextFuncPtr) glXBindSwapBarrierSGIX },
-   { "glXQueryMaxSwapBarriersSGIX", (__GLXextFuncPtr) 
glXQueryMaxSwapBarriersSGIX },
-
/*** GLX_SUN_get_transparent_index ***/
{ "glXGetTransparentIndexSUN", (__GLXextFuncPtr) glXGetTransparentIndexSUN 
},
 

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

Mesa (master): egl: autotools: do not redirect stdin/stdout for wayland-scanner

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Thu Mar  8 16:16:18 2018 +

egl: autotools: do not redirect stdin/stdout for wayland-scanner

The tool accepts the input and output files as arguments.
There's no need for the redirection.

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Dylan Baker <dy...@pnwbakers.com>

---

 src/egl/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index 9fcee9d2b8..285d3caa9e 100644
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -70,11 +70,11 @@ WL_DMABUF_XML = 
$(WAYLAND_PROTOCOLS_DATADIR)/unstable/linux-dmabuf/linux-dmabuf-
 
 drivers/dri2/linux-dmabuf-unstable-v1-protocol.c: $(WL_DMABUF_XML)
$(MKDIR_GEN)
-   $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
+   $(AM_V_GEN)$(WAYLAND_SCANNER) code $< $@
 
 drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h: $(WL_DMABUF_XML)
$(MKDIR_GEN)
-   $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
+   $(AM_V_GEN)$(WAYLAND_SCANNER) client-header $< $@
 
 if HAVE_PLATFORM_WAYLAND
 drivers/dri2/linux-dmabuf-unstable-v1-protocol.lo: 
drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h

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

Mesa (master): configure: remove unused AM_CONDITIONAL

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Mon Mar  5 18:14:51 2018 +

configure: remove unused AM_CONDITIONAL

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com>

---

 configure.ac | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 1553ce99da..621dc328d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -454,7 +454,6 @@ if test "x$GCC_ATOMIC_BUILTINS_SUPPORTED" = x1; then
 LIBATOMIC_LIBS="-latomic"
 fi
 fi
-AM_CONDITIONAL([GCC_ATOMIC_BUILTINS_SUPPORTED], [test 
x$GCC_ATOMIC_BUILTINS_SUPPORTED = x1])
 AC_SUBST([LIBATOMIC_LIBS])
 
 dnl Check if host supports 64-bit atomics

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

Mesa (master): x11: remove empty GLX_SGIX_swap_group stubs

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Mon Mar  5 18:28:35 2018 +

x11: remove empty GLX_SGIX_swap_group stubs

The extension was never implemented. Quick search suggests:
 - no actual users (on my Arch setup)
 - the Nvidia driver does not implement the extension

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Acked-by: Ian Romanick <ian.d.roman...@intel.com>
Acked-by: Brian Paul <bri...@vmware.com>
Reviewed-by: Adam Jackson <a...@redhat.com>

---

 src/mesa/drivers/x11/fakeglx.c | 15 ---
 src/mesa/drivers/x11/glxapi.c  | 16 
 src/mesa/drivers/x11/glxapi.h  |  3 ---
 3 files changed, 34 deletions(-)

diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index c49178b9af..233b6e254f 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -2683,18 +2683,6 @@ Fake_glXAssociateDMPbufferSGIX(Display *dpy, 
GLXPbufferSGIX pbuffer, DMparams *p
 #endif
 
 
-/*** GLX_SGIX_swap_group ***/
-
-static void
-Fake_glXJoinSwapGroupSGIX(Display *dpy, GLXDrawable drawable, GLXDrawable 
member)
-{
-   (void) dpy;
-   (void) drawable;
-   (void) member;
-}
-
-
-
 /*** GLX_SUN_get_transparent_index ***/
 
 static Status
@@ -2935,9 +2923,6 @@ _mesa_GetGLXDispatchTable(void)
glx.AssociateDMPbufferSGIX = NULL;
 #endif
 
-   /*** GLX_SGIX_swap_group ***/
-   glx.JoinSwapGroupSGIX = Fake_glXJoinSwapGroupSGIX;
-
/*** GLX_SUN_get_transparent_index ***/
glx.GetTransparentIndexSUN = Fake_glXGetTransparentIndexSUN;
 
diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c
index 637c6ae3ca..f112c8ab09 100644
--- a/src/mesa/drivers/x11/glxapi.c
+++ b/src/mesa/drivers/x11/glxapi.c
@@ -910,19 +910,6 @@ glXAssociateDMPbufferSGIX(Display *dpy, GLXPbufferSGIX 
pbuffer, DMparams *params
 #endif
 
 
-/*** GLX_SGIX_swap_group ***/
-
-void PUBLIC
-glXJoinSwapGroupSGIX(Display *dpy, GLXDrawable drawable, GLXDrawable member)
-{
-   struct _glxapi_table *t;
-   GET_DISPATCH(dpy, t);
-   if (!t)
-  return;
-   t->JoinSwapGroupSGIX(dpy, drawable, member);
-}
-
-
 /*** GLX_SUN_get_transparent_index ***/
 
 Status PUBLIC
@@ -1177,9 +1164,6 @@ static struct name_address_pair GLX_functions[] = {
{ "glXAssociateDMPbufferSGIX", (__GLXextFuncPtr) glXAssociateDMPbufferSGIX 
},
 #endif
 
-   /*** GLX_SGIX_swap_group ***/
-   { "glXJoinSwapGroupSGIX", (__GLXextFuncPtr) glXJoinSwapGroupSGIX },
-
/*** GLX_SUN_get_transparent_index ***/
{ "glXGetTransparentIndexSUN", (__GLXextFuncPtr) glXGetTransparentIndexSUN 
},
 
diff --git a/src/mesa/drivers/x11/glxapi.h b/src/mesa/drivers/x11/glxapi.h
index 4f3087cac7..03af158afa 100644
--- a/src/mesa/drivers/x11/glxapi.h
+++ b/src/mesa/drivers/x11/glxapi.h
@@ -164,9 +164,6 @@ struct _glxapi_table {
void *AssociciateDMPbufferSGIX;
 #endif
 
-   /*** GLX_SGIX_swap_group ***/
-   void (*JoinSwapGroupSGIX)(Display *, GLXDrawable, GLXDrawable);
-
/*** GLX_SUN_get_transparent_index ***/
Status (*GetTransparentIndexSUN)(Display *, Window, Window, long *);
 

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

Mesa (master): x11: remove empty GLX_SGIX_swap_barrier stubs

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Mon Mar  5 18:17:13 2018 +

x11: remove empty GLX_SGIX_swap_barrier stubs

The extension was never implemented. Quick search suggests:
 - no actual users (on my Arch setup)
 - the Nvidia driver does not implement the extension

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Acked-by: Ian Romanick <ian.d.roman...@intel.com>
Acked-by: Brian Paul <bri...@vmware.com>
Reviewed-by: Adam Jackson <a...@redhat.com>

---

 src/mesa/drivers/x11/fakeglx.c | 25 -
 src/mesa/drivers/x11/glxapi.c  | 28 
 src/mesa/drivers/x11/glxapi.h  |  4 
 3 files changed, 57 deletions(-)

diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index 42c48264ba..c49178b9af 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -2695,27 +2695,6 @@ Fake_glXJoinSwapGroupSGIX(Display *dpy, GLXDrawable 
drawable, GLXDrawable member
 
 
 
-/*** GLX_SGIX_swap_barrier ***/
-
-static void
-Fake_glXBindSwapBarrierSGIX(Display *dpy, GLXDrawable drawable, int barrier)
-{
-   (void) dpy;
-   (void) drawable;
-   (void) barrier;
-}
-
-static Bool
-Fake_glXQueryMaxSwapBarriersSGIX(Display *dpy, int screen, int *max)
-{
-   (void) dpy;
-   (void) screen;
-   (void) max;
-   return False;
-}
-
-
-
 /*** GLX_SUN_get_transparent_index ***/
 
 static Status
@@ -2959,10 +2938,6 @@ _mesa_GetGLXDispatchTable(void)
/*** GLX_SGIX_swap_group ***/
glx.JoinSwapGroupSGIX = Fake_glXJoinSwapGroupSGIX;
 
-   /*** GLX_SGIX_swap_barrier ***/
-   glx.BindSwapBarrierSGIX = Fake_glXBindSwapBarrierSGIX;
-   glx.QueryMaxSwapBarriersSGIX = Fake_glXQueryMaxSwapBarriersSGIX;
-
/*** GLX_SUN_get_transparent_index ***/
glx.GetTransparentIndexSUN = Fake_glXGetTransparentIndexSUN;
 
diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c
index 5017546c7e..637c6ae3ca 100644
--- a/src/mesa/drivers/x11/glxapi.c
+++ b/src/mesa/drivers/x11/glxapi.c
@@ -923,30 +923,6 @@ glXJoinSwapGroupSGIX(Display *dpy, GLXDrawable drawable, 
GLXDrawable member)
 }
 
 
-/*** GLX_SGIX_swap_barrier ***/
-
-void PUBLIC
-glXBindSwapBarrierSGIX(Display *dpy, GLXDrawable drawable, int barrier)
-{
-   struct _glxapi_table *t;
-   GET_DISPATCH(dpy, t);
-   if (!t)
-  return;
-   t->BindSwapBarrierSGIX(dpy, drawable, barrier);
-}
-
-Bool PUBLIC
-glXQueryMaxSwapBarriersSGIX(Display *dpy, int screen, int *max)
-{
-   struct _glxapi_table *t;
-   GET_DISPATCH(dpy, t);
-   if (!t)
-  return False;
-   return t->QueryMaxSwapBarriersSGIX(dpy, screen, max);
-}
-
-
-
 /*** GLX_SUN_get_transparent_index ***/
 
 Status PUBLIC
@@ -1204,10 +1180,6 @@ static struct name_address_pair GLX_functions[] = {
/*** GLX_SGIX_swap_group ***/
{ "glXJoinSwapGroupSGIX", (__GLXextFuncPtr) glXJoinSwapGroupSGIX },
 
-   /*** GLX_SGIX_swap_barrier ***/
-   { "glXBindSwapBarrierSGIX", (__GLXextFuncPtr) glXBindSwapBarrierSGIX },
-   { "glXQueryMaxSwapBarriersSGIX", (__GLXextFuncPtr) 
glXQueryMaxSwapBarriersSGIX },
-
/*** GLX_SUN_get_transparent_index ***/
{ "glXGetTransparentIndexSUN", (__GLXextFuncPtr) glXGetTransparentIndexSUN 
},
 
diff --git a/src/mesa/drivers/x11/glxapi.h b/src/mesa/drivers/x11/glxapi.h
index 7bccc50aa7..4f3087cac7 100644
--- a/src/mesa/drivers/x11/glxapi.h
+++ b/src/mesa/drivers/x11/glxapi.h
@@ -167,10 +167,6 @@ struct _glxapi_table {
/*** GLX_SGIX_swap_group ***/
void (*JoinSwapGroupSGIX)(Display *, GLXDrawable, GLXDrawable);
 
-   /*** GLX_SGIX_swap_barrier ***/
-   void (*BindSwapBarrierSGIX)(Display *, GLXDrawable, int);
-   Bool (*QueryMaxSwapBarriersSGIX)(Display *, int, int *);
-
/*** GLX_SUN_get_transparent_index ***/
Status (*GetTransparentIndexSUN)(Display *, Window, Window, long *);
 

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

Mesa (master): gallium: work around libtool relink issue for libdrm

[Emil Velikov]

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

Author: Roman Gilg <subd...@gmail.com>
Date:   Mon Mar  5 17:41:44 2018 +0100

gallium: work around libtool relink issue for libdrm

This is similar to commit 90633079. libtool links first to system directories
instead of custom locations of libdrm on relinking. Since a more recent libdrm
version than the one provided by the system is often needed when compiling
mesa, make sure this works by putting libdrm in front.

See also: https://bugs.freedesktop.org/show_bug.cgi?id=100259

Signed-off-by: Roman Gilg <subd...@gmail.com>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>

---

 src/gallium/targets/dri/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/targets/dri/Makefile.am 
b/src/gallium/targets/dri/Makefile.am
index 73bb71db0c..c6a4c21590 100644
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -52,9 +52,9 @@ gallium_dri_la_LIBADD = \
$(top_builddir)/src/gallium/drivers/rbug/librbug.la \
$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
$(top_builddir)/src/mapi/shared-glapi/libglapi.la \
+   $(LIBDRM_LIBS) \
$(SELINUX_LIBS) \
$(EXPAT_LIBS) \
-   $(LIBDRM_LIBS) \
$(GALLIUM_COMMON_LIB_DEPS)
 
 EXTRA_gallium_dri_la_DEPENDENCIES = \

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

Mesa (master): gallium/x11: remove empty GLX_SGIX_swap_group stubs

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Mon Mar  5 18:30:40 2018 +

gallium/x11: remove empty GLX_SGIX_swap_group stubs

The extension was never implemented. Quick search suggests:
 - no actual users (on my Arch setup)
 - the Nvidia driver does not implement the extension

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Acked-by: Ian Romanick <ian.d.roman...@intel.com>
Acked-by: Brian Paul <bri...@vmware.com>
Reviewed-by: Adam Jackson <a...@redhat.com>

---

 src/gallium/state_trackers/glx/xlib/glx_api.c | 12 
 src/gallium/state_trackers/glx/xlib/glx_getproc.c |  3 ---
 2 files changed, 15 deletions(-)

diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c 
b/src/gallium/state_trackers/glx/xlib/glx_api.c
index 80bf3e5494..3bd07c280d 100644
--- a/src/gallium/state_trackers/glx/xlib/glx_api.c
+++ b/src/gallium/state_trackers/glx/xlib/glx_api.c
@@ -2647,18 +2647,6 @@ glXAssociateDMPbufferSGIX(Display *dpy, GLXPbufferSGIX 
pbuffer,
 #endif
 
 
-/*** GLX_SGIX_swap_group ***/
-
-PUBLIC void
-glXJoinSwapGroupSGIX(Display *dpy, GLXDrawable drawable, GLXDrawable member)
-{
-   (void) dpy;
-   (void) drawable;
-   (void) member;
-}
-
-
-
 /*** GLX_SUN_get_transparent_index ***/
 
 PUBLIC Status
diff --git a/src/gallium/state_trackers/glx/xlib/glx_getproc.c 
b/src/gallium/state_trackers/glx/xlib/glx_getproc.c
index 71d3ad8c8a..58b476341d 100644
--- a/src/gallium/state_trackers/glx/xlib/glx_getproc.c
+++ b/src/gallium/state_trackers/glx/xlib/glx_getproc.c
@@ -147,9 +147,6 @@ static struct name_address_pair GLX_functions[] = {
{ "glXAssociateDMPbufferSGIX", (__GLXextFuncPtr) glXAssociateDMPbufferSGIX 
},
 #endif
 
-   /*** GLX_SGIX_swap_group ***/
-   { "glXJoinSwapGroupSGIX", (__GLXextFuncPtr) glXJoinSwapGroupSGIX },
-
/*** GLX_SUN_get_transparent_index ***/
{ "glXGetTransparentIndexSUN", (__GLXextFuncPtr) glXGetTransparentIndexSUN 
},
 

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

Mesa (master): docs: document removal of GLX_SGIX_swap_{barrier,group} stubs

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Thu Mar  8 14:07:07 2018 +

docs: document removal of GLX_SGIX_swap_{barrier,group} stubs

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 docs/relnotes/18.1.0.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/relnotes/18.1.0.html b/docs/relnotes/18.1.0.html
index 1d5201717f..3e11907873 100644
--- a/docs/relnotes/18.1.0.html
+++ b/docs/relnotes/18.1.0.html
@@ -62,7 +62,8 @@ TBD
 Changes
 
 
-TBD
+Remove incomplete GLX_SGIX_swap_barrier stubs from the Xlib libGL
+Remove incomplete GLX_SGIX_swap_group stubs from the Xlib libGL
 
 
 

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

Mesa (master): glx: remove empty GLX_SGIX_swap_group stubs

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Mon Mar  5 18:33:14 2018 +

glx: remove empty GLX_SGIX_swap_group stubs

The extension was never implemented. Quick search suggests:
 - no actual users (on my Arch setup)
 - the Nvidia driver does not implement the extension

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Acked-by: Ian Romanick <ian.d.roman...@intel.com>
Acked-by: Brian Paul <bri...@vmware.com>
Reviewed-by: Adam Jackson <a...@redhat.com>

---

 src/glx/apple/glx_empty.c | 12 
 src/glx/glxcmds.c | 16 
 src/glx/glxextensions.c   |  1 -
 src/glx/glxextensions.h   |  1 -
 4 files changed, 30 deletions(-)

diff --git a/src/glx/apple/glx_empty.c b/src/glx/apple/glx_empty.c
index 427c3a5935..b7afbce7dd 100644
--- a/src/glx/apple/glx_empty.c
+++ b/src/glx/apple/glx_empty.c
@@ -50,18 +50,6 @@ glXWaitVideoSyncSGI(int divisor, int remainder, unsigned int 
*count)
 
 
 /*
-** GLX_SGIX_swap_group
-*/
-void
-glXJoinSwapGroupSGIX(Display * dpy, GLXDrawable drawable, GLXDrawable member)
-{
-   (void) dpy;
-   (void) drawable;
-   (void) member;
-}
-
-
-/*
 ** GLX_OML_sync_control
 */
 Bool
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index 57af039d1b..949c2a5931 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -2037,19 +2037,6 @@ glXGetFBConfigFromVisualSGIX(Display * dpy, XVisualInfo 
* vis)
 
 #ifndef GLX_USE_APPLEGL
 /*
-** GLX_SGIX_swap_group
-*/
-static void
-__glXJoinSwapGroupSGIX(Display * dpy, GLXDrawable drawable,
-   GLXDrawable member)
-{
-   (void) dpy;
-   (void) drawable;
-   (void) member;
-}
-
-
-/*
 ** GLX_OML_sync_control
 */
 static Bool
@@ -2520,9 +2507,6 @@ static const struct name_address_pair GLX_functions[] = {
GLX_FUNCTION(glXSelectEventSGIX),
GLX_FUNCTION(glXGetSelectedEventSGIX),
 
-   /*** GLX_SGIX_swap_group ***/
-   GLX_FUNCTION2(glXJoinSwapGroupSGIX, __glXJoinSwapGroupSGIX),
-
/*** GLX_MESA_copy_sub_buffer ***/
GLX_FUNCTION2(glXCopySubBufferMESA, __glXCopySubBufferMESA),
 
diff --git a/src/glx/glxextensions.c b/src/glx/glxextensions.c
index de015f2546..a575862670 100644
--- a/src/glx/glxextensions.c
+++ b/src/glx/glxextensions.c
@@ -161,7 +161,6 @@ static const struct extension_info known_glx_extensions[] = 
{
{ GLX(SGIS_multisample),VER(0,0), Y, Y, N, N },
{ GLX(SGIX_fbconfig),   VER(1,3), Y, Y, N, N },
{ GLX(SGIX_pbuffer),VER(1,3), Y, Y, N, N },
-   { GLX(SGIX_swap_group), VER(0,0), N, N, N, N },
{ GLX(SGIX_visual_select_group),VER(0,0), Y, Y, N, N },
{ GLX(SGI_make_current_read),   VER(1,3), Y, N, N, N },
{ GLX(SGI_swap_control),VER(0,0), Y, N, N, N },
diff --git a/src/glx/glxextensions.h b/src/glx/glxextensions.h
index 0af28a2dde..c6428d46b4 100644
--- a/src/glx/glxextensions.h
+++ b/src/glx/glxextensions.h
@@ -67,7 +67,6 @@ enum
SGIS_multisample_bit,
SGIX_fbconfig_bit,
SGIX_pbuffer_bit,
-   SGIX_swap_group_bit,
SGIX_visual_select_group_bit,
SGI_make_current_read_bit,
SGI_swap_control_bit,

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

Mesa (master): glx: remove empty GLX_SGIX_swap_barrier stubs

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Mon Mar  5 18:25:16 2018 +

glx: remove empty GLX_SGIX_swap_barrier stubs

The extension was never implemented. Quick search suggests:
 - no actual users (on my Arch setup)
 - the Nvidia driver does not implement the extension

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Acked-by: Ian Romanick <ian.d.roman...@intel.com>
Acked-by: Brian Paul <bri...@vmware.com>
Reviewed-by: Adam Jackson <a...@redhat.com>

---

 src/glx/apple/glx_empty.c | 21 -
 src/glx/glxcmds.c | 25 -
 src/glx/glxextensions.c   |  1 -
 src/glx/glxextensions.h   |  1 -
 4 files changed, 48 deletions(-)

diff --git a/src/glx/apple/glx_empty.c b/src/glx/apple/glx_empty.c
index 33fffb5f61..427c3a5935 100644
--- a/src/glx/apple/glx_empty.c
+++ b/src/glx/apple/glx_empty.c
@@ -62,27 +62,6 @@ glXJoinSwapGroupSGIX(Display * dpy, GLXDrawable drawable, 
GLXDrawable member)
 
 
 /*
-** GLX_SGIX_swap_barrier
-*/
-void
-glXBindSwapBarrierSGIX(Display * dpy, GLXDrawable drawable, int barrier)
-{
-   (void) dpy;
-   (void) drawable;
-   (void) barrier;
-}
-
-Bool
-glXQueryMaxSwapBarriersSGIX(Display * dpy, int screen, int *max)
-{
-   (void) dpy;
-   (void) screen;
-   (void) max;
-   return False;
-}
-
-
-/*
 ** GLX_OML_sync_control
 */
 Bool
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index 943b81754f..57af039d1b 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -2050,27 +2050,6 @@ __glXJoinSwapGroupSGIX(Display * dpy, GLXDrawable 
drawable,
 
 
 /*
-** GLX_SGIX_swap_barrier
-*/
-static void
-__glXBindSwapBarrierSGIX(Display * dpy, GLXDrawable drawable, int barrier)
-{
-   (void) dpy;
-   (void) drawable;
-   (void) barrier;
-}
-
-static Bool
-__glXQueryMaxSwapBarriersSGIX(Display * dpy, int screen, int *max)
-{
-   (void) dpy;
-   (void) screen;
-   (void) max;
-   return False;
-}
-
-
-/*
 ** GLX_OML_sync_control
 */
 static Bool
@@ -2544,10 +2523,6 @@ static const struct name_address_pair GLX_functions[] = {
/*** GLX_SGIX_swap_group ***/
GLX_FUNCTION2(glXJoinSwapGroupSGIX, __glXJoinSwapGroupSGIX),
 
-   /*** GLX_SGIX_swap_barrier ***/
-   GLX_FUNCTION2(glXBindSwapBarrierSGIX, __glXBindSwapBarrierSGIX),
-   GLX_FUNCTION2(glXQueryMaxSwapBarriersSGIX, __glXQueryMaxSwapBarriersSGIX),
-
/*** GLX_MESA_copy_sub_buffer ***/
GLX_FUNCTION2(glXCopySubBufferMESA, __glXCopySubBufferMESA),
 
diff --git a/src/glx/glxextensions.c b/src/glx/glxextensions.c
index af6ffbf660..de015f2546 100644
--- a/src/glx/glxextensions.c
+++ b/src/glx/glxextensions.c
@@ -161,7 +161,6 @@ static const struct extension_info known_glx_extensions[] = 
{
{ GLX(SGIS_multisample),VER(0,0), Y, Y, N, N },
{ GLX(SGIX_fbconfig),   VER(1,3), Y, Y, N, N },
{ GLX(SGIX_pbuffer),VER(1,3), Y, Y, N, N },
-   { GLX(SGIX_swap_barrier),   VER(0,0), N, N, N, N },
{ GLX(SGIX_swap_group), VER(0,0), N, N, N, N },
{ GLX(SGIX_visual_select_group),VER(0,0), Y, Y, N, N },
{ GLX(SGI_make_current_read),   VER(1,3), Y, N, N, N },
diff --git a/src/glx/glxextensions.h b/src/glx/glxextensions.h
index d73128bd0e..0af28a2dde 100644
--- a/src/glx/glxextensions.h
+++ b/src/glx/glxextensions.h
@@ -67,7 +67,6 @@ enum
SGIS_multisample_bit,
SGIX_fbconfig_bit,
SGIX_pbuffer_bit,
-   SGIX_swap_barrier_bit,
SGIX_swap_group_bit,
SGIX_visual_select_group_bit,
SGI_make_current_read_bit,

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

Mesa (master): vulkan: autotools: do not redirect stdin/stdout for wayland-scanner

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Thu Mar  8 17:08:45 2018 +

vulkan: autotools: do not redirect stdin/stdout for wayland-scanner

The tool accepts the input and output files as arguments.
There's no need for the redirection.

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Dylan Baker <dy...@pnwbakers.com>

---

 src/vulkan/Makefile.am | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am
index cbffd769fa..e6d4277f92 100644
--- a/src/vulkan/Makefile.am
+++ b/src/vulkan/Makefile.am
@@ -64,21 +64,21 @@ WL_DRM_XML = 
$(top_srcdir)/src/egl/wayland/wayland-drm/wayland-drm.xml
 
 wsi/wayland-drm-protocol.c : $(WL_DRM_XML)
$(MKDIR_GEN)
-   $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
+   $(AM_V_GEN)$(WAYLAND_SCANNER) code $< $@
 
 wsi/wayland-drm-client-protocol.h : $(WL_DRM_XML)
$(MKDIR_GEN)
-   $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
+   $(AM_V_GEN)$(WAYLAND_SCANNER) client-header $< $@
 
 WL_DMABUF_XML = 
$(WAYLAND_PROTOCOLS_DATADIR)/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml
 
 wsi/linux-dmabuf-unstable-v1-protocol.c : $(WL_DMABUF_XML)
$(MKDIR_GEN)
-   $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
+   $(AM_V_GEN)$(WAYLAND_SCANNER) code $< $@
 
 wsi/linux-dmabuf-unstable-v1-client-protocol.h : $(WL_DMABUF_XML)
$(MKDIR_GEN)
-   $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
+   $(AM_V_GEN)$(WAYLAND_SCANNER) client-header $< $@
 
 if HAVE_PLATFORM_WAYLAND
 wsi/linux-dmabuf-unstable-v1-protocol.lo: 
wsi/linux-dmabuf-unstable-v1-client-protocol.h

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

Mesa (master): wayland-drm: autotools: do not redirect stdin/stdout for wayland-scanner

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Thu Mar  8 17:07:39 2018 +

wayland-drm: autotools: do not redirect stdin/stdout for wayland-scanner

The tool accepts the input and output files as arguments.
There's no need for the redirection.

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Dylan Baker <dy...@pnwbakers.com>

---

 src/egl/wayland/wayland-drm/Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/egl/wayland/wayland-drm/Makefile.am 
b/src/egl/wayland/wayland-drm/Makefile.am
index 7d1db23f4b..c10c4349d4 100644
--- a/src/egl/wayland/wayland-drm/Makefile.am
+++ b/src/egl/wayland/wayland-drm/Makefile.am
@@ -18,10 +18,10 @@ BUILT_SOURCES = wayland-drm-protocol.c \
 CLEANFILES = $(BUILT_SOURCES)
 
 %-protocol.c : %.xml
-   $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
+   $(AM_V_GEN)$(WAYLAND_SCANNER) code $< $@
 
 %-server-protocol.h : %.xml
-   $(AM_V_GEN)$(WAYLAND_SCANNER) server-header < $< > $@
+   $(AM_V_GEN)$(WAYLAND_SCANNER) server-header $< $@
 
 %-client-protocol.h : %.xml
-   $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
+   $(AM_V_GEN)$(WAYLAND_SCANNER) client-header $< $@

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

Mesa (master): gallium/util: use sockets on PIPE_OS_UNIX in u_network

[Emil Velikov]

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

Author: Jonathan Gray 
Date:   Wed Feb 28 21:21:14 2018 +1100

gallium/util: use sockets on PIPE_OS_UNIX in u_network

Instead of listing all the UNIX PIPE_OS platforms just use
PIPE_OS_UNIX.  Makes BSD sockets available on PIPE_OS_BSD.

Signed-off-by: Jonathan Gray 
Reviewed-by: Brian Paul 

---

 src/gallium/auxiliary/util/u_network.c | 9 +++--
 src/gallium/auxiliary/util/u_network.h | 5 +
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_network.c 
b/src/gallium/auxiliary/util/u_network.c
index 203205dc62..e74293bb10 100644
--- a/src/gallium/auxiliary/util/u_network.c
+++ b/src/gallium/auxiliary/util/u_network.c
@@ -9,8 +9,7 @@
 #  include 
 #  include 
 #  include 
-#elif defined(PIPE_OS_LINUX) || defined(PIPE_OS_HAIKU) || \
-   defined(PIPE_OS_APPLE) || defined(PIPE_OS_CYGWIN) || 
defined(PIPE_OS_SOLARIS)
+#elif defined(PIPE_OS_UNIX)
 #  include 
 #  include 
 #  include 
@@ -58,8 +57,7 @@ u_socket_close(int s)
if (s < 0)
   return;
 
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_HAIKU) \
-|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_SOLARIS)
+#if defined(PIPE_OS_UNIX)
shutdown(s, SHUT_RDWR);
close(s);
 #elif defined(PIPE_SUBSYSTEM_WINDOWS_USER)
@@ -181,8 +179,7 @@ u_socket_listen_on_port(uint16_t portnum)
 void
 u_socket_block(int s, boolean block)
 {
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_HAIKU) \
-|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_SOLARIS)
+#if defined(PIPE_OS_UNIX)
int old = fcntl(s, F_GETFL, 0);
if (old == -1)
   return;
diff --git a/src/gallium/auxiliary/util/u_network.h 
b/src/gallium/auxiliary/util/u_network.h
index 61fe9a3c60..2b7ce3f4bd 100644
--- a/src/gallium/auxiliary/util/u_network.h
+++ b/src/gallium/auxiliary/util/u_network.h
@@ -4,10 +4,7 @@
 
 #include "pipe/p_compiler.h"
 
-#if defined(PIPE_SUBSYSTEM_WINDOWS_USER)
-#  define PIPE_HAVE_SOCKETS
-#elif defined(PIPE_OS_LINUX) || defined(PIPE_OS_HAIKU) || \
-defined(PIPE_OS_APPLE) || defined(PIPE_OS_SOLARIS)
+#if defined(PIPE_SUBSYSTEM_WINDOWS_USER) || defined(PIPE_OS_UNIX)
 #  define PIPE_HAVE_SOCKETS
 #endif
 

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

Mesa (master): util: use clock_gettime() on PIPE_OS_BSD

[Emil Velikov]

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

Author: Jonathan Gray 
Date:   Wed Feb 28 21:19:19 2018 +1100

util: use clock_gettime() on PIPE_OS_BSD

OpenBSD, FreeBSD, NetBSD and DragonFlyBSD all have clock_gettime()
so use it when PIPE_OS_BSD is defined.

Signed-off-by: Jonathan Gray 
Reviewed-by: Brian Paul 

---

 src/util/os_time.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util/os_time.c b/src/util/os_time.c
index 72dc7e49c0..ac488b2287 100644
--- a/src/util/os_time.c
+++ b/src/util/os_time.c
@@ -55,7 +55,7 @@
 int64_t
 os_time_get_nano(void)
 {
-#if defined(PIPE_OS_LINUX)
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD)
 
struct timespec tv;
clock_gettime(CLOCK_MONOTONIC, );

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

Mesa (master): docs: add release notes for 17.3.6

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Tue Feb 27 00:18:33 2018 +

docs: add release notes for 17.3.6

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
(cherry picked from commit b3e5a3f35bfe5b69758ceb90f93fffbee01a5682)

---

 docs/relnotes/17.3.6.html | 83 +++
 1 file changed, 83 insertions(+)

diff --git a/docs/relnotes/17.3.6.html b/docs/relnotes/17.3.6.html
new file mode 100644
index 00..4d92a5033d
--- /dev/null
+++ b/docs/relnotes/17.3.6.html
@@ -0,0 +1,83 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+  
+  Mesa Release Notes
+  
+
+
+
+
+  The Mesa 3D Graphics Library
+
+
+
+
+
+Mesa 17.3.5 Release Notes / February 19, 2018
+
+
+Mesa 17.3.6 is a bug fix release which fixes bugs found since the 17.3.5 
release.
+
+
+Mesa 17.3.6 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
+4.5 is only available if requested at context creation
+because compatibility contexts are not supported.
+
+
+
+SHA256 checksums
+
+TBD
+
+
+New features
+None
+
+
+Bug fixes
+
+
+
+https://bugs.freedesktop.org/show_bug.cgi?id=104383;>Bug 
104383 - [KBL] Intel GPU hang with firefox
+
+https://bugs.freedesktop.org/show_bug.cgi?id=104411;>Bug 
104411 - [CCS] lemonbar-xft GPU hang
+
+https://bugs.freedesktop.org/show_bug.cgi?id=104546;>Bug 
104546 - Crash happens when running compute pipeline after calling 
glxMakeCurrent two times
+
+
+
+
+Changes
+
+Emil Velikov (2):
+
+  docs: add sha256 checksums for 17.3.5
+  Update version to 17.3.6
+
+
+Jason Ekstrand (4):
+
+  i965/draw: Do resolves properly for textures used by TXF
+  i965: Replace draw_aux_buffer_disabled with draw_aux_usage
+  i965/draw: Set NEW_AUX_STATE when draw aux changes
+  i965: Stop disabling aux during texture preparation
+
+
+Kenneth Graunke (1):
+
+  i965: Don't disable CCS for RT dependencies when dispatching 
compute.
+
+
+Topi Pohjolainen (1):
+
+  i965: Don't try to disable render aux buffers for compute
+
+
+
+
+
+

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

Mesa (master): docs: update calendar, add news and link release notes to 17.3.6

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Tue Feb 27 00:32:14 2018 +

docs: update calendar, add news and link release notes to 17.3.6

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 docs/index.html| 6 ++
 docs/release-calendar.html | 8 +---
 docs/relnotes.html | 1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/docs/index.html b/docs/index.html
index d58f757ca3..4bbb3d36b1 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -16,6 +16,12 @@
 
 News
 
+February 26, 2018
+
+Mesa 17.3.6 is released.
+This is a bug-fix release.
+
+
 February 19, 2018
 
 Mesa 17.3.5 is released.
diff --git a/docs/release-calendar.html b/docs/release-calendar.html
index 43a2f9609c..25408c3604 100644
--- a/docs/release-calendar.html
+++ b/docs/release-calendar.html
@@ -39,13 +39,7 @@ if you'd like to nominate a patch in the next stable release.
 Notes
 
 
-17.3
-2018-02-23
-17.3.6
-Juan A. Suarez Romero
-
-
-
+17.3
 2018-03-09
 17.3.7
 Juan A. Suarez Romero
diff --git a/docs/relnotes.html b/docs/relnotes.html
index da072b6c8b..d28541ccf2 100644
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@ -21,6 +21,7 @@ The release notes summarize what's new or changed in each 
Mesa release.
 
 
 
+17.3.6 release notes
 17.3.5 release notes
 17.3.4 release notes
 17.3.3 release notes

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

Mesa (17.3): docs: add sha256 checksums for 17.3.6

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Tue Feb 27 00:28:54 2018 +

docs: add sha256 checksums for 17.3.6

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 docs/relnotes/17.3.6.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/relnotes/17.3.6.html b/docs/relnotes/17.3.6.html
index 4d92a5033d..0dd1097975 100644
--- a/docs/relnotes/17.3.6.html
+++ b/docs/relnotes/17.3.6.html
@@ -31,7 +31,9 @@ because compatibility contexts are not supported.
 
 SHA256 checksums
 
-TBD
+d5e10ea3f0d11b06d2b0b235bba372a04278c39bc0e712090bda1f61842db188  
mesa-17.3.6.tar.gz
+e5915680d44ac9d05defdec529db7459ac9edd441c9845266eff2e2d3e57fbf8  
mesa-17.3.6.tar.xz
+
 
 
 New features

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

Mesa (master): docs: add sha256 checksums for 17.3.6

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Tue Feb 27 00:28:54 2018 +

docs: add sha256 checksums for 17.3.6

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
(cherry picked from commit b00880973eeab5d29413eb8a27707f62904723ea)

---

 docs/relnotes/17.3.6.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/relnotes/17.3.6.html b/docs/relnotes/17.3.6.html
index 4d92a5033d..0dd1097975 100644
--- a/docs/relnotes/17.3.6.html
+++ b/docs/relnotes/17.3.6.html
@@ -31,7 +31,9 @@ because compatibility contexts are not supported.
 
 SHA256 checksums
 
-TBD
+d5e10ea3f0d11b06d2b0b235bba372a04278c39bc0e712090bda1f61842db188  
mesa-17.3.6.tar.gz
+e5915680d44ac9d05defdec529db7459ac9edd441c9845266eff2e2d3e57fbf8  
mesa-17.3.6.tar.xz
+
 
 
 New features

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

Mesa: tag mesa-17.3.6: mesa-17.3.6

[Emil Velikov]

Module: Mesa
Branch: refs/tags/mesa-17.3.6
Tag:4555ad612d25c7199bab8ccc5054f8d75557324c
URL:
http://cgit.freedesktop.org/mesa/mesa/tag/?id=4555ad612d25c7199bab8ccc5054f8d75557324c

Tagger: Emil Velikov <emil.l.veli...@gmail.com>
Date:   Tue Feb 27 00:22:55 2018 +

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

Mesa (17.3): Update version to 17.3.6

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Tue Feb 27 00:13:31 2018 +

Update version to 17.3.6

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 8cd5aba540..6b82ee2616 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.3.5
+17.3.6

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

Mesa (17.3): i965: Stop disabling aux during texture preparation

[Emil Velikov]

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

Author: Jason Ekstrand 
Date:   Wed Jan 24 11:51:08 2018 -0800

i965: Stop disabling aux during texture preparation

Previously, we were handling self-dependencies by marking the render
buffer and then passing disable_aux=true to prepare_texture so that it
would do a resolve.  This works but ends us up doing to much resolving
in some cases.  Specifically, if we're doing something such as mipmap
generation, this would cause us to resolve all levels of the texture if
even one of them is overlapping.

Instead, this commit makes us wait until we process the framebuffer to
do these resolves and we only resolve the slices needed for rendering.
Doing this resolve puts them into the pass-through state so, even if we
do texture using CCS_E, the CCS data will effectively be ignored and the
real surface contents read.

Reviewed-by: Kenneth Graunke 
(cherry picked from commit df13588d2176dcf4800a882d926f389667772b46)

---

 src/mesa/drivers/dri/i965/brw_draw.c  | 12 +---
 src/mesa/drivers/dri/i965/intel_mipmap_tree.c |  5 ++---
 src/mesa/drivers/dri/i965/intel_mipmap_tree.h |  3 +--
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_draw.c 
b/src/mesa/drivers/dri/i965/brw_draw.c
index a22c3c6ae6..edc8269bd7 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -443,15 +443,15 @@ brw_predraw_resolve_inputs(struct brw_context *brw, bool 
rendering,
  num_layers = INTEL_REMAINING_LAYERS;
   }
 
-  const bool disable_aux = rendering &&
+  if (rendering) {
  intel_disable_rb_aux_buffer(brw, draw_aux_buffer_disabled,
  tex_obj->mt, min_level, num_levels,
  "for sampling");
+  }
 
   intel_miptree_prepare_texture(brw, tex_obj->mt, view_format,
 min_level, num_levels,
-min_layer, num_layers,
-disable_aux);
+min_layer, num_layers);
 
   /* If any programs are using it with texelFetch, we may need to also do
* a prepare with an sRGB format to ensure texelFetch works "properly".
@@ -462,8 +462,7 @@ brw_predraw_resolve_inputs(struct brw_context *brw, bool 
rendering,
  if (txf_format != view_format) {
 intel_miptree_prepare_texture(brw, tex_obj->mt, txf_format,
   min_level, num_levels,
-  min_layer, num_layers,
-  disable_aux);
+  min_layer, num_layers);
  }
   }
 
@@ -535,8 +534,7 @@ brw_predraw_resolve_framebuffer(struct brw_context *brw,
  if (irb) {
 intel_miptree_prepare_texture(brw, irb->mt, irb->mt->surf.format,
   irb->mt_level, 1,
-  irb->mt_layer, irb->layer_count,
-  false);
+  irb->mt_layer, irb->layer_count);
  }
   }
}
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c 
b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index bed6dd7ce1..a28e4ac01e 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -2650,10 +2650,9 @@ intel_miptree_prepare_texture(struct brw_context *brw,
   struct intel_mipmap_tree *mt,
   enum isl_format view_format,
   uint32_t start_level, uint32_t num_levels,
-  uint32_t start_layer, uint32_t num_layers,
-  bool disable_aux)
+  uint32_t start_layer, uint32_t num_layers)
 {
-   enum isl_aux_usage aux_usage = disable_aux ? ISL_AUX_USAGE_NONE :
+   enum isl_aux_usage aux_usage =
   intel_miptree_texture_aux_usage(brw, mt, view_format);
bool clear_supported = aux_usage != ISL_AUX_USAGE_NONE;
 
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h 
b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
index 6135af1452..7fcf09f118 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
@@ -642,8 +642,7 @@ intel_miptree_prepare_texture(struct brw_context *brw,
   struct intel_mipmap_tree *mt,
   enum isl_format view_format,
   uint32_t start_level, uint32_t num_levels,
-  uint32_t start_layer, uint32_t num_layers,
-

Mesa (17.3): docs: add release notes for 17.3.6

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Tue Feb 27 00:18:33 2018 +

docs: add release notes for 17.3.6

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 docs/relnotes/17.3.6.html | 83 +++
 1 file changed, 83 insertions(+)

diff --git a/docs/relnotes/17.3.6.html b/docs/relnotes/17.3.6.html
new file mode 100644
index 00..4d92a5033d
--- /dev/null
+++ b/docs/relnotes/17.3.6.html
@@ -0,0 +1,83 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+  
+  Mesa Release Notes
+  
+
+
+
+
+  The Mesa 3D Graphics Library
+
+
+
+
+
+Mesa 17.3.5 Release Notes / February 19, 2018
+
+
+Mesa 17.3.6 is a bug fix release which fixes bugs found since the 17.3.5 
release.
+
+
+Mesa 17.3.6 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
+4.5 is only available if requested at context creation
+because compatibility contexts are not supported.
+
+
+
+SHA256 checksums
+
+TBD
+
+
+New features
+None
+
+
+Bug fixes
+
+
+
+https://bugs.freedesktop.org/show_bug.cgi?id=104383;>Bug 
104383 - [KBL] Intel GPU hang with firefox
+
+https://bugs.freedesktop.org/show_bug.cgi?id=104411;>Bug 
104411 - [CCS] lemonbar-xft GPU hang
+
+https://bugs.freedesktop.org/show_bug.cgi?id=104546;>Bug 
104546 - Crash happens when running compute pipeline after calling 
glxMakeCurrent two times
+
+
+
+
+Changes
+
+Emil Velikov (2):
+
+  docs: add sha256 checksums for 17.3.5
+  Update version to 17.3.6
+
+
+Jason Ekstrand (4):
+
+  i965/draw: Do resolves properly for textures used by TXF
+  i965: Replace draw_aux_buffer_disabled with draw_aux_usage
+  i965/draw: Set NEW_AUX_STATE when draw aux changes
+  i965: Stop disabling aux during texture preparation
+
+
+Kenneth Graunke (1):
+
+  i965: Don't disable CCS for RT dependencies when dispatching 
compute.
+
+
+Topi Pohjolainen (1):
+
+  i965: Don't try to disable render aux buffers for compute
+
+
+
+
+
+

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

Mesa (17.3): i965: Don't try to disable render aux buffers for compute

[Emil Velikov]

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

Author: Topi Pohjolainen 
Date:   Tue Jan 16 14:17:00 2018 +0200

i965: Don't try to disable render aux buffers for compute

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104546
Reviewed-by: Kenneth Graunke 
Signed-off-by: Topi Pohjolainen 
(cherry picked from commit ec4bb693a0175744465f272a8bcea2db043ba1bc)

---

 src/mesa/drivers/dri/i965/brw_draw.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_draw.c 
b/src/mesa/drivers/dri/i965/brw_draw.c
index 5912e021cd..8e2ced5b3e 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -486,8 +486,10 @@ brw_predraw_resolve_inputs(struct brw_context *brw, bool 
rendering)
 tex_obj = intel_texture_object(u->TexObj);
 
 if (tex_obj && tex_obj->mt) {
-   intel_disable_rb_aux_buffer(brw, tex_obj->mt, 0, ~0,
-   "as a shader image");
+   if (rendering) {
+  intel_disable_rb_aux_buffer(brw, tex_obj->mt, 0, ~0,
+  "as a shader image");
+   }
 
intel_miptree_prepare_image(brw, tex_obj->mt);
 

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

Mesa (17.3): i965/draw: Set NEW_AUX_STATE when draw aux changes

[Emil Velikov]

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

Author: Jason Ekstrand 
Date:   Tue Jan 23 23:47:26 2018 -0800

i965/draw: Set NEW_AUX_STATE when draw aux changes

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104411
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104383
Fixes: ea0d2e98ecb369ab84e78c84709c0930ea8c293a
Cc: mesa-sta...@lists.freedesktop.org
Reviewed-by: Topi Pohjolainen 
Reviewed-by: Kenneth Graunke 
(cherry picked from commit 20f70ae3858bc213e052a8434f0e637eb36203c4)

---

 src/mesa/drivers/dri/i965/brw_draw.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/brw_draw.c 
b/src/mesa/drivers/dri/i965/brw_draw.c
index 9def44cc45..a22c3c6ae6 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -557,7 +557,10 @@ brw_predraw_resolve_framebuffer(struct brw_context *brw,
  intel_miptree_render_aux_usage(brw, irb->mt, isl_format,
 blend_enabled,
 draw_aux_buffer_disabled[i]);
-  brw->draw_aux_usage[i] = aux_usage;
+  if (brw->draw_aux_usage[i] != aux_usage) {
+ brw->ctx.NewDriverState |= BRW_NEW_AUX_STATE;
+ brw->draw_aux_usage[i] = aux_usage;
+  }
 
   intel_miptree_prepare_render(brw, irb->mt, irb->mt_level,
irb->mt_layer, irb->layer_count,

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

Mesa (17.3): i965/draw: Do resolves properly for textures used by TXF

[Emil Velikov]

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

Author: Jason Ekstrand 
Date:   Tue Oct 31 16:29:22 2017 -0700

i965/draw: Do resolves properly for textures used by TXF

Reviewed-by: Iago Toral Quiroga 
Reviewed-by: Kenneth Graunke 
(cherry picked from commit 96aa5587155e7de87e80d617725cc66f6807c5d1)

---

 src/mesa/drivers/dri/i965/brw_draw.c | 41 
 1 file changed, 41 insertions(+)

diff --git a/src/mesa/drivers/dri/i965/brw_draw.c 
b/src/mesa/drivers/dri/i965/brw_draw.c
index 83ab53bd27..5912e021cd 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -40,6 +40,7 @@
 #include "swrast_setup/swrast_setup.h"
 #include "drivers/common/meta.h"
 #include "util/bitscan.h"
+#include "util/bitset.h"
 
 #include "brw_blorp.h"
 #include "brw_draw.h"
@@ -375,6 +376,20 @@ intel_disable_rb_aux_buffer(struct brw_context *brw,
return found;
 }
 
+static void
+mark_textures_used_for_txf(BITSET_WORD *used_for_txf,
+   const struct gl_program *prog)
+{
+   if (!prog)
+  return;
+
+   unsigned mask = prog->SamplersUsed & prog->info.textures_used_by_txf;
+   while (mask) {
+  int s = u_bit_scan();
+  BITSET_SET(used_for_txf, prog->SamplerUnits[s]);
+   }
+}
+
 /**
  * \brief Resolve buffers before drawing.
  *
@@ -390,6 +405,18 @@ brw_predraw_resolve_inputs(struct brw_context *brw, bool 
rendering)
memset(brw->draw_aux_buffer_disabled, 0,
   sizeof(brw->draw_aux_buffer_disabled));
 
+   BITSET_DECLARE(used_for_txf, MAX_COMBINED_TEXTURE_IMAGE_UNITS);
+   memset(used_for_txf, 0, sizeof(used_for_txf));
+   if (rendering) {
+  mark_textures_used_for_txf(used_for_txf, ctx->VertexProgram._Current);
+  mark_textures_used_for_txf(used_for_txf, ctx->TessCtrlProgram._Current);
+  mark_textures_used_for_txf(used_for_txf, ctx->TessEvalProgram._Current);
+  mark_textures_used_for_txf(used_for_txf, ctx->GeometryProgram._Current);
+  mark_textures_used_for_txf(used_for_txf, ctx->FragmentProgram._Current);
+   } else {
+  mark_textures_used_for_txf(used_for_txf, ctx->ComputeProgram._Current);
+   }
+
/* Resolve depth buffer and render cache of each enabled texture. */
int maxEnabledUnit = ctx->Texture._MaxEnabledTexImageUnit;
for (int i = 0; i <= maxEnabledUnit; i++) {
@@ -426,6 +453,20 @@ brw_predraw_resolve_inputs(struct brw_context *brw, bool 
rendering)
 min_layer, num_layers,
 disable_aux);
 
+  /* If any programs are using it with texelFetch, we may need to also do
+   * a prepare with an sRGB format to ensure texelFetch works "properly".
+   */
+  if (BITSET_TEST(used_for_txf, i)) {
+ enum isl_format txf_format =
+translate_tex_format(brw, tex_obj->_Format, GL_DECODE_EXT);
+ if (txf_format != view_format) {
+intel_miptree_prepare_texture(brw, tex_obj->mt, txf_format,
+  min_level, num_levels,
+  min_layer, num_layers,
+  disable_aux);
+ }
+  }
+
   brw_cache_flush_for_read(brw, tex_obj->mt->bo);
 
   if (tex_obj->base.StencilSampling ||

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

Mesa (17.3): i965: Don't disable CCS for RT dependencies when dispatching compute.

[Emil Velikov]

Module: Mesa
Branch: 17.3
Commit: 2475b3a56c1a3224991185b6f7527ed7c86e1dd8
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=2475b3a56c1a3224991185b6f7527ed7c86e1dd8

Author: Kenneth Graunke 
Date:   Mon Oct 23 15:46:47 2017 -0700

i965: Don't disable CCS for RT dependencies when dispatching compute.

Compute shaders don't have access to the framebuffer, so there's no
point in worrying whether a texture is bound as a render target.

This saves a bunch of resolves in GFXBench4 Manhattan 3.1, but doesn't
seem to impact performance at all, at least on Apollolake.

Reviewed-by: Jason Ekstrand 
Reviewed-by: Iago Toral Quiroga 
(cherry picked from commit 583ce96c9429e23c33daeb7025210ef73ae51688)

---

 src/mesa/drivers/dri/i965/brw_compute.c | 2 +-
 src/mesa/drivers/dri/i965/brw_context.h | 2 +-
 src/mesa/drivers/dri/i965/brw_draw.c| 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_compute.c 
b/src/mesa/drivers/dri/i965/brw_compute.c
index c1b2df590b..9be7523bab 100644
--- a/src/mesa/drivers/dri/i965/brw_compute.c
+++ b/src/mesa/drivers/dri/i965/brw_compute.c
@@ -177,7 +177,7 @@ brw_dispatch_compute_common(struct gl_context *ctx)
 
brw_validate_textures(brw);
 
-   brw_predraw_resolve_inputs(brw);
+   brw_predraw_resolve_inputs(brw, false);
 
/* Flush the batch if the batch/state buffers are nearly full.  We can
 * grow them if needed, but this is not free, so we'd like to avoid it.
diff --git a/src/mesa/drivers/dri/i965/brw_context.h 
b/src/mesa/drivers/dri/i965/brw_context.h
index d6f2ed501f..386765b7f6 100644
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -1244,7 +1244,7 @@ void intel_update_renderbuffers(__DRIcontext *context,
 __DRIdrawable *drawable);
 void intel_prepare_render(struct brw_context *brw);
 
-void brw_predraw_resolve_inputs(struct brw_context *brw);
+void brw_predraw_resolve_inputs(struct brw_context *brw, bool rendering);
 
 void intel_resolve_for_dri2_flush(struct brw_context *brw,
   __DRIdrawable *drawable);
diff --git a/src/mesa/drivers/dri/i965/brw_draw.c 
b/src/mesa/drivers/dri/i965/brw_draw.c
index 19def47d09..83ab53bd27 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -382,7 +382,7 @@ intel_disable_rb_aux_buffer(struct brw_context *brw,
  * enabled depth texture, and flush the render cache for any dirty textures.
  */
 void
-brw_predraw_resolve_inputs(struct brw_context *brw)
+brw_predraw_resolve_inputs(struct brw_context *brw, bool rendering)
 {
struct gl_context *ctx = >ctx;
struct intel_texture_object *tex_obj;
@@ -417,7 +417,7 @@ brw_predraw_resolve_inputs(struct brw_context *brw)
  num_layers = INTEL_REMAINING_LAYERS;
   }
 
-  const bool disable_aux =
+  const bool disable_aux = rendering &&
  intel_disable_rb_aux_buffer(brw, tex_obj->mt, min_level, num_levels,
  "for sampling");
 
@@ -697,7 +697,7 @@ brw_prepare_drawing(struct gl_context *ctx,
 * and finalizing textures but before setting up any hardware state for
 * this draw call.
 */
-   brw_predraw_resolve_inputs(brw);
+   brw_predraw_resolve_inputs(brw, true);
brw_predraw_resolve_framebuffer(brw);
 
/* Bind all inputs, derive varying and size information:

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

Mesa (17.3): i965: Replace draw_aux_buffer_disabled with draw_aux_usage

[Emil Velikov]

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

Author: Jason Ekstrand 
Date:   Tue Jan 23 23:13:10 2018 -0800

i965: Replace draw_aux_buffer_disabled with draw_aux_usage

Instead of keeping an array of booleans, we now hang onto an array of
isl_aux_usage enums.  This means that the thing we are passing from
brw_draw.c to surface state setup is the thing that surface state setup
actually needs instead of an input to compute what it needs.

Cc: mesa-sta...@lists.freedesktop.org
Reviewed-by: Topi Pohjolainen 
Reviewed-by: Kenneth Graunke 
(cherry picked from commit e52a9f18d69c94b7cb7f81361cdb9e2582c3d742)

---

 src/mesa/drivers/dri/i965/brw_compute.c  |  2 +-
 src/mesa/drivers/dri/i965/brw_context.h  | 15 +--
 src/mesa/drivers/dri/i965/brw_draw.c | 32 
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 13 +++---
 4 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_compute.c 
b/src/mesa/drivers/dri/i965/brw_compute.c
index 9be7523bab..5ce899bcbc 100644
--- a/src/mesa/drivers/dri/i965/brw_compute.c
+++ b/src/mesa/drivers/dri/i965/brw_compute.c
@@ -177,7 +177,7 @@ brw_dispatch_compute_common(struct gl_context *ctx)
 
brw_validate_textures(brw);
 
-   brw_predraw_resolve_inputs(brw, false);
+   brw_predraw_resolve_inputs(brw, false, NULL);
 
/* Flush the batch if the batch/state buffers are nearly full.  We can
 * grow them if needed, but this is not free, so we'd like to avoid it.
diff --git a/src/mesa/drivers/dri/i965/brw_context.h 
b/src/mesa/drivers/dri/i965/brw_context.h
index 386765b7f6..7e57c3660c 100644
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -1210,15 +1210,11 @@ struct brw_context
 
struct brw_fast_clear_state *fast_clear_state;
 
-   /* Array of flags telling if auxiliary buffer is disabled for corresponding
-* renderbuffer. If draw_aux_buffer_disabled[i] is set then use of
-* auxiliary buffer for gl_framebuffer::_ColorDrawBuffers[i] is
-* disabled.
-* This is needed in case the same underlying buffer is also configured
-* to be sampled but with a format that the sampling engine can't treat
-* compressed or fast cleared.
+   /* Array of aux usages to use for drawing.  Aux usage for render targets is
+* a bit more complex than simply calling a single function so we need some
+* way of passing it form brw_draw.c to surface state setup.
 */
-   bool draw_aux_buffer_disabled[MAX_DRAW_BUFFERS];
+   enum isl_aux_usage draw_aux_usage[MAX_DRAW_BUFFERS];
 
__DRIcontext *driContext;
struct intel_screen *screen;
@@ -1244,7 +1240,8 @@ void intel_update_renderbuffers(__DRIcontext *context,
 __DRIdrawable *drawable);
 void intel_prepare_render(struct brw_context *brw);
 
-void brw_predraw_resolve_inputs(struct brw_context *brw, bool rendering);
+void brw_predraw_resolve_inputs(struct brw_context *brw, bool rendering,
+bool *draw_aux_buffer_disabled);
 
 void intel_resolve_for_dri2_flush(struct brw_context *brw,
   __DRIdrawable *drawable);
diff --git a/src/mesa/drivers/dri/i965/brw_draw.c 
b/src/mesa/drivers/dri/i965/brw_draw.c
index 8e2ced5b3e..9def44cc45 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -345,6 +345,7 @@ brw_merge_inputs(struct brw_context *brw,
  */
 static bool
 intel_disable_rb_aux_buffer(struct brw_context *brw,
+bool *draw_aux_buffer_disabled,
 struct intel_mipmap_tree *tex_mt,
 unsigned min_level, unsigned num_levels,
 const char *usage)
@@ -364,7 +365,7 @@ intel_disable_rb_aux_buffer(struct brw_context *brw,
   if (irb && irb->mt->bo == tex_mt->bo &&
   irb->mt_level >= min_level &&
   irb->mt_level < min_level + num_levels) {
- found = brw->draw_aux_buffer_disabled[i] = true;
+ found = draw_aux_buffer_disabled[i] = true;
   }
}
 
@@ -397,14 +398,12 @@ mark_textures_used_for_txf(BITSET_WORD *used_for_txf,
  * enabled depth texture, and flush the render cache for any dirty textures.
  */
 void
-brw_predraw_resolve_inputs(struct brw_context *brw, bool rendering)
+brw_predraw_resolve_inputs(struct brw_context *brw, bool rendering,
+   bool *draw_aux_buffer_disabled)
 {
struct gl_context *ctx = >ctx;
struct intel_texture_object *tex_obj;
 
-   memset(brw->draw_aux_buffer_disabled, 0,
-  sizeof(brw->draw_aux_buffer_disabled));
-
BITSET_DECLARE(used_for_txf, MAX_COMBINED_TEXTURE_IMAGE_UNITS);
memset(used_for_txf, 0, 

Mesa (master): swr: remove dead LLVM code paths

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Tue Feb 20 18:01:24 2018 +

swr: remove dead LLVM code paths

LLVM requirement was bumped to 4.0.0 with earlier commit.
Hence any code tailored for older versions is now unreachable.

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-By: George Kyriazis <george.kyria...@intel.com>
Reviewed-by: Andres Gomez <ago...@igalia.com>

---

 .../drivers/swr/rasterizer/jitter/JitManager.cpp  | 19 ---
 .../drivers/swr/rasterizer/jitter/builder_mem.cpp |  5 -
 src/gallium/drivers/swr/rasterizer/jitter/jit_pch.hpp |  4 
 3 files changed, 28 deletions(-)

diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp 
b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
index 8092c14402..ab7c6eb15b 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
+++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
@@ -71,11 +71,6 @@ JitManager::JitManager(uint32_t simdWidth, const char *arch, 
const char* core)
 tOpts.NoInfsFPMath = false;
 tOpts.NoNaNsFPMath = false;
 tOpts.UnsafeFPMath = false;
-#if defined(_DEBUG)
-#if LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR < 7
-tOpts.NoFramePointerElim = true;
-#endif
-#endif
 
 //tOpts.PrintMachineCode= true;
 
@@ -249,15 +244,9 @@ DIType* JitManager::GetDebugType(Type* pTy)
 switch (id)
 {
 case Type::VoidTyID: return builder.createUnspecifiedType("void"); break;
-#if LLVM_VERSION_MAJOR >= 4
 case Type::HalfTyID: return builder.createBasicType("float16", 16, 
dwarf::DW_ATE_float); break;
 case Type::FloatTyID: return builder.createBasicType("float", 32, 
dwarf::DW_ATE_float); break;
 case Type::DoubleTyID: return builder.createBasicType("double", 64, 
dwarf::DW_ATE_float); break;
-#else  
-case Type::HalfTyID: return builder.createBasicType("float16", 16, 0, 
dwarf::DW_ATE_float); break;
-case Type::FloatTyID: return builder.createBasicType("float", 32, 0, 
dwarf::DW_ATE_float); break;
-case Type::DoubleTyID: return builder.createBasicType("double", 64, 0, 
dwarf::DW_ATE_float); break;
-#endif  
 case Type::IntegerTyID: return GetDebugIntegerType(pTy); break;
 case Type::StructTyID: return GetDebugStructType(pTy); break;
 case Type::ArrayTyID: return GetDebugArrayType(pTy); break;
@@ -294,19 +283,11 @@ DIType* JitManager::GetDebugIntegerType(Type* pTy)
 IntegerType* pIntTy = cast(pTy);
 switch (pIntTy->getBitWidth())
 {
-#if LLVM_VERSION_MAJOR >= 4
 case 1: return builder.createBasicType("int1", 1, dwarf::DW_ATE_unsigned); 
break;
 case 8: return builder.createBasicType("int8", 8, dwarf::DW_ATE_signed); 
break;
 case 16: return builder.createBasicType("int16", 16, 
dwarf::DW_ATE_signed); break;
 case 32: return builder.createBasicType("int", 32, dwarf::DW_ATE_signed); 
break;
 case 64: return builder.createBasicType("int64", 64, 
dwarf::DW_ATE_signed); break;
-#else  
-case 1: return builder.createBasicType("int1", 1, 0, 
dwarf::DW_ATE_unsigned); break;
-case 8: return builder.createBasicType("int8", 8, 0, 
dwarf::DW_ATE_signed); break;
-case 16: return builder.createBasicType("int16", 16, 0, 
dwarf::DW_ATE_signed); break;
-case 32: return builder.createBasicType("int", 32, 0, 
dwarf::DW_ATE_signed); break;
-case 64: return builder.createBasicType("int64", 64, 0, 
dwarf::DW_ATE_signed); break;
-#endif  
 default: SWR_ASSERT(false, "Unimplemented integer bit width");
 }
 return nullptr;
diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp 
b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
index f7d0402a3d..3bba6ff04f 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
+++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
@@ -117,12 +117,7 @@ namespace SwrJit
 }
 else
 {
-// maskload intrinsic expects integer mask operand in llvm >= 3.8
-#if (LLVM_VERSION_MAJOR > 3) || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR 
>= 8)
 mask = BITCAST(mask, VectorType::get(mInt32Ty, mVWidth));
-#else
-mask = BITCAST(mask, VectorType::get(mFP32Ty, mVWidth));
-#endif
 Function *func = Intrinsic::getDeclaration(JM()->mpCurrentModule, 
Intrinsic::x86_avx_maskload_ps_256);
 vResult = BITCAST(CALL(func, { src,mask }), 
VectorType::get(mInt32Ty, mVWidth));
 }
diff --git a/src/gallium/drivers/swr/rasterizer/jitter/jit_pch.hpp 
b/src/gallium/drivers

Mesa (master): docs: add sha256 checksums for 17.3.5

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Mon Feb 19 22:07:23 2018 +

docs: add sha256 checksums for 17.3.5

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
(cherry picked from commit 164a993112cc7278d46b7ec8f7f617eb683b212c)

---

 docs/relnotes/17.3.5.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/relnotes/17.3.5.html b/docs/relnotes/17.3.5.html
index cf9536bf5b..6dc55c9be1 100644
--- a/docs/relnotes/17.3.5.html
+++ b/docs/relnotes/17.3.5.html
@@ -31,7 +31,8 @@ because compatibility contexts are not supported.
 
 SHA256 checksums
 
-TBD
+bc1ee20366aae2affc37c89228f871f438136f70252005e9f842169bde976788  
mesa-17.3.5.tar.gz
+eb9228fc8aaa71e0205c1481c5b157752ebaec9b646b030d27478e25a6d7936a  
mesa-17.3.5.tar.xz
 
 
 

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

Mesa (17.3): docs: add sha256 checksums for 17.3.5

[Emil Velikov]

Module: Mesa
Branch: 17.3
Commit: 164a993112cc7278d46b7ec8f7f617eb683b212c
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=164a993112cc7278d46b7ec8f7f617eb683b212c

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Mon Feb 19 22:07:23 2018 +

docs: add sha256 checksums for 17.3.5

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 docs/relnotes/17.3.5.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/relnotes/17.3.5.html b/docs/relnotes/17.3.5.html
index cf9536bf5b..6dc55c9be1 100644
--- a/docs/relnotes/17.3.5.html
+++ b/docs/relnotes/17.3.5.html
@@ -31,7 +31,8 @@ because compatibility contexts are not supported.
 
 SHA256 checksums
 
-TBD
+bc1ee20366aae2affc37c89228f871f438136f70252005e9f842169bde976788  
mesa-17.3.5.tar.gz
+eb9228fc8aaa71e0205c1481c5b157752ebaec9b646b030d27478e25a6d7936a  
mesa-17.3.5.tar.xz
 
 
 

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

Mesa (master): docs: update calendar, add news and link release notes to 17.3.5

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Mon Feb 19 22:10:18 2018 +

docs: update calendar, add news and link release notes to 17.3.5

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 docs/index.html| 6 ++
 docs/release-calendar.html | 4 ++--
 docs/relnotes.html | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/index.html b/docs/index.html
index 4fca33b361..d58f757ca3 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -16,6 +16,12 @@
 
 News
 
+February 19, 2018
+
+Mesa 17.3.5 is released.
+This is a bug-fix release.
+
+
 February 15, 2018
 
 Mesa 17.3.4 is released.
diff --git a/docs/release-calendar.html b/docs/release-calendar.html
index b9208324b9..43a2f9609c 100644
--- a/docs/release-calendar.html
+++ b/docs/release-calendar.html
@@ -41,13 +41,13 @@ if you'd like to nominate a patch in the next stable 
release.
 
 17.3
 2018-02-23
-17.3.5
+17.3.6
 Juan A. Suarez Romero
 
 
 
 2018-03-09
-17.3.6
+17.3.7
 Juan A. Suarez Romero
 Final planned release for the 17.3 series
 
diff --git a/docs/relnotes.html b/docs/relnotes.html
index 60aa262f94..da072b6c8b 100644
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@ -21,6 +21,7 @@ The release notes summarize what's new or changed in each 
Mesa release.
 
 
 
+17.3.5 release notes
 17.3.4 release notes
 17.3.3 release notes
 17.3.2 release notes

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

Mesa (master): docs: add release notes for 17.3.5

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Mon Feb 19 22:01:35 2018 +

docs: add release notes for 17.3.5

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
(cherry picked from commit 2529d77179065b983d69c620c7f71281aefe4f98)

---

 docs/relnotes/17.3.5.html | 65 +++
 1 file changed, 65 insertions(+)

diff --git a/docs/relnotes/17.3.5.html b/docs/relnotes/17.3.5.html
new file mode 100644
index 00..cf9536bf5b
--- /dev/null
+++ b/docs/relnotes/17.3.5.html
@@ -0,0 +1,65 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+  
+  Mesa Release Notes
+  
+
+
+
+
+  The Mesa 3D Graphics Library
+
+
+
+
+
+Mesa 17.3.5 Release Notes / February 19, 2018
+
+
+Mesa 17.3.5 is a bug fix release which fixes bugs found since the 17.3.4 
release.
+
+
+Mesa 17.3.5 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
+4.5 is only available if requested at context creation
+because compatibility contexts are not supported.
+
+
+
+SHA256 checksums
+
+TBD
+
+
+
+New features
+None
+
+
+Bug fixes
+
+
+
+
+
+
+Changes
+
+Emil Velikov (2):
+
+  docs: add sha256 checksums for 17.3.4
+  Update version to 17.3.5
+
+
+James Legg (1):
+
+  ac/nir: Fix conflict resolution typo in handle_vs_input_decl
+
+
+
+
+
+

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

Mesa: tag mesa-17.3.5: mesa-17.3.5

[Emil Velikov]

Module: Mesa
Branch: refs/tags/mesa-17.3.5
Tag:80702fd89a02bab606c38d81fa93d2c2491eee88
URL:
http://cgit.freedesktop.org/mesa/mesa/tag/?id=80702fd89a02bab606c38d81fa93d2c2491eee88

Tagger: Emil Velikov <emil.l.veli...@gmail.com>
Date:   Mon Feb 19 22:05:36 2018 +

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

Mesa (17.3): ac/nir: Fix conflict resolution typo in handle_vs_input_decl

[Emil Velikov]

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

Author: James Legg <jl...@feralinteractive.com>
Date:   Tue Feb 13 16:05:54 2018 +

ac/nir: Fix conflict resolution typo in handle_vs_input_decl

Fixes ad764e365beb8a119369b97f5cb95fc7ea8c:
"ac/nir: Use instance_rate_inputs per attribute, not per variable".

CC: <mesa-sta...@lists.freedesktop.org>
CC: Emil Velikov <emil.l.veli...@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl>

---

 src/amd/common/ac_nir_to_llvm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index dde6cbc8f5..4812debb2f 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -5117,7 +5117,7 @@ handle_vs_input_decl(struct nir_to_llvm_context *ctx,
variable->data.driver_location = idx * 4;
 
for (unsigned i = 0; i < attrib_count; ++i, ++idx) {
-   if (ctx->options->key.vs.instance_rate_inputs & (1u << (index + 
1))) {
+   if (ctx->options->key.vs.instance_rate_inputs & (1u << (index + 
i))) {
buffer_index = LLVMBuildAdd(ctx->builder, 
ctx->abi.instance_id,
ctx->abi.start_instance, 
"");
ctx->shader_info->vs.vgpr_comp_cnt =

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

Mesa (17.3): docs: add release notes for 17.3.5

[Emil Velikov]

Module: Mesa
Branch: 17.3
Commit: 2529d77179065b983d69c620c7f71281aefe4f98
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=2529d77179065b983d69c620c7f71281aefe4f98

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Mon Feb 19 22:01:35 2018 +

docs: add release notes for 17.3.5

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 docs/relnotes/17.3.5.html | 65 +++
 1 file changed, 65 insertions(+)

diff --git a/docs/relnotes/17.3.5.html b/docs/relnotes/17.3.5.html
new file mode 100644
index 00..cf9536bf5b
--- /dev/null
+++ b/docs/relnotes/17.3.5.html
@@ -0,0 +1,65 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+  
+  Mesa Release Notes
+  
+
+
+
+
+  The Mesa 3D Graphics Library
+
+
+
+
+
+Mesa 17.3.5 Release Notes / February 19, 2018
+
+
+Mesa 17.3.5 is a bug fix release which fixes bugs found since the 17.3.4 
release.
+
+
+Mesa 17.3.5 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
+4.5 is only available if requested at context creation
+because compatibility contexts are not supported.
+
+
+
+SHA256 checksums
+
+TBD
+
+
+
+New features
+None
+
+
+Bug fixes
+
+
+
+
+
+
+Changes
+
+Emil Velikov (2):
+
+  docs: add sha256 checksums for 17.3.4
+  Update version to 17.3.5
+
+
+James Legg (1):
+
+  ac/nir: Fix conflict resolution typo in handle_vs_input_decl
+
+
+
+
+
+

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

Mesa (17.3): Update version to 17.3.5

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Mon Feb 19 21:55:11 2018 +

Update version to 17.3.5

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 4abbb906a1..8cd5aba540 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.3.4
+17.3.5

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

Mesa (master): docs: correct link to the 17.3.3 release notes

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Thu Feb 15 11:33:27 2018 +

docs: correct link to the 17.3.3 release notes

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

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

diff --git a/docs/relnotes.html b/docs/relnotes.html
index 6c59782eb8..60aa262f94 100644
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@ -22,7 +22,7 @@ The release notes summarize what's new or changed in each 
Mesa release.
 
 
 17.3.4 release notes
-17.3.3 release notes
+17.3.3 release notes
 17.3.2 release notes
 17.2.8 release notes
 17.3.1 release notes

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

Mesa (master): docs: update calendar, add news and link release notes to 17.3.4

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Thu Feb 15 11:33:04 2018 +

docs: update calendar, add news and link release notes to 17.3.4

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 docs/index.html|  6 ++
 docs/release-calendar.html | 12 +++-
 docs/relnotes.html |  1 +
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/docs/index.html b/docs/index.html
index 33fc5cf5bd..4fca33b361 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -16,6 +16,12 @@
 
 News
 
+February 15, 2018
+
+Mesa 17.3.4 is released.
+This is a bug-fix release.
+
+
 January 18, 2018
 
 Mesa 17.3.3 is released.
diff --git a/docs/release-calendar.html b/docs/release-calendar.html
index 74c98023c3..b9208324b9 100644
--- a/docs/release-calendar.html
+++ b/docs/release-calendar.html
@@ -39,20 +39,14 @@ if you'd like to nominate a patch in the next stable 
release.
 Notes
 
 
-17.3
-2018-01-26
-17.3.4
-Emil Velikov
-
-
-
-2018-02-09
+17.3
+2018-02-23
 17.3.5
 Juan A. Suarez Romero
 
 
 
-2018-02-23
+2018-03-09
 17.3.6
 Juan A. Suarez Romero
 Final planned release for the 17.3 series
diff --git a/docs/relnotes.html b/docs/relnotes.html
index 94ed6146e5..6c59782eb8 100644
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@ -21,6 +21,7 @@ The release notes summarize what's new or changed in each 
Mesa release.
 
 
 
+17.3.4 release notes
 17.3.3 release notes
 17.3.2 release notes
 17.2.8 release notes

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

Mesa (17.3): docs: add sha256 checksums for 17.3.4

[Emil Velikov]

Module: Mesa
Branch: 17.3
Commit: 26c84b8af9ebdedd2df75596c25173639ed5e4b2
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=26c84b8af9ebdedd2df75596c25173639ed5e4b2

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Thu Feb 15 11:28:00 2018 +

docs: add sha256 checksums for 17.3.4

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 docs/relnotes/17.3.4.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/relnotes/17.3.4.html b/docs/relnotes/17.3.4.html
index f9db0fb93a..85157576e6 100644
--- a/docs/relnotes/17.3.4.html
+++ b/docs/relnotes/17.3.4.html
@@ -31,7 +31,8 @@ because compatibility contexts are not supported.
 
 SHA256 checksums
 
-TBD
+2d3a4c3cbc995b3e192361dce710d8c749e046e7575aa1b7d8fc9e6b4df28f84  
mesa-17.3.4.tar.gz
+71f995e233bc5df1a0dd46c980d1720106e7f82f02d61c1ca50854b5e02590d0  
mesa-17.3.4.tar.xz
 
 
 

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

Mesa (master): docs: add sha256 checksums for 17.3.4

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Thu Feb 15 11:28:00 2018 +

docs: add sha256 checksums for 17.3.4

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
(cherry picked from commit 26c84b8af9ebdedd2df75596c25173639ed5e4b2)

---

 docs/relnotes/17.3.4.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/relnotes/17.3.4.html b/docs/relnotes/17.3.4.html
index f9db0fb93a..85157576e6 100644
--- a/docs/relnotes/17.3.4.html
+++ b/docs/relnotes/17.3.4.html
@@ -31,7 +31,8 @@ because compatibility contexts are not supported.
 
 SHA256 checksums
 
-TBD
+2d3a4c3cbc995b3e192361dce710d8c749e046e7575aa1b7d8fc9e6b4df28f84  
mesa-17.3.4.tar.gz
+71f995e233bc5df1a0dd46c980d1720106e7f82f02d61c1ca50854b5e02590d0  
mesa-17.3.4.tar.xz
 
 
 

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

Mesa (master): docs: add release notes for 17.3.4

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Thu Feb 15 11:09:05 2018 +

docs: add release notes for 17.3.4

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
(cherry picked from commit 2f9820c553c943f776513ddc2887fb6b1cf0f29a)

---

 docs/relnotes/17.3.4.html | 274 ++
 1 file changed, 274 insertions(+)

diff --git a/docs/relnotes/17.3.4.html b/docs/relnotes/17.3.4.html
new file mode 100644
index 00..f9db0fb93a
--- /dev/null
+++ b/docs/relnotes/17.3.4.html
@@ -0,0 +1,274 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+  
+  Mesa Release Notes
+  
+
+
+
+
+  The Mesa 3D Graphics Library
+
+
+
+
+
+Mesa 17.3.4 Release Notes / January 15, 2018
+
+
+Mesa 17.3.4 is a bug fix release which fixes bugs found since the 17.3.3 
release.
+
+
+Mesa 17.3.4 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
+4.5 is only available if requested at context creation
+because compatibility contexts are not supported.
+
+
+
+SHA256 checksums
+
+TBD
+
+
+
+New features
+None
+
+
+Bug fixes
+
+
+
+https://bugs.freedesktop.org/show_bug.cgi?id=90311;>Bug 90311 
- Fail to build libglx with clang at linking stage
+
+https://bugs.freedesktop.org/show_bug.cgi?id=101442;>Bug 
101442 - Piglit shadersssafs-if-def-else-break fails with sb but 
passes with R600_DEBUG=nosb
+
+https://bugs.freedesktop.org/show_bug.cgi?id=102435;>Bug 
102435 - [skl,kbl] [drm] GPU HANG: ecode 9:0:0x86df7cf9, in csgo_linux64 
[4947], reason: Hang on rcs, action: reset
+
+https://bugs.freedesktop.org/show_bug.cgi?id=103006;>Bug 
103006 - [OpenGL CTS] [HSW] 
KHR-GL45.vertex_attrib_binding.basic-inputL-case1
+
+https://bugs.freedesktop.org/show_bug.cgi?id=103626;>Bug 
103626 - [SNB] ES3-CTS.functional.shaders.precision
+
+https://bugs.freedesktop.org/show_bug.cgi?id=104163;>Bug 
104163 - [GEN9+] 2-3% perf drop in GfxBench Manhattan 3.1 from i965: 
Disable regular fast-clears (CCS_D) on gen9+
+
+https://bugs.freedesktop.org/show_bug.cgi?id=104383;>Bug 
104383 - [KBL] Intel GPU hang with firefox
+
+https://bugs.freedesktop.org/show_bug.cgi?id=104411;>Bug 
104411 - [CCS] lemonbar-xft GPU hang
+
+https://bugs.freedesktop.org/show_bug.cgi?id=104487;>Bug 
104487 - [KBL] portal2_linux GPU hang
+
+https://bugs.freedesktop.org/show_bug.cgi?id=104711;>Bug 
104711 - [skl CCS] Oxenfree (unity engine game) hangs GPU
+
+https://bugs.freedesktop.org/show_bug.cgi?id=104741;>Bug 
104741 - Graphic corruption for Android apps Telegram and KineMaster
+
+https://bugs.freedesktop.org/show_bug.cgi?id=104745;>Bug 
104745 - HEVC VDPAU decoding broken on RX 460 with UVD Firmware v1.130
+
+https://bugs.freedesktop.org/show_bug.cgi?id=104818;>Bug 
104818 - mesa fails to build on ia64
+
+
+
+
+Changes
+
+Andres Gomez (1):
+
+  i965: perform 2 uploads with dual slot *64*PASSTHRU formats on 
gen8
+
+
+Bas Nieuwenhuizen (10):
+
+  radv: Fix ordering issue in meta memory allocation failure path.
+  radv: Fix memory allocation failure path in compute resolve init.
+  radv: Fix freeing meta state if the device pipeline cache fails to 
allocate.
+  radv: Fix fragment resolve init memory allocation failure paths.
+  radv: Fix bufimage failure deallocation.
+  radv: Init variant entry with memset.
+  radv: Don't allow 3d or 1d depth/stencil textures.
+  ac/nir: Use instance_rate_inputs per attribute, not per variable.
+  ac/nir: Use correct 32-bit component writemask for 64-bit SSBO 
stores.
+  ac/nir: Fix vector extraction if source vector has 4 elements.
+
+
+Boyuan Zhang (2):
+
+  radeon/vcn: add and manage render picture list
+  radeon/uvd: add and manage render picture list
+
+
+Chuck Atkins (1):
+
+  configure.ac: add missing llvm dependencies to .pc files
+
+
+Dave Airlie (10):
+
+  r600/sb: fix a bug emitting ar load from a constant.
+  ac/nir: account for view index in the user sgpr allocation.
+  radv: add fs_key meta format support to resolve passes.
+  radv: don't use hw resolve for integer image formats
+  radv: don't use hw resolves for r16g16 norm formats.
+  radv: move spi_baryc_cntl to pipeline
+  r600/sb: insert the else clause when we might depart from a loop
+  radv: don't enable tc compat for d32s8 + 4/8 samples (v1.1)
+  radv/gfx9: fix block compression texture views. (v2)
+  virgl: also remove dimension on indirect.
+
+
+Eleni Maria Stea (1):
+
+  mesa: Fix function pointers initialization in status tracker
+
+
+Emil Velikov (18):
+
+  cherry-ignore: i965: Accept CONTEXT_ATTRIB_PRIORITY for 
brwCreateContext
+  cherry-ignore: swr: refactor swr_create_

Mesa: tag mesa-17.3.4: mesa-17.3.4

[Emil Velikov]

Module: Mesa
Branch: refs/tags/mesa-17.3.4
Tag:b2e776ee0c9bb8ee6ec35ef4e4c36306385a9b6e
URL:
http://cgit.freedesktop.org/mesa/mesa/tag/?id=b2e776ee0c9bb8ee6ec35ef4e4c36306385a9b6e

Tagger: Emil Velikov <emil.l.veli...@gmail.com>
Date:   Thu Feb 15 11:16:50 2018 +

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

Mesa (17.3): docs: add release notes for 17.3.4

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Thu Feb 15 11:09:05 2018 +

docs: add release notes for 17.3.4

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 docs/relnotes/17.3.4.html | 274 ++
 1 file changed, 274 insertions(+)

diff --git a/docs/relnotes/17.3.4.html b/docs/relnotes/17.3.4.html
new file mode 100644
index 00..f9db0fb93a
--- /dev/null
+++ b/docs/relnotes/17.3.4.html
@@ -0,0 +1,274 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+  
+  Mesa Release Notes
+  
+
+
+
+
+  The Mesa 3D Graphics Library
+
+
+
+
+
+Mesa 17.3.4 Release Notes / January 15, 2018
+
+
+Mesa 17.3.4 is a bug fix release which fixes bugs found since the 17.3.3 
release.
+
+
+Mesa 17.3.4 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
+4.5 is only available if requested at context creation
+because compatibility contexts are not supported.
+
+
+
+SHA256 checksums
+
+TBD
+
+
+
+New features
+None
+
+
+Bug fixes
+
+
+
+https://bugs.freedesktop.org/show_bug.cgi?id=90311;>Bug 90311 
- Fail to build libglx with clang at linking stage
+
+https://bugs.freedesktop.org/show_bug.cgi?id=101442;>Bug 
101442 - Piglit shadersssafs-if-def-else-break fails with sb but 
passes with R600_DEBUG=nosb
+
+https://bugs.freedesktop.org/show_bug.cgi?id=102435;>Bug 
102435 - [skl,kbl] [drm] GPU HANG: ecode 9:0:0x86df7cf9, in csgo_linux64 
[4947], reason: Hang on rcs, action: reset
+
+https://bugs.freedesktop.org/show_bug.cgi?id=103006;>Bug 
103006 - [OpenGL CTS] [HSW] 
KHR-GL45.vertex_attrib_binding.basic-inputL-case1
+
+https://bugs.freedesktop.org/show_bug.cgi?id=103626;>Bug 
103626 - [SNB] ES3-CTS.functional.shaders.precision
+
+https://bugs.freedesktop.org/show_bug.cgi?id=104163;>Bug 
104163 - [GEN9+] 2-3% perf drop in GfxBench Manhattan 3.1 from i965: 
Disable regular fast-clears (CCS_D) on gen9+
+
+https://bugs.freedesktop.org/show_bug.cgi?id=104383;>Bug 
104383 - [KBL] Intel GPU hang with firefox
+
+https://bugs.freedesktop.org/show_bug.cgi?id=104411;>Bug 
104411 - [CCS] lemonbar-xft GPU hang
+
+https://bugs.freedesktop.org/show_bug.cgi?id=104487;>Bug 
104487 - [KBL] portal2_linux GPU hang
+
+https://bugs.freedesktop.org/show_bug.cgi?id=104711;>Bug 
104711 - [skl CCS] Oxenfree (unity engine game) hangs GPU
+
+https://bugs.freedesktop.org/show_bug.cgi?id=104741;>Bug 
104741 - Graphic corruption for Android apps Telegram and KineMaster
+
+https://bugs.freedesktop.org/show_bug.cgi?id=104745;>Bug 
104745 - HEVC VDPAU decoding broken on RX 460 with UVD Firmware v1.130
+
+https://bugs.freedesktop.org/show_bug.cgi?id=104818;>Bug 
104818 - mesa fails to build on ia64
+
+
+
+
+Changes
+
+Andres Gomez (1):
+
+  i965: perform 2 uploads with dual slot *64*PASSTHRU formats on 
gen8
+
+
+Bas Nieuwenhuizen (10):
+
+  radv: Fix ordering issue in meta memory allocation failure path.
+  radv: Fix memory allocation failure path in compute resolve init.
+  radv: Fix freeing meta state if the device pipeline cache fails to 
allocate.
+  radv: Fix fragment resolve init memory allocation failure paths.
+  radv: Fix bufimage failure deallocation.
+  radv: Init variant entry with memset.
+  radv: Don't allow 3d or 1d depth/stencil textures.
+  ac/nir: Use instance_rate_inputs per attribute, not per variable.
+  ac/nir: Use correct 32-bit component writemask for 64-bit SSBO 
stores.
+  ac/nir: Fix vector extraction if source vector has 4 elements.
+
+
+Boyuan Zhang (2):
+
+  radeon/vcn: add and manage render picture list
+  radeon/uvd: add and manage render picture list
+
+
+Chuck Atkins (1):
+
+  configure.ac: add missing llvm dependencies to .pc files
+
+
+Dave Airlie (10):
+
+  r600/sb: fix a bug emitting ar load from a constant.
+  ac/nir: account for view index in the user sgpr allocation.
+  radv: add fs_key meta format support to resolve passes.
+  radv: don't use hw resolve for integer image formats
+  radv: don't use hw resolves for r16g16 norm formats.
+  radv: move spi_baryc_cntl to pipeline
+  r600/sb: insert the else clause when we might depart from a loop
+  radv: don't enable tc compat for d32s8 + 4/8 samples (v1.1)
+  radv/gfx9: fix block compression texture views. (v2)
+  virgl: also remove dimension on indirect.
+
+
+Eleni Maria Stea (1):
+
+  mesa: Fix function pointers initialization in status tracker
+
+
+Emil Velikov (18):
+
+  cherry-ignore: i965: Accept CONTEXT_ATTRIB_PRIORITY for 
brwCreateContext
+  cherry-ignore: swr: refactor swr_create_screen to allow for proper 
cleanup on error
+  cherry-ignore: anv: add

Mesa (17.3): Update version to 17.3.4

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Thu Feb 15 11:02:49 2018 +

Update version to 17.3.4

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index d1c738c5f5..4abbb906a1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.3.3
+17.3.4

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

Mesa (17.3): 88 new commits

[Emil Velikov]

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5d961e1630c9623b40e1b7ed5756b6f1e8f46531
Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Fri Feb 9 03:43:57 2018 +

cherry-ignore: add a few more meson fixes

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=1bf16e4fbcc861814cc95865ba59e1c025bb7278
Author: Roland Scheidegger <srol...@vmware.com>
Date:   Tue Jan 30 05:48:27 2018 +0100

r600: don't do stack workarounds for hemlock

By the looks of it it seems hemlock is treated separately to cypress, but
certainly it won't need the stack workarounds cedar/redwood (and
seemingly every other eg chip except cypress/juniper) need.
(Discovered by accident.)

Acked-by: Alex Deucher <alexander.deuc...@amd.com>
(cherry picked from commit c2f0e0885776f3f0a18b9db08149564d4b98e5b7)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=70604e880876ff6f7216623e196e0d34d1b2fae6
Author: Jon Turney <jon.tur...@dronecode.org.uk>
Date:   Tue Jan 16 16:26:57 2018 +

glx/apple: locate dispatch table functions to wrap by name

Avoid reaching into the dispatch table internals (and thus having to deal
with the complexities of remap etc.) by identifying functions to wrap by
name.

See:
https://lists.freedesktop.org/archives/mesa-dev/2015-June/086721.html et 
seq.
https://bugs.freedesktop.org/show_bug.cgi?id=90311

Signed-off-by: Jon Turney <jon.tur...@dronecode.org.uk>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
(cherry picked from commit d3540b405b975450b9c2f9d8eb273be062cbf73a)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=15beac3a010176b384f3b0bd70a8ee2ca3ccc416
Author: Jon Turney <jon.tur...@dronecode.org.uk>
Date:   Sat Dec 2 17:05:43 2017 +

glx/apple: include util/debug.h for env_var_as_boolean prototype

mesa/src/glx/glxcmds.c:1295:21: error: implicit declaration of function 
'env_var_as_boolean' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
mesa/src/glx/apple/apple_visual.c:85:28: error: implicit declaration of 
function 'env_var_as_boolean' is invalid in C99 
[-Werror,-Wimplicit-function-declaration]

Signed-off-by: Jon Turney <jon.tur...@dronecode.org.uk>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
(cherry picked from commit b37b7b42dcc33d636c3db0558d032d7d95664c56)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e55ca6768ff7918dfc0ebd8dd5ef680d2e155c73
Author: Jon Turney <jon.tur...@dronecode.org.uk>
Date:   Tue Jan 16 23:27:43 2018 +

configure: Default to gbm=no on osx

Signed-off-by: Jon Turney <jon.tur...@dronecode.org.uk>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
(cherry picked from commit 7ad7a07c88b1b1c697132e8f990c0d9530fdf827)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=9f6e05d11f39012fb1fd5953e8324fac6d7951b0
Author: Igor Gnatenko <ignate...@redhat.com>
Date:   Mon Jan 1 22:49:00 2018 +0100

link mesautil with pthreads

../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function 
`u_thread_setname':
/builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:66: 
undefined reference to `pthread_setname_np'
../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function 
`thrd_join':

/builddir/build/BUILD/mesa-17.3.1/src/util/../../include/c11/threads_posix.h:336:
 undefined reference to `pthread_join'
../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function 
`u_thread_create':
/builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:48: 
undefined reference to `pthread_sigmask'
../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function 
`thrd_create':

/builddir/build/BUILD/mesa-17.3.1/src/util/../../include/c11/threads_posix.h:296:
 undefined reference to `pthread_create'
../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function 
`u_thread_create':
/builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:50: 
undefined reference to `pthread_sigmask'
/builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:50: 
undefined reference to `pthread_sigmask'
../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function 
`call_once':

/builddir/build/BUILD/mesa-17.3.1/src/util/../../include/c11/threads_posix.h:96:
 undefined reference to `pthread_once'
../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function 
`u_thread_get_time_nano':
/builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:84: 
undefined reference to `pthread_getcpuclockid'
collect2: error: ld returned 1 exit status

Reviewed-by: Adam Jackson <a...@redhat.com&

Mesa: tag mesa-18.0.0-rc4: mesa-18.0.0-rc4

[Emil Velikov]

Module: Mesa
Branch: refs/tags/mesa-18.0.0-rc4
Tag:253f1cc87c099227e81a144b054dae6410c8a727
URL:
http://cgit.freedesktop.org/mesa/mesa/tag/?id=253f1cc87c099227e81a144b054dae6410c8a727

Tagger: Emil Velikov <emil.l.veli...@gmail.com>
Date:   Fri Feb  9 02:20:39 2018 +

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

Mesa (18.0): 41 new commits

[Emil Velikov]

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=1e1734634bf2e5f6d16953dbf416cd9afdf4a145
Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Fri Feb 9 02:15:14 2018 +

Update version to 18.0.0-rc4

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=0c0d6d77512fa0fb462728bbd6cfee726570efa3
Author: Roland Scheidegger <srol...@vmware.com>
Date:   Tue Jan 30 05:48:27 2018 +0100

r600: don't do stack workarounds for hemlock

By the looks of it it seems hemlock is treated separately to cypress, but
certainly it won't need the stack workarounds cedar/redwood (and
seemingly every other eg chip except cypress/juniper) need.
(Discovered by accident.)

Acked-by: Alex Deucher <alexander.deuc...@amd.com>
(cherry picked from commit c2f0e0885776f3f0a18b9db08149564d4b98e5b7)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f90ba6c1e080f8909d0aa7e4d6e574c0d2706e01
Author: Jon Turney <jon.tur...@dronecode.org.uk>
Date:   Thu Jan 18 13:05:06 2018 +

travis: add osx autotools build

Signed-off-by: Jon Turney <jon.tur...@dronecode.org.uk>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
(cherry picked from commit b3a1d9588eaa486a01c3a2964d69540a4bf45818)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f009ba1fd7c57c83e6a4caea86dc770cd18cbed8
Author: Jon Turney <jon.tur...@dronecode.org.uk>
Date:   Thu Feb 1 15:23:49 2018 +

travis: pip -> pip2

On travis, for OSX, python2 from homebrew is pre-installed. per [1]:

 python points to the macOS system Python (with no manual PATH modification)
 python2 points to Homebrew’s Python 2.7.x (if installed)
 python3 points to Homebrew’s Python 3.x (if installed)
 pip doesn't exist
 pip2 points to Homebrew’s Python 2.7.x’s pip (if installed)
 pip3 points to Homebrew’s Python 3.x’s pip (if installed)

We will end up using 'python2' for building mesa.

Just use 'pip2' instead of 'pip', as that seems to work for all platforms on
travis.

[1] https://docs.brew.sh/Homebrew-and-Python.html

Signed-off-by: Jon Turney <jon.tur...@dronecode.org.uk>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
(cherry picked from commit 4701379d967f8c42fc8cffa0e1c80dc9074bb0d5)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=331bea12db37669269376cb17ebe83bb3e976585
Author: Jon Turney <jon.tur...@dronecode.org.uk>
Date:   Thu Feb 1 15:19:08 2018 +

travis: conditionalize building of prerequisites on if OS=linux

Use a '|' YAML literal block to avoid the convoluted syntax needed to put
the entire conditional on a single line.

Signed-off-by: Jon Turney <jon.tur...@dronecode.org.uk>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
(cherry picked from commit 7d1ec6d6a92f15a24377738f12e59d80bab96da3)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=937b151e4f99b21e47b58c099397e768b00980bb
Author: Jon Turney <jon.tur...@dronecode.org.uk>
Date:   Thu Jan 25 17:34:54 2018 +

glx/test: fix building for osx

An additional stub for applegl_create_context() is needed
Cannot test indirect API as it's not built on osx, currently

    Signed-off-by: Jon Turney <jon.tur...@dronecode.org.uk>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
(cherry picked from commit 63041ba61308a0576c73cb6bc3d98540669188cf)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=9d7a80f4ae3919072a8a02ced0ad856d91632ca8
Author: Jon Turney <jon.tur...@dronecode.org.uk>
Date:   Tue Jan 16 16:26:57 2018 +

glx/apple: locate dispatch table functions to wrap by name

Avoid reaching into the dispatch table internals (and thus having to deal
with the complexities of remap etc.) by identifying functions to wrap by
name.

See:
https://lists.freedesktop.org/archives/mesa-dev/2015-June/086721.html et 
seq.
https://bugs.freedesktop.org/show_bug.cgi?id=90311

Signed-off-by: Jon Turney <jon.tur...@dronecode.org.uk>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
(cherry picked from commit d3540b405b975450b9c2f9d8eb273be062cbf73a)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ac08cc687345b6124153b20e9f21eef8eebc3b15
Author: Jon Turney <jon.tur...@dronecode.org.uk>
Date:   Sat Dec 2 17:05:43 2017 +

glx/apple: include util/debug.h for env_var_as_boolean prototype

mesa/src/glx/glxcmds.c:1295:21: error: implicit declaration of function 
'env_var_as_boolean' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
mesa/src/glx/apple/apple_visual.c:85:28: error: implicit declaration of 
function 'env_var_as_boolean' is invalid in C99 
[-Werror,-Wimplicit-func

Mesa (master): util/build-id: Fix address comparison for binaries with LOAD vaddr > 0

[Emil Velikov]

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

Author: Stephan Gerhold <step...@gerhold.net>
Date:   Wed Jan 24 15:13:24 2018 +0100

util/build-id: Fix address comparison for binaries with LOAD vaddr > 0

build_id_find_nhdr_for_addr() fails to find the build-id if the first LOAD
segment has a virtual address other than 0x0.

For most shared libraries, the first LOAD segment has vaddr=0x0:

Type   Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
LOAD   0x00 0x 0x 0x2d2e26 0x2d2e26 R E 0x1000
LOAD   0x2d2e54 0x002d3e54 0x002d3e54 0x2e248 0x2f148 RW  0x1000

However, compiling the Intel Vulkan driver as 32-bit binary on Android produces
the following ELF header with vaddr=0x8000 instead:

Type   Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
PHDR   0x34 0x8034 0x8034 0x00100 0x00100 R   0x4
LOAD   0x00 0x8000 0x8000 0x224a04 0x224a04 R E 0x1000
LOAD   0x225710 0x0022e710 0x0022e710 0x25988 0x27364 RW  0x1000

build_id_find_nhdr_callback() compares the address of dli_fbase from dladdr()
and dlpi_addr from dl_iterate_phdr(). With vaddr > 0, these point to a
different memory address, e.g.:

dli_fbase=0xd8395000 (offset 0x8000)
dlpi_addr=0xd838d000

At least on glibc and bionic (Android) dli_fbase refers to the address where
the shared object is mapped into the process space, whereas dlpi_addr is just
the base address for the vaddrs declared in the ELF header.

To compare them correctly, we need to calculate the start of the mapping
by adding the vaddr of the first LOAD segment to the base address.

Note: musl users will need the following patch.
https://git.musl-libc.org/cgit/musl/commit/?id=b3ae7beabb9f0c219bb8a8b63567a01c6530c1ac

Cc: Chad Versace <chadvers...@chromium.org>
Cc: <mesa-sta...@lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104642
Fixes: 5c98d38 "util: Query build-id by symbol address, not library name"
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Tapani Pälli <tapani.pa...@intel.com>

---

 src/util/build_id.c | 13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/util/build_id.c b/src/util/build_id.c
index 536c74360e..fb67d160e3 100644
--- a/src/util/build_id.c
+++ b/src/util/build_id.c
@@ -58,7 +58,18 @@ build_id_find_nhdr_callback(struct dl_phdr_info *info, 
size_t size, void *data_)
 {
struct callback_data *data = data_;
 
-   if ((void *)info->dlpi_addr != data->dli_fbase)
+   /* Calculate address where shared object is mapped into the process space.
+* (Using the base address and the virtual address of the first LOAD 
segment)
+*/
+   void *map_start = NULL;
+   for (unsigned i = 0; i < info->dlpi_phnum; i++) {
+  if (info->dlpi_phdr[i].p_type == PT_LOAD) {
+ map_start = (void *)(info->dlpi_addr + info->dlpi_phdr[i].p_vaddr);
+ break;
+  }
+   }
+
+   if (map_start != data->dli_fbase)
   return 0;
 
for (unsigned i = 0; i < info->dlpi_phnum; i++) {

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

Mesa: tag mesa-18.0.0-rc3: mesa-18.0.0-rc3

[Emil Velikov]

Module: Mesa
Branch: refs/tags/mesa-18.0.0-rc3
Tag:96aa32abc3e341d9f12107b963e6642a0fcb6904
URL:
http://cgit.freedesktop.org/mesa/mesa/tag/?id=96aa32abc3e341d9f12107b963e6642a0fcb6904

Tagger: Emil Velikov <emil.l.veli...@gmail.com>
Date:   Mon Jan 29 11:33:33 2018 +

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

Mesa (18.0): 55 new commits

[Emil Velikov]

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=17c0e248d75fc40efbca13164e897a009b2e3b23
Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Mon Jan 29 11:27:18 2018 +

Update version to 18.0.0-rc3

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=92a332ed1a0d4753f78a6c5d58615ef1e5512dc6
Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Fri Jan 26 19:06:46 2018 +

cherry-ignore: add patches picked without -x

    Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=74b39c0bbf2467799b2b225c8059ce56413147cb
Author: Maxin B. John <maxin.j...@intel.com>
Date:   Thu Jan 18 13:33:37 2018 +0200

anv_icd.py: improve reproducible builds

Sort the output to ensure build reproducibility

Signed-off-by: Maxin B. John <maxin.j...@intel.com>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
Fixes: 0ab04ba979b ("anv: Use python to generate ICD json files")
Reviewed-by: Dylan Baker <dy...@pnwbakers.com>
Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net>
(cherry picked from commit 8116b9170bc36bb15512f97a7680ad97bddd56a8)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=a5bdf2abf9d87c34ab5ebec5a2bbf78b4e19db5b
Author: Bas Nieuwenhuizen <ba...@chromium.org>
Date:   Thu Jan 25 16:48:17 2018 +0100

radeonsi: Export signalled sync file instead of -1.

-1 is considered an error for EGL_ANDROID_native_fence_sync, so
we need to actually create a sync file.

Fixes: f536f45250 "radeonsi: implement sync_file import/export"
Reviewed-by: Dave Airlie <airl...@redhat.com>
(cherry picked from commit 5a3404d443e0c6e8e9a44d7f8dccf96c5ac18f0f)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=305b0b135612dfe80b95f20e22fb5a526f8fa886
Author: Dave Airlie <airl...@redhat.com>
Date:   Thu Jan 25 09:29:55 2018 +1000

radv: don't enable tc compat for d32s8 + 4/8 samples (v1.1)

This seems to be broken, at least the cts tests fail.

This fixes:
dEQP-VK.renderpass.suballocation.multisample.d32_sfloat_s8_uint.samples_4
dEQP-VK.renderpass.suballocation.multisample.d32_sfloat_s8_uint.samples_8

2 samples seems to pass fine, amdvlk doesn't appear to enable TC for
possibly some other reasons here.

This is most likely a hack.

v1.1: add a bit of explaination text. (Samuel)
Fixes: ad3d98da9 (radv: enable tc compatible htile for d32s8 also.)
Signed-off-by: Dave Airlie <airl...@redhat.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
(cherry picked from commit f4c534ef68a479055190f8ec8d551be0f56ef361)

URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=28680e72b87aa29fa7542c5a55eceb6ccb356204
Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Wed Dec 20 17:34:55 2017 +

configure.ac: correct driglx-direct help text

The default was toggled a while back, but the text wasn't updated.

Fixes: bd526ec9e1b ("configure: Always default to
--enable-driglx-direct")
Cc: Jon TURNEY <jon.tur...@dronecode.org.uk>
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Daniel Stone <dani...@collabora.com>
(cherry picked from commit 6aeef5464497a2dfd2eb63c7e4aa3349c7794eae)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=32b2c0da59ec97e0f524430209992d01498a29a6
Author: Roland Scheidegger <srol...@vmware.com>
Date:   Thu Jan 25 04:30:41 2018 +0100

gallivm: fix crash with seamless cube filtering with different min/mag 
filter

We are not allowed to modify the incoming coords values, or things may
crash (as we may be inside a llvm conditional and the values may be used
in another branch).
I recently broke this when fixing an issue with NaNs and seamless cube
map filtering, and it causes crashes when doing cubemap filtering
if the min and mag filters are different.
Add const to the pointers passed in to prevent this mishap in the future.

Fixes: a485ad0bcd ("gallivm: fix an issue with NaNs with seamless cube 
filtering")

Reviewed-by: Jose Fonseca <jfons...@vmware.com>
(cherry picked from commit 4fe662c58f6453b3558de479e7c2bfe4158dc26c)

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=b01ea9701e328896659a5ffad79f2762f177a087
Author: Greg V <greg@unrelenting.technology>
Date:   Wed Jan 24 21:02:43 2018 +0300

meson: handle LLVM 'x.x.xgit-revision' versions

When LLVM is built inside of a git repo (even way below, e.g. 
/usr/ports/.git
exists, and LLVM is built in /usr/ports/devel/llvm50/work), its version
becomes something like 5.0.0git-f8ab206b2176.

New meson versions already han

Mesa (master): mapi: autotools: remove unused MAPI_FILES file list

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Thu Dec  7 17:07:36 2017 +

mapi: autotools: remove unused MAPI_FILES file list

The sole user was OpenVG, which was removed couple of years ago.

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>

---

 src/mapi/Makefile.sources | 11 ---
 1 file changed, 11 deletions(-)

diff --git a/src/mapi/Makefile.sources b/src/mapi/Makefile.sources
index 5647158e3d..4b83caa8ed 100644
--- a/src/mapi/Makefile.sources
+++ b/src/mapi/Makefile.sources
@@ -2,9 +2,6 @@
 #
 # mapi may be used in several ways
 #
-#  - In default mode, mapi implements the interface defined by mapi.h.  To use
-#this mode, compile MAPI_FILES.
-#
 #  - In util mode, mapi provides utility functions for use with glapi.  To use
 #this mode, compile MAPI_UTIL_FILES with MAPI_MODE_UTIL defined.
 #
@@ -30,14 +27,6 @@ MAPI_BRIDGE_FILES = \
entry_ppc64le_tsd.h \
mapi_tmp.h
 
-MAPI_FILES = \
-   entry.c \
-   stub.c \
-   stub.h \
-   table.c \
-   table.h \
-   $(MAPI_UTIL_FILES)
-
 MAPI_GLAPI_FILES = \
entry.c \
mapi_glapi.c \

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

Mesa (master): configure.ac: correct driglx-direct help text

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Wed Dec 20 17:34:55 2017 +

configure.ac: correct driglx-direct help text

The default was toggled a while back, but the text wasn't updated.

Fixes: bd526ec9e1b ("configure: Always default to
--enable-driglx-direct")
Cc: Jon TURNEY <jon.tur...@dronecode.org.uk>
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Daniel Stone <dani...@collabora.com>

---

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 7c1fbe0ed1..9bfe1e3ecd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1598,7 +1598,7 @@ fi
 AC_ARG_ENABLE([driglx-direct],
 [AS_HELP_STRING([--disable-driglx-direct],
 [disable direct rendering in GLX and EGL for DRI \
-@<:@default=auto@:>@])],
+@<:@default=enabled@:>@])],
 [driglx_direct="$enableval"],
 [driglx_direct="yes"])
 

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

Mesa (master): mapi: remove non applicable HAVE_DIX_CONFIG_H hunk

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Thu Dec  7 17:07:37 2017 +

mapi: remove non applicable HAVE_DIX_CONFIG_H hunk

Seeming artefact from when the xserver build was diving directly into
mesa's tree.

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>

---

 src/mapi/glapi/glapi_priv.h | 6 --
 1 file changed, 6 deletions(-)

diff --git a/src/mapi/glapi/glapi_priv.h b/src/mapi/glapi/glapi_priv.h
index 8f2c6775dc..0e584f4be9 100644
--- a/src/mapi/glapi/glapi_priv.h
+++ b/src/mapi/glapi/glapi_priv.h
@@ -27,10 +27,6 @@
 #define _GLAPI_PRIV_H
 
 
-#ifdef HAVE_DIX_CONFIG_H
-#include 
-#include "glapi/mesa.h"
-#else /* HAVE_DIX_CONFIG_H */
 #define GL_GLEXT_PROTOTYPES
 #include "GL/gl.h"
 #include "GL/glext.h"
@@ -44,8 +40,6 @@ typedef int GLclampx;
 typedef void *GLeglImageOES;
 #endif
 
-#endif /* HAVE_DIX_CONFIG_H */
-
 #include "glapi/glapi.h"
 
 

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

Mesa (master): swrast: remove non-applicable GLX_SWAP_COPY_OML comment

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Thu Dec  7 17:07:39 2017 +

swrast: remove non-applicable GLX_SWAP_COPY_OML comment

Noticed while skimming for GLX_ instances in the dri codebase.
Comment is completely off and was in such a state since day 1.

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>

---

 src/mesa/drivers/dri/swrast/swrast.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/mesa/drivers/dri/swrast/swrast.c 
b/src/mesa/drivers/dri/swrast/swrast.c
index 4bee01ad30..8084be6439 100644
--- a/src/mesa/drivers/dri/swrast/swrast.c
+++ b/src/mesa/drivers/dri/swrast/swrast.c
@@ -223,9 +223,6 @@ swrastFillInModes(__DRIscreen *psp,
 unsigned back_buffer_factor;
 mesa_format format;
 
-/* GLX_SWAP_COPY_OML is only supported because the Intel driver doesn't
- * support pageflipping at all.
- */
 static const GLenum back_buffer_modes[] = {
__DRI_ATTRIB_SWAP_NONE, __DRI_ATTRIB_SWAP_UNDEFINED
 };

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

Mesa (master): mapi: remove duplicate GL typedefs

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Thu Dec  7 17:07:38 2017 +

mapi: remove duplicate GL typedefs

Remove the instances already available in gl.h or glext.h.
Sadly GLclampx is only available in GLES(1) so we need to keep that one.

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>

---

 src/mapi/glapi/glapi_priv.h | 7 ---
 1 file changed, 7 deletions(-)

diff --git a/src/mapi/glapi/glapi_priv.h b/src/mapi/glapi/glapi_priv.h
index 0e584f4be9..ddfc594a97 100644
--- a/src/mapi/glapi/glapi_priv.h
+++ b/src/mapi/glapi/glapi_priv.h
@@ -31,15 +31,8 @@
 #include "GL/gl.h"
 #include "GL/glext.h"
 
-#ifndef GL_OES_fixed_point
-typedef int GLfixed;
-#endif
 typedef int GLclampx;
 
-#ifndef GL_OES_EGL_image
-typedef void *GLeglImageOES;
-#endif
-
 #include "glapi/glapi.h"
 
 

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

Mesa (master): automake: anv: ship anv_extensions_gen.py in the tarball

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Tue Jan 23 13:02:50 2018 +

automake: anv: ship anv_extensions_gen.py in the tarball

Fixes: dd088d4bec7 ("anv/extensions: Generate a header file with
extension tables")
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 src/intel/Makefile.vulkan.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am
index 7823b60880..23fa877e77 100644
--- a/src/intel/Makefile.vulkan.am
+++ b/src/intel/Makefile.vulkan.am
@@ -65,6 +65,7 @@ CLEANFILES += \
 EXTRA_DIST += \
$(top_srcdir)/include/vulkan/vk_icd.h \
vulkan/anv_entrypoints_gen.py \
+   vulkan/anv_extensions_gen.py \
vulkan/anv_extensions.py \
vulkan/anv_icd.py \
vulkan/TODO

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

Mesa (master): automake: vc5: remove non-applicable v3dx_simulator.h

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Tue Jan 23 11:52:49 2018 +

automake: vc5: remove non-applicable v3dx_simulator.h

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 src/gallium/drivers/vc5/Makefile.sources | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/gallium/drivers/vc5/Makefile.sources 
b/src/gallium/drivers/vc5/Makefile.sources
index cbf7b656e3..0259ecc99b 100644
--- a/src/gallium/drivers/vc5/Makefile.sources
+++ b/src/gallium/drivers/vc5/Makefile.sources
@@ -29,7 +29,6 @@ VC5_PER_VERSION_SOURCES = \
v3dx_context.h \
v3dx_format_table.c \
v3dx_simulator.c \
-   v3dx_simulator.h \
vc5_draw.c \
vc5_emit.c \
vc5_rcl.c \

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

Mesa (master): automake: mesa: include vbo_private.h in the tarball

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Thu Jan 25 15:27:20 2018 +

automake: mesa: include vbo_private.h in the tarball

Fixes: a7cfec3be0e ("vbo: move VBO-private types, prototypes, etc. into
new vbo_private.h header")
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 src/mesa/Makefile.sources | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources
index 2dc9b47bc1..a970deea18 100644
--- a/src/mesa/Makefile.sources
+++ b/src/mesa/Makefile.sources
@@ -404,6 +404,7 @@ VBO_FILES = \
vbo/vbo_noop.c \
vbo/vbo_noop.h \
vbo/vbo_primitive_restart.c \
+   vbo/vbo_private.h \
vbo/vbo_rebase.c \
vbo/vbo_save_api.c \
vbo/vbo_save.c \

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

Mesa (master): automake: st/mesa/tests: add st_tests_common.h to the tarball

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Thu Jan 25 15:31:10 2018 +

automake: st/mesa/tests: add st_tests_common.h to the tarball

Fixes: 6569b33b6ee ("mesa/st/tests: unify MockCodeLine* classes")
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 src/mesa/state_tracker/tests/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/state_tracker/tests/Makefile.am 
b/src/mesa/state_tracker/tests/Makefile.am
index 0350c64bf3..3c7993dc8d 100644
--- a/src/mesa/state_tracker/tests/Makefile.am
+++ b/src/mesa/state_tracker/tests/Makefile.am
@@ -23,7 +23,8 @@ noinst_LIBRARIES = libmesa-st-tests-common.a
 endif
 
 libmesa_st_tests_common_a_SOURCES = \
-   st_tests_common.cpp
+   st_tests_common.cpp \
+   st_tests_common.h
 
 st_renumerate_test_SOURCES =   \
test_glsl_to_tgsi_lifetime.cpp

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

Mesa (master): automake: small cleanup after the meson.build inclusion

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Tue Jan 23 13:04:57 2018 +

automake: small cleanup after the meson.build inclusion

Namely extend the EXTRA_DIST list, instead of re-assigning it and bring
back a file dropped by mistake.

Fixes: 436ed65d38d ("autotools: include meson build files in tarball")
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Daniel Stone <dani...@collabora.com>

---

 src/compiler/Makefile.am  | 1 -
 src/gallium/drivers/freedreno/Makefile.am | 2 +-
 src/gallium/drivers/i915/Makefile.am  | 2 +-
 src/mesa/drivers/dri/i965/Makefile.am | 4 ++--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/compiler/Makefile.am b/src/compiler/Makefile.am
index 9093fab612..fd6811ff26 100644
--- a/src/compiler/Makefile.am
+++ b/src/compiler/Makefile.am
@@ -64,7 +64,6 @@ EXTRA_DIST = \
glsl/meson.build \
nir/meson.build \
meson.build
-   
 
 MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
 PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
diff --git a/src/gallium/drivers/freedreno/Makefile.am 
b/src/gallium/drivers/freedreno/Makefile.am
index 4e7bf2caeb..3bcac39484 100644
--- a/src/gallium/drivers/freedreno/Makefile.am
+++ b/src/gallium/drivers/freedreno/Makefile.am
@@ -46,4 +46,4 @@ ir3_compiler_LDADD = \
$(GALLIUM_COMMON_LIB_DEPS) \
$(FREEDRENO_LIBS)
 
-EXTRA_DIST = meson.build
+EXTRA_DIST += meson.build
diff --git a/src/gallium/drivers/i915/Makefile.am 
b/src/gallium/drivers/i915/Makefile.am
index 6209f66ef1..261f292fd2 100644
--- a/src/gallium/drivers/i915/Makefile.am
+++ b/src/gallium/drivers/i915/Makefile.am
@@ -30,4 +30,4 @@ noinst_LTLIBRARIES = libi915.la
 
 libi915_la_SOURCES = $(C_SOURCES)
 
-EXTRA_DIST = meson.build
+EXTRA_DIST = TODO meson.build
diff --git a/src/mesa/drivers/dri/i965/Makefile.am 
b/src/mesa/drivers/dri/i965/Makefile.am
index f1bfe96887..79be769c9b 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -105,7 +105,6 @@ BUILT_SOURCES = $(i965_oa_GENERATED_FILES)
 CLEANFILES = $(BUILT_SOURCES)
 
 EXTRA_DIST = \
-   meson.build \
brw_oa_hsw.xml \
brw_oa_bdw.xml \
brw_oa_chv.xml \
@@ -118,7 +117,8 @@ EXTRA_DIST = \
brw_oa_glk.xml \
brw_oa_cflgt2.xml \
brw_oa_cflgt3.xml \
-   brw_oa.py 
+   brw_oa.py \
+   meson.build
 
 # Note: we avoid using a multi target rule here and outputting both the
 # .c and .h files in one go so we don't hit problems with parallel

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

Mesa: tag mesa-18.0.0-rc2: mesa-18.0.0-rc2

[Emil Velikov]

Module: Mesa
Branch: refs/tags/mesa-18.0.0-rc2
Tag:0dc1b52bc04c7fbbdb6b99049cf9021e69a91687
URL:
http://cgit.freedesktop.org/mesa/mesa/tag/?id=0dc1b52bc04c7fbbdb6b99049cf9021e69a91687

Tagger: Emil Velikov <emil.l.veli...@gmail.com>
Date:   Tue Jan 23 18:10:42 2018 +

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

Mesa (18.0): Update version to 18.0.0-rc2

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Tue Jan 23 18:05:55 2018 +

Update version to 18.0.0-rc2

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 9ad5cd7f31..da4f1d2a1d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.0-0-rc1
+18.0.0-rc2

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

Mesa (master): docs: update calendar 18.0.0-rc1 is out

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Tue Jan 23 17:01:06 2018 +

docs: update calendar 18.0.0-rc1 is out

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

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

diff --git a/docs/release-calendar.html b/docs/release-calendar.html
index f30018e655..74c98023c3 100644
--- a/docs/release-calendar.html
+++ b/docs/release-calendar.html
@@ -58,13 +58,7 @@ if you'd like to nominate a patch in the next stable release.
 Final planned release for the 17.3 series
 
 
-18.0
-2018-01-19
-18.0.0-rc1
-Emil Velikov
-
-
-
+18.0
 2018-01-26
 18.0.0-rc2
 Emil Velikov

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

Mesa: tag mesa-18.0-0-rc1: mesa-18.0-0-rc1

[Emil Velikov]

Module: Mesa
Branch: refs/tags/mesa-18.0-0-rc1
Tag:256eb78977d15e7da2dec531441205abaf803954
URL:
http://cgit.freedesktop.org/mesa/mesa/tag/?id=256eb78977d15e7da2dec531441205abaf803954

Tagger: Emil Velikov <emil.l.veli...@gmail.com>
Date:   Tue Jan 23 16:53:01 2018 +

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

Mesa (18.0): Update version to 18.0.0-rc1

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Tue Jan 23 16:39:33 2018 +

Update version to 18.0.0-rc1

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 96db1413d9..9ad5cd7f31 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.4.0-devel
+18.0-0-rc1

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

Mesa: tag 18.0-branchpoint: Mesa 18.0 branchpoint

[Emil Velikov]

Module: Mesa
Branch: refs/tags/18.0-branchpoint
Tag:22108b13a6c1284847eac80104d5866d931c9376
URL:
http://cgit.freedesktop.org/mesa/mesa/tag/?id=22108b13a6c1284847eac80104d5866d931c9376

Tagger: Emil Velikov <emil.l.veli...@gmail.com>
Date:   Tue Jan 23 14:50:44 2018 +

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

Mesa (18.0): automake: small cleanup after the meson.build inclusion

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Tue Jan 23 13:04:57 2018 +

automake: small cleanup after the meson.build inclusion

Namely extend the EXTRA_DIST list, instead of re-assigning it and bring
back a file dropped by mistake.

Fixes: 436ed65d38d ("autotools: include meson build files in tarball")
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 src/compiler/Makefile.am  | 1 -
 src/gallium/drivers/freedreno/Makefile.am | 2 +-
 src/gallium/drivers/i915/Makefile.am  | 2 +-
 src/mesa/drivers/dri/i965/Makefile.am | 4 ++--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/compiler/Makefile.am b/src/compiler/Makefile.am
index 9093fab612..fd6811ff26 100644
--- a/src/compiler/Makefile.am
+++ b/src/compiler/Makefile.am
@@ -64,7 +64,6 @@ EXTRA_DIST = \
glsl/meson.build \
nir/meson.build \
meson.build
-   
 
 MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
 PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
diff --git a/src/gallium/drivers/freedreno/Makefile.am 
b/src/gallium/drivers/freedreno/Makefile.am
index 4e7bf2caeb..3bcac39484 100644
--- a/src/gallium/drivers/freedreno/Makefile.am
+++ b/src/gallium/drivers/freedreno/Makefile.am
@@ -46,4 +46,4 @@ ir3_compiler_LDADD = \
$(GALLIUM_COMMON_LIB_DEPS) \
$(FREEDRENO_LIBS)
 
-EXTRA_DIST = meson.build
+EXTRA_DIST += meson.build
diff --git a/src/gallium/drivers/i915/Makefile.am 
b/src/gallium/drivers/i915/Makefile.am
index 6209f66ef1..261f292fd2 100644
--- a/src/gallium/drivers/i915/Makefile.am
+++ b/src/gallium/drivers/i915/Makefile.am
@@ -30,4 +30,4 @@ noinst_LTLIBRARIES = libi915.la
 
 libi915_la_SOURCES = $(C_SOURCES)
 
-EXTRA_DIST = meson.build
+EXTRA_DIST = TODO meson.build
diff --git a/src/mesa/drivers/dri/i965/Makefile.am 
b/src/mesa/drivers/dri/i965/Makefile.am
index f1bfe96887..79be769c9b 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -105,7 +105,6 @@ BUILT_SOURCES = $(i965_oa_GENERATED_FILES)
 CLEANFILES = $(BUILT_SOURCES)
 
 EXTRA_DIST = \
-   meson.build \
brw_oa_hsw.xml \
brw_oa_bdw.xml \
brw_oa_chv.xml \
@@ -118,7 +117,8 @@ EXTRA_DIST = \
brw_oa_glk.xml \
brw_oa_cflgt2.xml \
brw_oa_cflgt3.xml \
-   brw_oa.py 
+   brw_oa.py \
+   meson.build
 
 # Note: we avoid using a multi target rule here and outputting both the
 # .c and .h files in one go so we don't hit problems with parallel

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

Mesa (master): i965: make brw_context::num_samples unsigned int

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Fri Jan 19 15:57:50 2018 +

i965: make brw_context::num_samples unsigned int

It is never a negative number. Variable is compared against unsigned
values and passed into functions that expect unsigned int.

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net>

---

 src/mesa/drivers/dri/i965/brw_context.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/brw_context.h 
b/src/mesa/drivers/dri/i965/brw_context.h
index d00fe35108..4b78508ccb 100644
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -980,7 +980,7 @@ struct brw_context
 * Number of samples in ctx->DrawBuffer, updated by BRW_NEW_NUM_SAMPLES so
 * that we don't have to reemit that state every time we change FBOs.
 */
-   int num_samples;
+   unsigned int num_samples;
 
/* BRW_NEW_URB_ALLOCATIONS:
 */

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

Mesa (master): st/mesa: provide static inline st_init_vdpau_functions

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Fri Jan 19 16:53:47 2018 +

st/mesa: provide static inline st_init_vdpau_functions

The ifdef spaghetty in st_vdpau.c is rather confusing and misleading.
Simplily it by introducing a static inline helper noop (when
HAVE_ST_VDPAU is not defined) in the header.

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Acked-by: Christian König <christian.koe...@amd.com>

---

 src/mesa/state_tracker/st_vdpau.c | 9 +++--
 src/mesa/state_tracker/st_vdpau.h | 5 +
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/mesa/state_tracker/st_vdpau.c 
b/src/mesa/state_tracker/st_vdpau.c
index e0126cc03d..eb61aef111 100644
--- a/src/mesa/state_tracker/st_vdpau.c
+++ b/src/mesa/state_tracker/st_vdpau.c
@@ -31,6 +31,8 @@
  *
  */
 
+#ifdef HAVE_ST_VDPAU
+
 #include "main/texobj.h"
 #include "main/teximage.h"
 #include "main/errors.h"
@@ -48,8 +50,6 @@
 #include "st_format.h"
 #include "st_cb_flush.h"
 
-#ifdef HAVE_ST_VDPAU
-
 #include "state_tracker/vdpau_interop.h"
 #include "state_tracker/vdpau_dmabuf.h"
 #include "state_tracker/vdpau_funcs.h"
@@ -268,13 +268,10 @@ st_vdpau_unmap_surface(struct gl_context *ctx, GLenum 
target, GLenum access,
st_flush(st, NULL, 0);
 }
 
-#endif
-
 void
 st_init_vdpau_functions(struct dd_function_table *functions)
 {
-#ifdef HAVE_ST_VDPAU
functions->VDPAUMapSurface = st_vdpau_map_surface;
functions->VDPAUUnmapSurface = st_vdpau_unmap_surface;
-#endif
 }
+#endif
diff --git a/src/mesa/state_tracker/st_vdpau.h 
b/src/mesa/state_tracker/st_vdpau.h
index 59c744305c..6f4d46091f 100644
--- a/src/mesa/state_tracker/st_vdpau.h
+++ b/src/mesa/state_tracker/st_vdpau.h
@@ -36,7 +36,12 @@
 
 struct dd_function_table;
 
+#ifdef HAVE_ST_VDPAU
 extern void
 st_init_vdpau_functions(struct dd_function_table *functions);
+#else
+static inline void
+st_init_vdpau_functions(struct dd_function_table *functions) {}
+#endif
 
 #endif /* ST_VDPAU_H */

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

Mesa (master): swr: fix clang 5 null cast warning

[Emil Velikov]

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

Author: Greg V <greg@unrelenting.technology>
Date:   Sun Dec 31 19:55:27 2017 +0300

swr: fix clang 5 null cast warning

Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Bruce Cherniak <bruce.chern...@intel.com>

---

 src/gallium/drivers/swr/rasterizer/memory/TilingFunctions.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/swr/rasterizer/memory/TilingFunctions.h 
b/src/gallium/drivers/swr/rasterizer/memory/TilingFunctions.h
index 6c801c7ff6..abb0c53ec4 100644
--- a/src/gallium/drivers/swr/rasterizer/memory/TilingFunctions.h
+++ b/src/gallium/drivers/swr/rasterizer/memory/TilingFunctions.h
@@ -624,7 +624,7 @@ uint32_t TileSwizzle2D(uint32_t xOffsetBytes, uint32_t 
yOffsetRows, const SWR_SU
 case SWR_TILE_MODE_WMAJOR: return 
ComputeTileSwizzle2D<TilingTraits<SWR_TILE_MODE_WMAJOR, 8> >(xOffsetBytes, 
yOffsetRows, pState);
 default: SWR_INVALID("Unsupported tiling mode");
 }
-return (uint32_t) NULL;
+return 0;
 }
 
 //
@@ -644,7 +644,7 @@ uint32_t TileSwizzle3D(uint32_t xOffsetBytes, uint32_t 
yOffsetRows, uint32_t zOf
 case SWR_TILE_MODE_YMAJOR: return 
ComputeTileSwizzle3D<TilingTraits<SWR_TILE_MODE_YMAJOR, 32> >(xOffsetBytes, 
yOffsetRows, zOffsetSlices, pState);
 default: SWR_INVALID("Unsupported tiling mode");
 }
-return (uint32_t) NULL;
+return 0;
 }
 
 template
@@ -677,7 +677,7 @@ uint32_t ComputeSurfaceOffset(uint32_t x, uint32_t y, 
uint32_t z, uint32_t array
 default: SWR_INVALID("Unsupported format");
 }
 
-return (uint32_t) NULL;
+return 0;
 }
 
 typedef void*(*PFN_COMPUTESURFADDR)(uint32_t, uint32_t, uint32_t, uint32_t, 
uint32_t, uint32_t, const SWR_SURFACE_STATE*);

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

Mesa (master): mesa/program/prog_execute.c: Silence -Wunused-param

[Emil Velikov]

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

Author: Gert Wollny <gw.foss...@gmail.com>
Date:   Thu Jan 18 09:57:28 2018 +0100

mesa/program/prog_execute.c: Silence -Wunused-param

v2: Don't annotate, but remove the unused ctx parameter

Signed-off-by: Gert Wollny <gw.foss...@gmail.com>
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>

---

 src/mesa/program/prog_execute.c | 9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/mesa/program/prog_execute.c b/src/mesa/program/prog_execute.c
index 1268476279..2c77538c2a 100644
--- a/src/mesa/program/prog_execute.c
+++ b/src/mesa/program/prog_execute.c
@@ -222,8 +222,7 @@ fetch_vector4(const struct prog_src_register *source,
  * XXX this currently only works for fragment program input attribs.
  */
 static void
-fetch_vector4_deriv(struct gl_context * ctx,
-const struct prog_src_register *source,
+fetch_vector4_deriv(const struct prog_src_register *source,
 const struct gl_program_machine *machine,
 char xOrY, GLfloat result[4])
 {
@@ -507,16 +506,14 @@ _mesa_execute_program(struct gl_context * ctx,
   case OPCODE_DDX: /* Partial derivative with respect to X */
  {
 GLfloat result[4];
-fetch_vector4_deriv(ctx, >SrcReg[0], machine,
-'X', result);
+fetch_vector4_deriv(>SrcReg[0], machine, 'X', result);
 store_vector4(inst, machine, result);
  }
  break;
   case OPCODE_DDY: /* Partial derivative with respect to Y */
  {
 GLfloat result[4];
-fetch_vector4_deriv(ctx, >SrcReg[0], machine,
-'Y', result);
+fetch_vector4_deriv(>SrcReg[0], machine, 'Y', result);
 store_vector4(inst, machine, result);
  }
  break;

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

Mesa (master): gallium: Make (num_)samples an unsigned int

[Emil Velikov]

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

Author: Gert Wollny <gw.foss...@gmail.com>
Date:   Thu Jan 18 09:57:26 2018 +0100

gallium: Make (num_)samples an unsigned int

According to the ARB_multisample num_samples is a non-negative integer.
Consequently define it as such, fail in glx/choose_visual if a negative
number is given.

v2: split patch into gallium and mesa part

Signed-off-by: Gert Wollny <gw.foss...@gmail.com>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>

---

 src/gallium/include/state_tracker/st_api.h| 2 +-
 src/gallium/state_trackers/glx/xlib/glx_api.c | 6 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/gallium/include/state_tracker/st_api.h 
b/src/gallium/include/state_tracker/st_api.h
index f95f65f156..ec6e7844b8 100644
--- a/src/gallium/include/state_tracker/st_api.h
+++ b/src/gallium/include/state_tracker/st_api.h
@@ -202,7 +202,7 @@ struct st_visual
enum pipe_format color_format;
enum pipe_format depth_stencil_format;
enum pipe_format accum_format;
-   int samples;
+   unsigned samples;
 
/**
 * Desired render buffer.
diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c 
b/src/gallium/state_trackers/glx/xlib/glx_api.c
index c473a0fe54..1994e6823a 100644
--- a/src/gallium/state_trackers/glx/xlib/glx_api.c
+++ b/src/gallium/state_trackers/glx/xlib/glx_api.c
@@ -181,7 +181,7 @@ save_glx_visual( Display *dpy, XVisualInfo *vinfo,
  GLint depth_size, GLint stencil_size,
  GLint accumRedSize, GLint accumGreenSize,
  GLint accumBlueSize, GLint accumAlphaSize,
- GLint level, GLint numAuxBuffers, GLint num_samples )
+ GLint level, GLint numAuxBuffers, GLuint num_samples )
 {
GLboolean ximageFlag = GL_TRUE;
XMesaVisual xmvis;
@@ -996,6 +996,10 @@ choose_visual( Display *dpy, int screen, const int *list, 
GLboolean fbConfig )
 
(void) caveat;
 
+   if (num_samples < 0) {
+  _mesa_warning(NULL, "GLX_SAMPLES_ARB: number of samples must not be 
negative");
+  return NULL;
+   }
 
/*
 * Since we're only simulating the GLX extension this function will never

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

Mesa (master): mesa/program: Fix -Wunused-param warning

[Emil Velikov]

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

Author: Gert Wollny <gw.foss...@gmail.com>
Date:   Thu Jan 18 09:57:29 2018 +0100

mesa/program: Fix -Wunused-param warning

v2: Don't annotate, but remove the unused ctx parameter

Signed-off-by: Gert Wollny <gw.foss...@gmail.com>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>

---

 src/mesa/program/arbprogparse.c  | 2 +-
 src/mesa/program/ir_to_mesa.cpp  | 2 +-
 src/mesa/program/prog_optimize.c | 3 +--
 src/mesa/program/prog_optimize.h | 3 +--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/mesa/program/arbprogparse.c b/src/mesa/program/arbprogparse.c
index 83a501eea6..7cb1beb5bb 100644
--- a/src/mesa/program/arbprogparse.c
+++ b/src/mesa/program/arbprogparse.c
@@ -181,7 +181,7 @@ _mesa_parse_arb_vertex_program(struct gl_context *ctx, 
GLenum target,
   return;
}
 
-   _mesa_optimize_program(ctx, , program);
+   _mesa_optimize_program(, program);
 
ralloc_free(program->String);
 
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index ad1b701690..321d8870e4 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -2966,7 +2966,7 @@ get_mesa_program(struct gl_context *ctx,
   prog->info.fs.depth_layout = shader_program->FragDepthLayout;
}
 
-   _mesa_optimize_program(ctx, prog, prog);
+   _mesa_optimize_program(prog, prog);
 
/* This has to be done last.  Any operation that can cause
 * prog->ParameterValues to get reallocated (e.g., anything that adds a
diff --git a/src/mesa/program/prog_optimize.c b/src/mesa/program/prog_optimize.c
index 6a228ba258..7efdcadc12 100644
--- a/src/mesa/program/prog_optimize.c
+++ b/src/mesa/program/prog_optimize.c
@@ -1312,8 +1312,7 @@ _mesa_simplify_cmp(struct gl_program * program)
  * instructions, temp regs, etc.
  */
 void
-_mesa_optimize_program(struct gl_context *ctx, struct gl_program *program,
-   void *mem_ctx)
+_mesa_optimize_program(struct gl_program *program, void *mem_ctx)
 {
GLboolean any_change;
 
diff --git a/src/mesa/program/prog_optimize.h b/src/mesa/program/prog_optimize.h
index c99ce9ecee..fadfd621c5 100644
--- a/src/mesa/program/prog_optimize.h
+++ b/src/mesa/program/prog_optimize.h
@@ -46,8 +46,7 @@ _mesa_find_temp_intervals(const struct prog_instruction 
*instructions,
   GLint intEnd[MAX_PROGRAM_TEMPS]);
 
 extern void
-_mesa_optimize_program(struct gl_context *ctx, struct gl_program *program,
-   void *mem_ctx);
+_mesa_optimize_program(struct gl_program *program, void *mem_ctx);
 
 extern GLboolean
 _mesa_constant_fold(struct gl_program *prog);

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

Mesa (master): mesa: Make numSamples an unsigned int

[Emil Velikov]

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

Author: Gert Wollny <gw.foss...@gmail.com>
Date:   Thu Jan 18 09:57:27 2018 +0100

mesa: Make numSamples an unsigned int

As a followup to the previous patch propagate the change of numSamples
from int to unsigned to gl_config::samples and consequently fix some
-Wsign-compare warnings.

Signed-off-by: Gert Wollny <gw.foss...@gmail.com>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>

---

 src/mesa/main/context.c| 4 ++--
 src/mesa/main/context.h| 4 ++--
 src/mesa/main/mtypes.h | 2 +-
 src/mesa/main/multisample.c| 2 +-
 src/mesa/state_tracker/st_cb_fbo.c | 2 +-
 src/mesa/state_tracker/st_cb_fbo.h | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 53261fea51..a52c98112e 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -227,7 +227,7 @@ _mesa_create_visual( GLboolean dbFlag,
  GLint accumGreenBits,
  GLint accumBlueBits,
  GLint accumAlphaBits,
- GLint numSamples )
+ GLuint numSamples )
 {
struct gl_config *vis = CALLOC_STRUCT(gl_config);
if (vis) {
@@ -269,7 +269,7 @@ _mesa_initialize_visual( struct gl_config *vis,
  GLint accumGreenBits,
  GLint accumBlueBits,
  GLint accumAlphaBits,
- GLint numSamples )
+ GLuint numSamples )
 {
assert(vis);
 
diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index 17fb86c323..5d9e2ede47 100644
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -79,7 +79,7 @@ _mesa_create_visual( GLboolean dbFlag,
  GLint accumGreenBits,
  GLint accumBlueBits,
  GLint accumAlphaBits,
- GLint numSamples );
+ GLuint numSamples );
 
 extern GLboolean
 _mesa_initialize_visual( struct gl_config *v,
@@ -95,7 +95,7 @@ _mesa_initialize_visual( struct gl_config *v,
  GLint accumGreenBits,
  GLint accumBlueBits,
  GLint accumAlphaBits,
- GLint numSamples );
+ GLuint numSamples );
 
 extern void
 _mesa_destroy_visual( struct gl_config *vis );
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 1f1792e426..af67d59fef 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -242,7 +242,7 @@ struct gl_config
 
/* ARB_multisample / SGIS_multisample */
GLint sampleBuffers;
-   GLint samples;
+   GLuint samples;
 
/* SGIX_pbuffer / GLX 1.3 */
GLint maxPbufferWidth;
diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c
index 8ede94b745..dfe6a37142 100644
--- a/src/mesa/main/multisample.c
+++ b/src/mesa/main/multisample.c
@@ -87,7 +87,7 @@ _mesa_GetMultisamplefv(GLenum pname, GLuint index, GLfloat * 
val)
 
switch (pname) {
case GL_SAMPLE_POSITION: {
-  if ((int) index >= ctx->DrawBuffer->Visual.samples) {
+  if (index >= ctx->DrawBuffer->Visual.samples) {
  _mesa_error( ctx, GL_INVALID_VALUE, "glGetMultisamplefv(index)" );
  return;
   }
diff --git a/src/mesa/state_tracker/st_cb_fbo.c 
b/src/mesa/state_tracker/st_cb_fbo.c
index a982f87b60..3a5c03c335 100644
--- a/src/mesa/state_tracker/st_cb_fbo.c
+++ b/src/mesa/state_tracker/st_cb_fbo.c
@@ -268,7 +268,7 @@ st_new_renderbuffer(struct gl_context *ctx, GLuint name)
  * renderbuffer).  The window system code determines the format.
  */
 struct gl_renderbuffer *
-st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw)
+st_new_renderbuffer_fb(enum pipe_format format, unsigned samples, boolean sw)
 {
struct st_renderbuffer *strb;
 
diff --git a/src/mesa/state_tracker/st_cb_fbo.h 
b/src/mesa/state_tracker/st_cb_fbo.h
index 02dee86576..345c11442c 100644
--- a/src/mesa/state_tracker/st_cb_fbo.h
+++ b/src/mesa/state_tracker/st_cb_fbo.h
@@ -102,7 +102,7 @@ st_ws_framebuffer(struct gl_framebuffer *fb)
 
 
 extern struct gl_renderbuffer *
-st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw);
+st_new_renderbuffer_fb(enum pipe_format format, unsigned samples, boolean sw);
 
 extern void
 st_update_renderbuffer_surface(struct st_context *st,

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

Mesa (master): broadcom: add missing headers to the tarball

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Wed Jan 17 16:27:52 2018 +

broadcom: add missing headers to the tarball

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 src/broadcom/Makefile.sources | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/broadcom/Makefile.sources b/src/broadcom/Makefile.sources
index 25bab6ad06..e2bd075fbd 100644
--- a/src/broadcom/Makefile.sources
+++ b/src/broadcom/Makefile.sources
@@ -13,11 +13,14 @@ BROADCOM_GENXML_XML_FILES = \
 
 BROADCOM_FILES = \
cle/v3d_packet_helpers.h \
-   common/v3d_debug.c \
-   common/v3d_debug.h \
+   cle/v3dx_pack.h\
clif/clif_dump.c \
clif/clif_dump.h \
+   clif/clif_private.h \
+   common/v3d_debug.c \
+   common/v3d_debug.h \
common/v3d_device_info.h \
+   common/v3d_macros.h \
compiler/nir_to_vir.c \
compiler/vir.c \
compiler/vir_dump.c \

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

Mesa (master): vc5: add missing files to the tarball

[Emil Velikov]

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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Wed Jan 17 16:34:48 2018 +

vc5: add missing files to the tarball

Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 src/gallium/drivers/vc5/Makefile.sources | 5 +
 1 file changed, 5 insertions(+)

diff --git a/src/gallium/drivers/vc5/Makefile.sources 
b/src/gallium/drivers/vc5/Makefile.sources
index f5cd8d79f8..bc145806cc 100644
--- a/src/gallium/drivers/vc5/Makefile.sources
+++ b/src/gallium/drivers/vc5/Makefile.sources
@@ -9,6 +9,7 @@ C_SOURCES := \
vc5_drm.h \
vc5_fence.c \
vc5_formats.c \
+   vc5_format_table.h \
vc5_job.c \
vc5_program.c \
vc5_query.c \
@@ -17,14 +18,18 @@ C_SOURCES := \
vc5_screen.c \
vc5_screen.h \
vc5_simulator.c \
+   vc5_simulator_wrapper.c \
+   vc5_simulator_wrapper.h \
vc5_tiling.c \
vc5_tiling.h \
vc5_uniforms.c \
$()
 
 VC5_PER_VERSION_SOURCES = \
+   v3dx_context.h \
v3dx_format_table.c \
v3dx_simulator.c \
+   v3dx_simulator.h \
vc5_draw.c \
vc5_emit.c \
vc5_rcl.c \

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

Mesa (master): glx: fix non-dri build

[Emil Velikov]

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

Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date:   Mon Jan 15 15:38:25 2018 +0100

glx: fix non-dri build

glXGetDriverConfig parameters do not provide a context to dynamically
check for the presence of the function, so the dispatcher directly calls
glXGetDriverConfig, but in non-dri builds dri_glx.c didn't provide
glXGetDriverConfig.

This change make it just return NULL in that case.

Fixes: 84f764a7591 "glxglvnddispatch: Add missing dispatch for GetDriverConfig
Reviewed-by: Nicolai Hähnle <nicolai.haeh...@amd.com>
Reviewed-by: Hans de Goede <hdego...@redhat.com>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>

---

 src/glx/g_glxglvnddispatchfuncs.c | 4 
 1 file changed, 4 insertions(+)

diff --git a/src/glx/g_glxglvnddispatchfuncs.c 
b/src/glx/g_glxglvnddispatchfuncs.c
index 56d894eda7..5b65afc860 100644
--- a/src/glx/g_glxglvnddispatchfuncs.c
+++ b/src/glx/g_glxglvnddispatchfuncs.c
@@ -338,11 +338,15 @@ static Display *dispatch_GetCurrentDisplayEXT(void)
 
 static const char *dispatch_GetDriverConfig(const char *driverName)
 {
+#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
 /*
  * The options are constant for a given driverName, so we do not need
  * a context (and apps expect to be able to call this without one).
  */
 return glXGetDriverConfig(driverName);
+#else
+return NULL;
+#endif
 }
 
 

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