From 3e8e1aedc810ca84f09e2a2f94a821b1d41ecf2f2c40f5b59034ba0c7f30043c Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 2 Dec 2021 10:49:11 +0000 Subject: [PATCH] trying to fix conflict issues OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1071 --- Mesa-drivers.changes | 54 +++++++++++++++++++++++++++++++++++++++++ Mesa-drivers.spec | 9 +++++++ Mesa.changes | 54 +++++++++++++++++++++++++++++++++++++++++ Mesa.spec | 9 +++++++ mesa-21.3.1.tar.xz | 3 +++ mesa-21.3.1.tar.xz.sig | Bin 0 -> 329 bytes 6 files changed, 129 insertions(+) create mode 100644 mesa-21.3.1.tar.xz create mode 100644 mesa-21.3.1.tar.xz.sig diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index ec55cc2..6e00d7a 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +<<<<<<< .mine +Wed Dec 1 23:15:13 UTC 2021 - Stefan Dirsch + +- update to 21.3.1 + * mostly AMD, Intel & Zink fixes. + ------------------------------------------------------------------- Thu Nov 18 03:13:33 UTC 2021 - Stefan Dirsch @@ -44,6 +51,53 @@ Wed Nov 17 21:33:28 UTC 2021 - Stefan Dirsch * EGL_EXT_present_opaque on wayland ------------------------------------------------------------------- +======= +Thu Nov 18 03:13:33 UTC 2021 - Stefan Dirsch + +- n_buildfix-21.3.0.patch + * fixes Mesa-drivers build + +------------------------------------------------------------------- +Wed Nov 17 21:33:28 UTC 2021 - Stefan Dirsch + +- update to 21.3.0 + * Panfrost is now officially GLES 3.1 conformant + * RADV has (experimental) ray tracing support + * Iris gained threaded shader compilation + * Zink has seen an enormous amount of work, and now supports GLES 3.2 + * Lavapipe has a bunch of new extensions, and now supports Vulkan 1.2 + * LLVMpipe got 2-3 times faster for 2D workloads, and gained support for + the compatibility profile on GL 4.5 + * VA-API gained support for AV1 videos + * EGL now works on Windows + * Wayland got a workaround for games making bad assumption (alpha means + transparency? who could have known) + * VK_EXT_color_write_enable on lavapipe + * GL_ARB_texture_filter_anisotropic in llvmpipe + * Anisotropic texture filtering in lavapipe + * VK_EXT_shader_atomic_float2 on Intel and RADV. + * VK_EXT_vertex_input_dynamic_state on RADV. + * VK_KHR_timeline_semaphore on lavapipe + * VK_EXT_external_memory_host on lavapipe + * GL_AMD_pinned_memory on llvmpipe + * GL 4.5 compatibility on llvmpipe + * VK_EXT_primitive_topology_list_restart on RADV and lavapipe. + * ES 3.2 on zink + * VK_KHR_depth_stencil_resolve on lavapipe + * VK_KHR_shader_integer_dot_product on RADV. + * OpenGL FP16 support on llvmpipe + * VK_KHR_shader_float16_int8 on lavapipe + * VK_KHR_shader_subgroup_extended_types on lavapipe + * VK_KHR_spirv_1_4 on lavapipe + * Experimental raytracing support on RADV + * VK_KHR_synchronization2 on Intel + * NGG shader based culling is now enabled by default on GFX10.3 on RADV. + * VK_KHR_maintenance4 on RADV + * VK_KHR_format_feature_flags2 on RADV. + * EGL_EXT_present_opaque on wayland + +------------------------------------------------------------------- +>>>>>>> .new Thu Oct 28 19:07:09 UTC 2021 - Stefan Dirsch - update to 21.2.5 diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index db5a9f1..a0e1b22 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -41,7 +41,11 @@ %define glamor 1 %define _name_archive mesa +<<<<<<< .mine +%define _version 21.3.1 +======= %define _version 21.3.0 +>>>>>>> .new %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -114,8 +118,13 @@ %endif Name: Mesa-drivers +<<<<<<< .mine +Version: 21.3.1 +Release: 0 +======= Version: 21.3.0 Release: 0 +>>>>>>> .new Summary: System for rendering 3-D graphics License: MIT Group: System/Libraries diff --git a/Mesa.changes b/Mesa.changes index ec55cc2..6e00d7a 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +<<<<<<< .mine +Wed Dec 1 23:15:13 UTC 2021 - Stefan Dirsch + +- update to 21.3.1 + * mostly AMD, Intel & Zink fixes. + ------------------------------------------------------------------- Thu Nov 18 03:13:33 UTC 2021 - Stefan Dirsch @@ -44,6 +51,53 @@ Wed Nov 17 21:33:28 UTC 2021 - Stefan Dirsch * EGL_EXT_present_opaque on wayland ------------------------------------------------------------------- +======= +Thu Nov 18 03:13:33 UTC 2021 - Stefan Dirsch + +- n_buildfix-21.3.0.patch + * fixes Mesa-drivers build + +------------------------------------------------------------------- +Wed Nov 17 21:33:28 UTC 2021 - Stefan Dirsch + +- update to 21.3.0 + * Panfrost is now officially GLES 3.1 conformant + * RADV has (experimental) ray tracing support + * Iris gained threaded shader compilation + * Zink has seen an enormous amount of work, and now supports GLES 3.2 + * Lavapipe has a bunch of new extensions, and now supports Vulkan 1.2 + * LLVMpipe got 2-3 times faster for 2D workloads, and gained support for + the compatibility profile on GL 4.5 + * VA-API gained support for AV1 videos + * EGL now works on Windows + * Wayland got a workaround for games making bad assumption (alpha means + transparency? who could have known) + * VK_EXT_color_write_enable on lavapipe + * GL_ARB_texture_filter_anisotropic in llvmpipe + * Anisotropic texture filtering in lavapipe + * VK_EXT_shader_atomic_float2 on Intel and RADV. + * VK_EXT_vertex_input_dynamic_state on RADV. + * VK_KHR_timeline_semaphore on lavapipe + * VK_EXT_external_memory_host on lavapipe + * GL_AMD_pinned_memory on llvmpipe + * GL 4.5 compatibility on llvmpipe + * VK_EXT_primitive_topology_list_restart on RADV and lavapipe. + * ES 3.2 on zink + * VK_KHR_depth_stencil_resolve on lavapipe + * VK_KHR_shader_integer_dot_product on RADV. + * OpenGL FP16 support on llvmpipe + * VK_KHR_shader_float16_int8 on lavapipe + * VK_KHR_shader_subgroup_extended_types on lavapipe + * VK_KHR_spirv_1_4 on lavapipe + * Experimental raytracing support on RADV + * VK_KHR_synchronization2 on Intel + * NGG shader based culling is now enabled by default on GFX10.3 on RADV. + * VK_KHR_maintenance4 on RADV + * VK_KHR_format_feature_flags2 on RADV. + * EGL_EXT_present_opaque on wayland + +------------------------------------------------------------------- +>>>>>>> .new Thu Oct 28 19:07:09 UTC 2021 - Stefan Dirsch - update to 21.2.5 diff --git a/Mesa.spec b/Mesa.spec index a1ba32b..936f7ae 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -40,7 +40,11 @@ %define glamor 1 %define _name_archive mesa +<<<<<<< .mine +%define _version 21.3.1 +======= %define _version 21.3.0 +>>>>>>> .new %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -113,8 +117,13 @@ %endif Name: Mesa +<<<<<<< .mine +Version: 21.3.1 +Release: 0 +======= Version: 21.3.0 Release: 0 +>>>>>>> .new Summary: System for rendering 3-D graphics License: MIT Group: System/Libraries diff --git a/mesa-21.3.1.tar.xz b/mesa-21.3.1.tar.xz new file mode 100644 index 0000000..dc52a04 --- /dev/null +++ b/mesa-21.3.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b0dc2540cb192525741d00f706dbc4586349185dafc65729c7fda0800cc474d +size 16439988 diff --git a/mesa-21.3.1.tar.xz.sig b/mesa-21.3.1.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..64c7d4cf9d9a9a520cd657eec2ed1b140df06ec5f35e555c7494503750e2e01f GIT binary patch literal 329 zcmV-P0k-~$0Y(G>0SEvv79j*zRUP45mXBjW!btXwjxn#pBq*i@0%51j8xkC4a%p2g zWo~C>b98cVZ7ySI0162ZjgB#|!z3uC#)$|2UvxVLi~3=&^qJhAQ~`R5x_7|69I z5*!w3hU)3D_RB zHZPejV#%7&=-xYwBTX_C0qC`2sOS7Sj)l)XGkS@EBdkJ^L5u