Mesa (17.2): 50 new commits

2017-11-23 Thread Andres Gomez 
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=9888913a5794435181fef5468efabd3725aece3e
Author: Andres Gomez 
Date:   Thu Nov 16 17:30:41 2017 +0200

cherry-ignore: Revert "intel/fs: Use a pure vertical stride for large 
register strides"

extra: The commit just references a proper fix that has already
landed.

Signed-off-by: Andres Gomez 

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=a231bbd639df116691aea3b67d56208b9af6dd21
Author: Andres Gomez 
Date:   Fri Nov 17 14:01:36 2017 +0200

cherry-ignore: egl: pass the dri2_dpy to the $plat_teardown functions

fixes: This commit makes reference to 2 other commits but none have
made it to the 17.2 queue.

Signed-off-by: Andres Gomez 

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f6d3eed51319d1302f23c69d2fb889988abee984
Author: Andres Gomez 
Date:   Sat Nov 11 03:45:34 2017 +0200

cherry-ignore: glsl: Fix typo fragement -> fragment

fixes: This commit is only a typo correction on an error message.

Signed-off-by: Andres Gomez 

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ba0f965771299fd2bfc677483fa0e1659be47ea2
Author: Andres Gomez 
Date:   Sat Nov 11 02:42:37 2017 +0200

cherry-ignore: added 17.3 nominations.

stable: 17.3 nominations only.

Signed-off-by: Andres Gomez 

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=8cd5bd2a8aeee01c8c83d6676bdb9051d43d9cca
Author: Andres Gomez 
Date:   Tue Nov 21 02:14:26 2017 +0200

cherry-ignore: i965: Mark BOs as external when we export their handle

stable: These commits addressed earlier commit 2c4097aff1b which did
not land in branch.

Signed-off-by: Andres Gomez 

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=807da6e270fed89e7f281fb68c14235e7fb01c1b
Author: Andres Gomez 
Date:   Tue Nov 21 01:48:29 2017 +0200

cherry-ignore: anv/cmd_buffer: Take bo_offset into account in fast clear 
state addresses

stable: This commit addressed earlier commit a62a97933578 which did
not land in branch.

Signed-off-by: Andres Gomez 

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c9325693f1cb15bbf84470081b97d55df967b6f3
Author: Andres Gomez 
Date:   Tue Nov 21 01:45:47 2017 +0200

cherry-ignore: anv/cmd_buffer: Advance the address when initializing clear 
colors

stable: This commit depends on earlier commit 3735af04152b which did
not land in branch.

Signed-off-by: Andres Gomez 

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=1519933ce2702eccad5e4abf70d187116bf4ee6d
Author: Andres Gomez 
Date:   Tue Nov 14 17:14:59 2017 +0200

cherry-ignore: r600/shader: reserve first register of vertex shader.

stable: This commit addressed earlier commit ea1b97714d9b which did
not land in branch.

Signed-off-by: Andres Gomez 

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d255b77237a19623f8cf48b46dcb2f6f041956e6
Author: Andres Gomez 
Date:   Mon Nov 13 23:36:04 2017 +0200

cherry-ignore: intel/fs: refactors

stable: These commits are refactorings rather than fixes.

Signed-off-by: Andres Gomez 

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=96be105d4195b223d28e09a23d0e2246b6fbf362
Author: Andres Gomez 
Date:   Sat Nov 11 03:29:57 2017 +0200

cherry-ignore: intel/fs: Use the original destination region for int MUL 
lowering

stable: These commits resulted in a CTS regression being addressed at
https://bugs.freedesktop.org/show_bug.cgi?id=103626 .

Signed-off-by: Andres Gomez 

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=010751e95da1823713c85b886ee80fb92f6a92f7
Author: Andres Gomez 
Date:   Sat Nov 11 03:25:33 2017 +0200

cherry-ignore: intel/nir: Use the correct indirect lowering masks in 
link_shaders

stable: These commits addressed earlier commit 379b24a40d3 which did
not land in branch.

Signed-off-by: Andres Gomez 

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f562d93049df4824bd650419de5af1564f21e081
Author: Andres Gomez 
Date:   Wed Nov 15 21:19:57 2017 +0200

cherry-ignore: intel/fs: Use a pure vertical stride for large register 
strides

stable: This commit is not really needed after 6ac2d169019.

Signed-off-by: Andres Gomez 

URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=49277c6e367f33b5badeb25b79b8cc19df98de52
Author: Nicolai Hähnle 
Date:   Fri

Mesa (master): etnaviv: Emit vertex buffers consecutively

2017-11-23 Thread Christian Gmeiner 
Module: Mesa
Branch: master
Commit: 35548cae93513875dcad9cc88589add5fac7d836
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=35548cae93513875dcad9cc88589add5fac7d836

