VERSION: bumpre to 19.2.6

docs: Add release notes for 19.2.6
meson: generate .pc files for gles and gles2 with old glvnd
2019-11-21 16:04:47 -08:00 · 2019-11-21 16:04:11 -08:00 · 2019-11-21 17:28:23 +00:00 · 2019-11-21 09:26:26 -08:00 · 2019-11-21 09:26:26 -08:00 · 2019-11-21 09:26:26 -08:00
10 changed files with 152 additions and 69 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-19.2.5
+19.2.6
--- a/docs/relnotes/19.2.5.html
+++ b/docs/relnotes/19.2.5.html
@@ -36,7 +36,7 @@ depends on the particular driver being used.

 <h2>SHA256 checksum</h2>
 <pre>
-TBD.
+    3d010a366b28d10bdd71e32091d8684baf1522e6466c5c5703667091b2108c8b  mesa-19.2.5.tar.xz
 </pre>


--- a/docs/relnotes/19.2.6.html
+++ b/docs/relnotes/19.2.6.html
@@ -0,0 +1,87 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<title>Mesa Release Notes</title>
+<link rel="stylesheet" type="text/css" href="../mesa.css">
+</head>
+<body>
+
+<div class="header">
+<h1>The Mesa 3D Graphics Library</h1>
+</div>
+
+<iframe src="../contents.html"></iframe>
+<div class="content">
+
+<h1>Mesa 19.2.6 Release Notes / 2019-11-21</h1>
+
+<p>
+    Mesa 19.2.6 is a bug fix release which fixes bugs found since the 19.2.5 release.
+</p>
+<p>
+Mesa 19.2.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 <strong>only</strong> available if requested at context creation.
+Compatibility contexts may report a lower version depending on each driver.
+</p>
+<p>
+Mesa 19.2.6 implements the Vulkan 1.1 API, but the version reported by
+the apiVersion property of the VkPhysicalDeviceProperties struct
+depends on the particular driver being used.
+</p>
+
+<h2>SHA256 checksum</h2>
+<pre>
+TBD.
+</pre>
+
+
+<h2>New features</h2>
+
+<ul>
+    <li>None</li>
+</ul>
+
+<h2>Bug fixes</h2>
+
+<ul>
+    <li>glesv2.pc is not built since fafd20f67dec9f589</li>
+    <li>textureSize(samplerExternalOES, int) missing in desktop mesa 19.1.7 implementation</li>
+    <li>[19.2.5] lp_bld_misc: broken #if PIPE_ARCH_LITTLE_ENDIAN on ppc64l</li>
+</ul>
+
+<h2>Changes</h2>
+
+<ul>
+    <p>Alejandro Piñeiro (1):</p>
+    <li>      v3d: adds an extra MOV for any sig.ld*</li>
+    <p></p>
+    <p>Dave Airlie (1):</p>
+    <li>      llvmpipe/ppc: fix if/ifdef confusion in backport.</li>
+    <p></p>
+    <p>Dylan Baker (2):</p>
+    <li>      docs/relnotes/19.2.5: Add SHA256 sum</li>
+    <li>      meson: generate .pc files for gles and gles2 with old glvnd</li>
+    <p></p>
+    <p>Eric Engestrom (1):</p>
+    <li>      vulkan: delete typo&#x27;d header</li>
+    <p></p>
+    <p>Hyunjun Ko (1):</p>
+    <li>      freedreno/ir3: fix printing output registers of FS.</li>
+    <p></p>
+    <p>Jose Maria Casanova Crespo (1):</p>
+    <li>      v3d: Fix predication with atomic image operations</li>
+    <p></p>
+    <p>Yevhenii Kolesnikov (1):</p>
+    <li>      glsl: Enable textureSize for samplerExternalOES</li>
+    <p></p>
+    <p></p>
+</ul>
+
+</div>
+</body>
+</html>
--- a/include/vulkan/vulkan_xlib_randr.h
+++ b/include/vulkan/vulkan_xlib_randr.h
@@ -1,54 +0,0 @@
-#ifndef VULKAN_XLIB_RANDR_H_
-#define VULKAN_XLIB_RANDR_H_ 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-** Copyright (c) 2015-2017 The Khronos Group Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
-
-/*
-** This header is generated from the Khronos Vulkan XML API Registry.
-**
-*/
-
-
-#define VK_EXT_acquire_xlib_display 1
-#define VK_EXT_ACQUIRE_XLIB_DISPLAY_SPEC_VERSION 1
-#define VK_EXT_ACQUIRE_XLIB_DISPLAY_EXTENSION_NAME "VK_EXT_acquire_xlib_display"
-
-typedef VkResult (VKAPI_PTR *PFN_vkAcquireXlibDisplayEXT)(VkPhysicalDevice physicalDevice, Display* dpy, VkDisplayKHR display);
-typedef VkResult (VKAPI_PTR *PFN_vkGetRandROutputDisplayEXT)(VkPhysicalDevice physicalDevice, Display* dpy, RROutput rrOutput, VkDisplayKHR* pDisplay);
-
-#ifndef VK_NO_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkAcquireXlibDisplayEXT(
-    VkPhysicalDevice                            physicalDevice,
-    Display*                                    dpy,
-    VkDisplayKHR                                display);
-
-VKAPI_ATTR VkResult VKAPI_CALL vkGetRandROutputDisplayEXT(
-    VkPhysicalDevice                            physicalDevice,
-    Display*                                    dpy,
-    RROutput                                    rrOutput,
-    VkDisplayKHR*                               pDisplay);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
--- a/src/broadcom/compiler/nir_to_vir.c
+++ b/src/broadcom/compiler/nir_to_vir.c
@@ -406,6 +406,20 @@ ntq_init_ssa_def(struct v3d_compile *c, nir_ssa_def *def)
        return qregs;
 }