Author: Wladimir J. van der Laan 
Date:   Thu Nov 23 10:08:34 2017 +0100

etnaviv: Emit vertex buffers consecutively

Vertex buffer legacy state is no longer picked up with new drawing
commands. Change to use different cases depending on the number of
vertex streams in the GPU specs.

This results in slightly more compact state emission as well, on all
vivantes.

Signed-off-by: Wladimir J. van der Laan 
Reviewed-by: Lucas Stach 
Reviewed-by: Christian Gmeiner 

---

 src/gallium/drivers/etnaviv/etnaviv_emit.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/etnaviv/etnaviv_emit.c 
b/src/gallium/drivers/etnaviv/etnaviv_emit.c
index 999d2ca06a..41504ac41f 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_emit.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_emit.c
@@ -391,18 +391,18 @@ etna_emit_state(struct etna_context *ctx)
   /*00644*/ EMIT_STATE_RELOC(FE_INDEX_STREAM_BASE_ADDR, 
>index_buffer.FE_INDEX_STREAM_BASE_ADDR);
   /*00648*/ EMIT_STATE(FE_INDEX_STREAM_CONTROL, 
ctx->index_buffer.FE_INDEX_STREAM_CONTROL);
}
-   if (likely(dirty & (ETNA_DIRTY_VERTEX_BUFFERS))) {
+   if (likely((dirty & (ETNA_DIRTY_VERTEX_BUFFERS) && ctx->specs.stream_count 
== 1))) {
   /*0064C*/ EMIT_STATE_RELOC(FE_VERTEX_STREAM_BASE_ADDR, 
>vertex_buffer.cvb[0].FE_VERTEX_STREAM_BASE_ADDR);
   /*00650*/ EMIT_STATE(FE_VERTEX_STREAM_CONTROL, 
ctx->vertex_buffer.cvb[0].FE_VERTEX_STREAM_CONTROL);
}
if (likely(dirty & (ETNA_DIRTY_INDEX_BUFFER))) {
   /*00674*/ EMIT_STATE(FE_PRIMITIVE_RESTART_INDEX, 
ctx->index_buffer.FE_PRIMITIVE_RESTART_INDEX);
}
-   if (likely(dirty & (ETNA_DIRTY_VERTEX_BUFFERS))) {
-  for (int x = 1; x < ctx->vertex_buffer.count; ++x) {
+   if (likely((dirty & (ETNA_DIRTY_VERTEX_BUFFERS)) && ctx->specs.stream_count 
> 1)) {
+  for (int x = 0; x < ctx->vertex_buffer.count; ++x) {
  /*00680*/ EMIT_STATE_RELOC(FE_VERTEX_STREAMS_BASE_ADDR(x), 
>vertex_buffer.cvb[x].FE_VERTEX_STREAM_BASE_ADDR);
   }
-  for (int x = 1; x < ctx->vertex_buffer.count; ++x) {
+  for (int x = 0; x < ctx->vertex_buffer.count; ++x) {
  if (ctx->vertex_buffer.cvb[x].FE_VERTEX_STREAM_BASE_ADDR.bo) {
 /*006A0*/ EMIT_STATE(FE_VERTEX_STREAMS_CONTROL(x), 
ctx->vertex_buffer.cvb[x].FE_VERTEX_STREAM_CONTROL);
  }

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

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

2017-11-23 Thread Eric Engeström 
Module: Mesa
Branch: master
Commit: 99aea1e3ded03d7a51459efd085842ffedff590b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=99aea1e3ded03d7a51459efd085842ffedff590b

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

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

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

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

---

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

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

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

Mesa (master): genxml: fix assert guards

2017-11-23 Thread Eric Engeström 
Module: Mesa
Branch: master
Commit: 1d3944aeebb0cc68c999e0d129edbdc29381cb4d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d3944aeebb0cc68c999e0d129edbdc29381cb4d

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

genxml: fix assert guards

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

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

---

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

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

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

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

2017-11-23 Thread Eric Engeström 
Module: Mesa
Branch: master
Commit: ab0809e5529725bd0af6f7b6ce06415020b9d32e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ab0809e5529725bd0af6f7b6ce06415020b9d32e

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

meson: fix strtof locale support check

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

---

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

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

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

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

2017-11-23 Thread Eric Engeström 
Module: Mesa
Branch: master
Commit: d16af7355900703514d95411b222e6e028252d66
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d16af7355900703514d95411b222e6e028252d66

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

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

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

---

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

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

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

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

2017-11-23 Thread Eric Engeström 
Module: Mesa
Branch: master
Commit: f9cb2370f3404501c2b594ac116bfb6bfe878e87
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f9cb2370f3404501c2b594ac116bfb6bfe878e87

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

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

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

---

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

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

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