+static bool
+is_ld_signal(const struct v3d_qpu_sig *sig)
+{
+        return (sig->ldunif ||
+                sig->ldunifa ||
+                sig->ldunifrf ||
+                sig->ldunifarf ||
+                sig->ldtmu ||
+                sig->ldvary ||
+                sig->ldvpm ||
+                sig->ldtlb ||
+                sig->ldtlbu);
+}
+
 /**
 * This function is responsible for getting VIR results into the associated
 * storage for a NIR instruction.
@@ -453,11 +467,12 @@ ntq_store_dest(struct v3d_compile *c, nir_dest *dest, int chan,
                        _mesa_hash_table_search(c->def_ht, reg);
                struct qreg *qregs = entry->data;

-                /* Insert a MOV if the source wasn't an SSA def in the
-                 * previous instruction.
+                /* If the previous instruction can't be predicated for
+                 * the store into the nir_register, then emit a MOV
+                 * that can be.
                 */
-                if ((vir_in_nonuniform_control_flow(c) &&
-                     c->defs[last_inst->dst.index]->qpu.sig.ldunif)) {
+                if (vir_in_nonuniform_control_flow(c) &&
+                    is_ld_signal(&c->defs[last_inst->dst.index]->qpu.sig)) {
                        result = vir_MOV(c, result);
                        last_inst = c->defs[result.index];
                }
--- a/src/broadcom/compiler/v3d40_tex.c
+++ b/src/broadcom/compiler/v3d40_tex.c
@@ -388,9 +388,21 @@ v3d40_vir_emit_image_load_store(struct v3d_compile *c,
                }
        }

+        if (vir_in_nonuniform_control_flow(c) &&
+            instr->intrinsic != nir_intrinsic_image_deref_load) {
+           vir_set_pf(vir_MOV_dest(c, vir_nop_reg(), c->execute),
+                      V3D_QPU_PF_PUSHZ);
+        }
+
        vir_TMU_WRITE(c, V3D_QPU_WADDR_TMUSF, ntq_get_src(c, instr->src[1], 0),
                      &tmu_writes);

+        if (vir_in_nonuniform_control_flow(c) &&
+            instr->intrinsic != nir_intrinsic_image_deref_load) {
+           struct qinst *last_inst= (struct  qinst *)c->cur_block->instructions.prev;
+           vir_set_cond(last_inst, V3D_QPU_COND_IFA);
+        }
+
        vir_emit_thrsw(c);

        /* The input FIFO has 16 slots across all threads, so make sure we
--- a/src/compiler/glsl/builtin_functions.cpp
+++ b/src/compiler/glsl/builtin_functions.cpp
@@ -2094,6 +2094,8 @@ builtin_builder::create_builtins()
                _textureSize(texture_multisample_array, glsl_type::ivec3_type, glsl_type::sampler2DMSArray_type),
                _textureSize(texture_multisample_array, glsl_type::ivec3_type, glsl_type::isampler2DMSArray_type),
                _textureSize(texture_multisample_array, glsl_type::ivec3_type, glsl_type::usampler2DMSArray_type),
+
+                _textureSize(texture_external_es3, glsl_type::ivec2_type, glsl_type::samplerExternalOES_type),
                NULL);

   add_function("textureSize1D",
--- a/src/freedreno/ir3/ir3_shader.c
+++ b/src/freedreno/ir3/ir3_shader.c
@@ -405,8 +405,9 @@ ir3_shader_disasm(struct ir3_shader_variant *so, uint32_t *bin, FILE *out)
 	fprintf(out, "; %s: outputs:", type);
 	for (i = 0; i < so->outputs_count; i++) {
 		uint8_t regid = so->outputs[i].regid;
-		fprintf(out, " r%d.%c (%s)",
-				(regid >> 2), "xyzw"[regid & 0x3],
+		const char *reg_type = so->outputs[i].half ? "hr" : "r";
+		fprintf(out, " %s%d.%c (%s)",
+				reg_type, (regid >> 2), "xyzw"[regid & 0x3],
 				output_name(so, i));
 	}
 	fprintf(out, "\n");
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
@@ -705,7 +705,7 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
    */
   builder.setCodeModel(CodeModel::Large);

-#if PIPE_ARCH_LITTLE_ENDIAN
+#ifdef PIPE_ARCH_LITTLE_ENDIAN
   /*
    * Versions of LLVM prior to 4.0 lacked a table entry for "POWER8NVL",
    * resulting in (big-endian) "generic" being returned on
--- a/src/mapi/meson.build
+++ b/src/mapi/meson.build
@@ -1,4 +1,4 @@
-# Copyright © 2017 Intel Corporation
+# Copyright © 2017-2019 Intel Corporation

 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -35,11 +35,31 @@ if with_shared_glapi
 else
  libglapi = []
 endif
-if not with_glvnd
-  if with_gles1
+if with_gles1
+  if not with_glvnd
    subdir('es1api')
-  endif
-  if with_gles2
-    subdir('es2api')
+  elif not glvnd_has_headers_and_pc_files
+    pkg.generate(
+      name : 'glesv1_cm',
+      filebase : 'glesv1_cm',
+      description : 'Mesa OpenGL ES 1.1 CM library',
+      version : meson.project_version(),
+      libraries : '-L${libdir} -lGLESv1_CM',
+      libraries_private : gl_priv_libs,
+    )
+  endif
+endif
+if with_gles2
+  if not with_glvnd
+    subdir('es2api')
+  elif not glvnd_has_headers_and_pc_files
+    pkg.generate(
+      name : 'glesv2',
+      filebase : 'glesv2',
+      description : 'Mesa OpenGL ES 2.0 library',
+      version : meson.project_version(),
+      libraries : '-L${libdir} -lGLESv2',
+      libraries_private : gl_priv_libs,
+    )
  endif
 endif
Author	SHA1	Message	Date
Dylan Baker	5836dd66e0	VERSION: bumpre to 19.2.6	2019-11-21 16:04:47 -08:00
Dylan Baker	264d1187df	docs: Add release notes for 19.2.6	2019-11-21 16:04:11 -08:00
Dylan Baker	aa620fdf8e	meson: generate .pc files for gles and gles2 with old glvnd Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/1921	2019-11-21 17:28:23 +00:00
Yevhenii Kolesnikov	05d5784ea6	glsl: Enable textureSize for samplerExternalOES From OES_EGL_image_external_essl3 Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/1901 Signed-off-by: Yevhenii Kolesnikov <yevhenii.kolesnikov@globallogic.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com> Acked-by: Tapani Pälli <tapani.palli@intel.com>	2019-11-21 09:26:26 -08:00
Dave Airlie	b1f505463d	llvmpipe/ppc: fix if/ifdef confusion in backport. Fixes: `32aba91c07` (llvmpipe: use ppc64le/ppc64 Large code model for JIT-compiled shaders) Reviewed-by: Dylan Baker <dylan@pnwbakers.com> Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2131	2019-11-21 09:26:26 -08:00
Hyunjun Ko	c2488d810b	freedreno/ir3: fix printing output registers of FS. Fixes: `cea39af2fb` ("freedreno/ir3: Generalize ir3_shader_disasm()") Reviewed-by: Rob Clark <robdclark@gmail.com> (cherry picked from commit `d0f38394b1`)	2019-11-21 09:26:26 -08:00
Alejandro Piñeiro	e594e4cefd	v3d: adds an extra MOV for any sig.ld* Specifically when we are in non-uniform control flow, as we would need to set the condition for the last instruction. If (for example) a image atomic load stores directly their value on a NIR register, last_inst would be a nop, and would fail when set the condition. Fixes piglit test: spec/glsl-es-3.10/execution/cs-ssbo-atomic-if-else-2.shader_test Fixes: `6281f26f06` ("v3d: Add support for shader_image_load_store.") v2: (Changes suggested by Eric Anholt) * Cover all sig.ld* signals, not just ldunif and ldtmu, as all of them have the same restriction. * Update comment explaining why we add a MOV in that case * Tweak commit message. v3: * Drop extra set of parens (Eric) * Add missing ld signal to is_ld_signal to fix shader-db regression. Reviewed-by: Eric Anholt <eric@anholt.net> (cherry picked from commit `b4bc59e37e`)	2019-11-21 09:26:26 -08:00
Jose Maria Casanova Crespo	8f526ee7cd	v3d: Fix predication with atomic image operations Fixes dEQP test: dEQP-GLES31.functional.synchronization.inter_call.with_memory_barrier.image_atomic_multiple_interleaved_write_read Fixes piglit test: spec/glsl-es-3.10/execution/cs-image-atomic-if-else.shader_test Fixes: `6281f26f06` ("v3d: Add support for shader_image_load_store.") Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com> Reviewed-by: Eric Anholt <eric@anholt.net> (cherry picked from commit `d983055184`)	2019-11-21 09:26:26 -08:00
Eric Engestrom	be8a46d064	vulkan: delete typo'd header Two files exist in that directory: - vulkan_xlib_randr.h - vulkan_xlib_xrandr.h Both were imported in `205c271562` ("vulkan: Update the XML and headers to 1.1.70") with identical contents (ie. the VK_EXT_acquire_xlib_display extension), but the former was never included anywhere and can't be found upstream [1], while the latter is included in vulkan.h and found upstream. [1] https://github.com/KhronosGroup/Vulkan-Headers/tree/master/include/vulkan Fixes: `205c271562` ("vulkan: Update the XML and headers to 1.1.70") Signed-off-by: Eric Engestrom <eric.engestrom@intel.com> Acked-by: Jason Ekstrand <jason@jlekstrand.net> (cherry picked from commit `344859c32d`)	2019-11-21 09:26:26 -08:00
Dylan Baker	4c86eda2c2	docs/relnotes/19.2.5: Add SHA256 sum	2019-11-20 09:18:11 -08:00
@@ -1 +1 @@
 .2.5
 .2.6