From c46e5df24543d23ae81315f9a83e53c99e5abb12 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 23 Feb 2015 23:30:13 +0300 Subject: [PATCH 01/12] 10.6.0-devel Signed-off-by: Igor Gnatenko --- .gitignore | 1 + mesa.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index dc6259b..661cb04 100644 --- a/.gitignore +++ b/.gitignore @@ -104,3 +104,4 @@ mesa-20100720.tar.bz2 /mesa-c3260f8.tar.xz /mesa-6171131.tar.xz /mesa-20150218.tar.xz +/mesa-f80af89.tar.xz diff --git a/mesa.spec b/mesa.spec index bd65668..f61c413 100644 --- a/mesa.spec +++ b/mesa.spec @@ -47,14 +47,14 @@ %define _default_patch_fuzz 2 -%define gitdate 20150218 -#% define githash 6171131 +#% define gitdate 20150218 +%define githash f80af89 %define git %{?githash:%{githash}}%{!?githash:%{gitdate}} Summary: Mesa graphics libraries Name: mesa -Version: 10.5.0 -Release: 1.%{git}%{?dist} +Version: 10.6.0 +Release: 0.devel.1.%{git}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -710,6 +710,9 @@ rm -rf $RPM_BUILD_ROOT # Generate changelog using: # git log old_commit_sha..new_commit_sha --format="- %H: %s (%an)" %changelog +* Mon Feb 23 2015 Igor Gnatenko - 10.6.0-0.devel.1.f80af89 +- f80af89 + * Wed Feb 18 2015 Igor Gnatenko - 10.5.0-1.20150218 - 10.5.0 diff --git a/sources b/sources index f247b43..17c90b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b417d3a63446ce36c3d28186d0cbd6ed mesa-20150218.tar.xz +13303619776a845eca2d2b08552aba80 mesa-f80af89.tar.xz From 28f7e7ed51c36878688e4fc2d370a1ed9b19a6e8 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Fri, 27 Feb 2015 14:05:39 -0500 Subject: [PATCH 02/12] enable vc4 on arm --- mesa.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index f61c413..2e1d04d 100644 --- a/mesa.spec +++ b/mesa.spec @@ -37,6 +37,7 @@ %define with_omx 1 %endif %ifarch %{arm} aarch64 +%define with_vc4 1 %define with_freedreno 1 %define with_xa 1 %define with_omx 1 @@ -54,7 +55,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 10.6.0 -Release: 0.devel.1.%{git}%{?dist} +Release: 0.devel.2.%{git}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -414,7 +415,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS %{?with_opencl:-frtti -fexceptions} %{!?with_ope %if %{with_hardware} %{?with_xa:--enable-xa} \ %{?with_nine:--enable-nine} \ - --with-gallium-drivers=%{?with_vmware:svga,}%{?with_radeonsi:radeonsi,}%{?with_llvm:swrast,r600,}%{?with_freedreno:freedreno,}%{?with_ilo:ilo,}r300,nouveau \ + --with-gallium-drivers=%{?with_vmware:svga,}%{?with_radeonsi:radeonsi,}%{?with_llvm:swrast,r600,}%{?with_freedreno:freedreno,}%{?with_vc4:vc4,}%{?with_ilo:ilo,}r300,nouveau \ %else --with-gallium-drivers=%{?with_llvm:swrast} \ %endif @@ -547,6 +548,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/dri/ilo_dri.so %endif %endif +%if 0%{?with_vc4} +%{_libdir}/dri/vc4_dri.so +%endif %if 0%{?with_freedreno} %{_libdir}/dri/kgsl_dri.so %{_libdir}/dri/msm_dri.so @@ -710,6 +714,9 @@ rm -rf $RPM_BUILD_ROOT # Generate changelog using: # git log old_commit_sha..new_commit_sha --format="- %H: %s (%an)" %changelog +* Fri Feb 27 2015 Rob Clark - 10.6.0-0.devel.1.f80af89 - f80af89 From b672210c09fe6fae2cc979e8c2fd16bc94a1c0dd Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 9 Apr 2015 17:49:11 -0400 Subject: [PATCH 03/12] F23 rebuild against llvm 3.6.0 --- mesa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa.spec b/mesa.spec index 2e1d04d..3970e9d 100644 --- a/mesa.spec +++ b/mesa.spec @@ -55,7 +55,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 10.6.0 -Release: 0.devel.2.%{git}%{?dist} +Release: 0.devel.3.%{git}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -714,6 +714,9 @@ rm -rf $RPM_BUILD_ROOT # Generate changelog using: # git log old_commit_sha..new_commit_sha --format="- %H: %s (%an)" %changelog +* Thu Apr 09 2015 Adam Jackson 10.6.0-0.devel.3 +- F23 rebuild against llvm 3.6.0 + * Fri Feb 27 2015 Rob Clark Date: Mon, 20 Apr 2015 22:35:28 +0300 Subject: [PATCH 04/12] c1485f4 Signed-off-by: Igor Gnatenko --- .gitignore | 2 ++ mesa.spec | 7 +++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 661cb04..b995961 100644 --- a/.gitignore +++ b/.gitignore @@ -105,3 +105,5 @@ mesa-20100720.tar.bz2 /mesa-6171131.tar.xz /mesa-20150218.tar.xz /mesa-f80af89.tar.xz +/mesa-3282e57.tar.xz +/mesa-c1485f4.tar.xz diff --git a/mesa.spec b/mesa.spec index 3970e9d..205f72a 100644 --- a/mesa.spec +++ b/mesa.spec @@ -49,13 +49,13 @@ %define _default_patch_fuzz 2 #% define gitdate 20150218 -%define githash f80af89 +%define githash c1485f4 %define git %{?githash:%{githash}}%{!?githash:%{gitdate}} Summary: Mesa graphics libraries Name: mesa Version: 10.6.0 -Release: 0.devel.3.%{git}%{?dist} +Release: 0.devel.4.%{git}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -714,6 +714,9 @@ rm -rf $RPM_BUILD_ROOT # Generate changelog using: # git log old_commit_sha..new_commit_sha --format="- %H: %s (%an)" %changelog +* Mon Apr 20 2015 Igor Gnatenko - 10.6.0-0.devel.4.c1485f4 +- c1485f4 + * Thu Apr 09 2015 Adam Jackson 10.6.0-0.devel.3 - F23 rebuild against llvm 3.6.0 diff --git a/sources b/sources index 17c90b5..7421dbf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -13303619776a845eca2d2b08552aba80 mesa-f80af89.tar.xz +b445dcb0517f3b9c560799c612d687aa mesa-c1485f4.tar.xz From 3d686dd14b9fbc871319cac3ff6d510a4a247b2c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 7 May 2015 01:37:36 +0300 Subject: [PATCH 05/12] 51e3453 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + mesa.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b995961..62d9f41 100644 --- a/.gitignore +++ b/.gitignore @@ -107,3 +107,4 @@ mesa-20100720.tar.bz2 /mesa-f80af89.tar.xz /mesa-3282e57.tar.xz /mesa-c1485f4.tar.xz +/mesa-51e3453.tar.xz diff --git a/mesa.spec b/mesa.spec index 205f72a..ddf0c94 100644 --- a/mesa.spec +++ b/mesa.spec @@ -49,13 +49,13 @@ %define _default_patch_fuzz 2 #% define gitdate 20150218 -%define githash c1485f4 +%define githash 51e3453 %define git %{?githash:%{githash}}%{!?githash:%{gitdate}} Summary: Mesa graphics libraries Name: mesa Version: 10.6.0 -Release: 0.devel.4.%{git}%{?dist} +Release: 0.devel.5.%{git}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -714,6 +714,9 @@ rm -rf $RPM_BUILD_ROOT # Generate changelog using: # git log old_commit_sha..new_commit_sha --format="- %H: %s (%an)" %changelog +* Thu May 07 2015 Igor Gnatenko - 10.6.0-0.devel.5.51e3453 +- 51e3453 + * Mon Apr 20 2015 Igor Gnatenko - 10.6.0-0.devel.4.c1485f4 - c1485f4 diff --git a/sources b/sources index 7421dbf..62363f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b445dcb0517f3b9c560799c612d687aa mesa-c1485f4.tar.xz +42b604d6c6d27403a5df88a569c38f03 mesa-51e3453.tar.xz From 69cda04199b977a20c7c95bb1d191756176f678a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 17 May 2015 15:02:03 +0300 Subject: [PATCH 06/12] fix building on arm Signed-off-by: Igor Gnatenko --- mesa-10.6-nir-linker.patch | 506 +++++++++++++++++++++++++++++++++++++ mesa.spec | 5 + 2 files changed, 511 insertions(+) create mode 100644 mesa-10.6-nir-linker.patch diff --git a/mesa-10.6-nir-linker.patch b/mesa-10.6-nir-linker.patch new file mode 100644 index 0000000..5713c0a --- /dev/null +++ b/mesa-10.6-nir-linker.patch @@ -0,0 +1,506 @@ +From patchwork Wed Apr 15 14:08:02 2015 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [Mesa-dev, + 1/9] freedreno: use CXX linker rather than explicit link against + libstdc++ +From: Emil Velikov +X-Patchwork-Id: 47212 +Message-Id: <1429106890-32645-1-git-send-email-emil.l.velikov@gmail.com> +To: mesa-dev@lists.freedesktop.org +Cc: emil.l.velikov@gmail.com, Rob Clark +Date: Wed, 15 Apr 2015 15:08:02 +0100 + +Cc: Rob Clark +Signed-off-by: Emil Velikov + +--- +src/gallium/drivers/freedreno/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am +index 4b2629f..e798e44 100644 +--- a/src/gallium/drivers/freedreno/Makefile.am ++++ b/src/gallium/drivers/freedreno/Makefile.am +@@ -21,6 +21,8 @@ libfreedreno_la_SOURCES = \ + + noinst_PROGRAMS = ir3_compiler + ++# XXX: Required due to the C++ sources in libnir/libglsl_util ++nodist_EXTRA_ir3_compiler_SOURCES = dummy.cpp + ir3_compiler_SOURCES = \ + ir3/ir3_cmdline.c + +@@ -29,7 +31,6 @@ ir3_compiler_LDADD = \ + ../../auxiliary/libgallium.la \ + $(top_builddir)/src/glsl/libnir.la \ + $(top_builddir)/src/libglsl_util.la \ +- -lstdc++ \ + $(top_builddir)/src/util/libmesautil.la \ + $(GALLIUM_COMMON_LIB_DEPS) \ + $(FREEDRENO_LIBS) + +From patchwork Wed Apr 15 14:08:03 2015 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [Mesa-dev, + 2/9] gallium: use $(top_builddir) when referencing other .la's +From: Emil Velikov +X-Patchwork-Id: 47213 +Message-Id: <1429106890-32645-2-git-send-email-emil.l.velikov@gmail.com> +To: mesa-dev@lists.freedesktop.org +Cc: emil.l.velikov@gmail.com +Date: Wed, 15 Apr 2015 15:08:03 +0100 + +Just like every other place in gallium. + +Signed-off-by: Emil Velikov + +--- +src/gallium/drivers/freedreno/Makefile.am | 2 +- + src/gallium/drivers/nouveau/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am +index e798e44..cbf62c6 100644 +--- a/src/gallium/drivers/freedreno/Makefile.am ++++ b/src/gallium/drivers/freedreno/Makefile.am +@@ -28,7 +28,7 @@ ir3_compiler_SOURCES = \ + + ir3_compiler_LDADD = \ + libfreedreno.la \ +- ../../auxiliary/libgallium.la \ ++ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/glsl/libnir.la \ + $(top_builddir)/src/libglsl_util.la \ + $(top_builddir)/src/util/libmesautil.la \ +diff --git a/src/gallium/drivers/nouveau/Makefile.am b/src/gallium/drivers/nouveau/Makefile.am +index 0aefc03..d05f0a1 100644 +--- a/src/gallium/drivers/nouveau/Makefile.am ++++ b/src/gallium/drivers/nouveau/Makefile.am +@@ -48,7 +48,7 @@ nouveau_compiler_SOURCES = \ + + nouveau_compiler_LDADD = \ + libnouveau.la \ +- ../../auxiliary/libgallium.la \ ++ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/util/libmesautil.la \ + $(GALLIUM_COMMON_LIB_DEPS) + + +From patchwork Wed Apr 15 14:08:04 2015 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [Mesa-dev,3/9] pipe-loader: add libnir and libglsl_util to the link +From: Emil Velikov +X-Patchwork-Id: 47214 +Message-Id: <1429106890-32645-3-git-send-email-emil.l.velikov@gmail.com> +To: mesa-dev@lists.freedesktop.org +Cc: emil.l.velikov@gmail.com, Rob Clark +Date: Wed, 15 Apr 2015 15:08:04 +0100 + +Otherwise we'll error out due to unresolved nir symbols. Note that we +still fail to link due to unresolved _mesa_error_no_memory(). + +Based on commit 101142c4010(xa: support for drivers which use NIR) + +Cc: Rob Clark +Signed-off-by: Emil Velikov + +--- +src/gallium/targets/pipe-loader/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am +index 967cdb7..e4048b5 100644 +--- a/src/gallium/targets/pipe-loader/Makefile.am ++++ b/src/gallium/targets/pipe-loader/Makefile.am +@@ -52,6 +52,8 @@ endif + + PIPE_LIBS += \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ ++ $(top_builddir)/src/glsl/libnir.la \ ++ $(top_builddir)/src/libglsl_util.la \ + $(top_builddir)/src/util/libmesautil.la \ + $(top_builddir)/src/gallium/drivers/rbug/librbug.la \ + $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ + +From patchwork Wed Apr 15 14:08:05 2015 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +Subject: [Mesa-dev,4/9] prog; + add weak _mesa_error_no_memory() symbol and add it to libglsl_util +From: Emil Velikov +X-Patchwork-Id: 47216 +Message-Id: <1429106890-32645-4-git-send-email-emil.l.velikov@gmail.com> +To: mesa-dev@lists.freedesktop.org +Cc: emil.l.velikov@gmail.com, Rob Clark +Date: Wed, 15 Apr 2015 15:08:05 +0100 + +Rather than forcing everyone to provide their own definition of the symbol +provide a common weak one, which anyone can override if needed. + +This resolved the build of the standalone pipe-drivers, as it provides a +default symbol which was missing previously. + +Cc: Rob Clark +Signed-off-by: Emil Velikov + +--- +src/Makefile.am | 3 ++- + src/glsl/SConscript | 2 ++ + src/mesa/Android.libmesa_glsl_utils.mk | 6 ++++-- + src/mesa/program/weak_errors.c | 30 ++++++++++++++++++++++++++++++ + 4 files changed, 38 insertions(+), 3 deletions(-) + create mode 100644 src/mesa/program/weak_errors.c + +diff --git a/src/Makefile.am b/src/Makefile.am +index 18cb4ce..461da27 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -72,4 +72,5 @@ noinst_LTLIBRARIES = libglsl_util.la + libglsl_util_la_SOURCES = \ + mesa/main/imports.c \ + mesa/program/prog_hash_table.c \ +- mesa/program/symbol_table.c ++ mesa/program/symbol_table.c \ ++ mesa/program/weak_errors.c +diff --git a/src/glsl/SConscript b/src/glsl/SConscript +index 284b375..d18a8a7 100644 +--- a/src/glsl/SConscript ++++ b/src/glsl/SConscript +@@ -71,6 +71,7 @@ env.Command('imports.c', '#src/mesa/main/imports.c', Copy('$TARGET', '$SOURCE')) + env.Prepend(CPPPATH = ['#src/mesa/program']) + env.Command('prog_hash_table.c', '#src/mesa/program/prog_hash_table.c', Copy('$TARGET', '$SOURCE')) + env.Command('symbol_table.c', '#src/mesa/program/symbol_table.c', Copy('$TARGET', '$SOURCE')) ++env.Command('weak_errors.c', '#src/mesa/program/weak_errors.c', Copy('$TARGET', '$SOURCE')) + + compiler_objs = env.StaticObject(source_lists['GLSL_COMPILER_CXX_FILES']) + +@@ -78,6 +79,7 @@ mesa_objs = env.StaticObject([ + 'imports.c', + 'prog_hash_table.c', + 'symbol_table.c', ++ 'weak_errors.c', + ]) + + compiler_objs += mesa_objs +diff --git a/src/mesa/Android.libmesa_glsl_utils.mk b/src/mesa/Android.libmesa_glsl_utils.mk +index a9f6ff5..08786e3 100644 +--- a/src/mesa/Android.libmesa_glsl_utils.mk ++++ b/src/mesa/Android.libmesa_glsl_utils.mk +@@ -43,7 +43,8 @@ LOCAL_C_INCLUDES := \ + LOCAL_SRC_FILES := \ + main/imports.c \ + program/prog_hash_table.c \ +- program/symbol_table.c ++ program/symbol_table.c \ ++ program/weak_errors.c + + include $(MESA_COMMON_MK) + include $(BUILD_STATIC_LIBRARY) +@@ -66,7 +67,8 @@ LOCAL_C_INCLUDES := \ + LOCAL_SRC_FILES := \ + main/imports.c \ + program/prog_hash_table.c \ +- program/symbol_table.c ++ program/symbol_table.c \ ++ program/weak_errors.c + + include $(MESA_COMMON_MK) + include $(BUILD_HOST_STATIC_LIBRARY) +diff --git a/src/mesa/program/weak_errors.c b/src/mesa/program/weak_errors.c +new file mode 100644 +index 0000000..85c35dc +--- /dev/null ++++ b/src/mesa/program/weak_errors.c +@@ -0,0 +1,30 @@ ++/* ++ * Copyright © 2014 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 in the Software without restriction, including without limitation ++ * the rights to use, copy, modify, merge, publish, distribute, sublicense, ++ * and/or sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice (including the next ++ * paragraph) shall be included in all copies or substantial portions of the ++ * Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++ * DEALINGS IN THE SOFTWARE. ++ */ ++#include ++#include "main/errors.h" ++ ++__attribute__((weak)) void ++_mesa_error_no_memory(const char *caller) ++{ ++ fprintf(stderr, "Mesa error: out of memory in %s", caller); ++} + +From patchwork Wed Apr 15 14:08:06 2015 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +Subject: [Mesa-dev,5/9] glsl: use the weak _mesa_error_no_memory() symbol +From: Emil Velikov +X-Patchwork-Id: 47215 +Message-Id: <1429106890-32645-5-git-send-email-emil.l.velikov@gmail.com> +To: mesa-dev@lists.freedesktop.org +Cc: emil.l.velikov@gmail.com +Date: Wed, 15 Apr 2015 15:08:06 +0100 + +Signed-off-by: Emil Velikov + +--- +src/glsl/Makefile.am | 13 ++++--------- + src/glsl/SConscript | 2 +- + src/glsl/main.cpp | 6 ------ + src/glsl/tests/common.c | 30 ------------------------------ + 4 files changed, 5 insertions(+), 46 deletions(-) + delete mode 100644 src/glsl/tests/common.c + +diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am +index 23c6fe8..cd37e64 100644 +--- a/src/glsl/Makefile.am ++++ b/src/glsl/Makefile.am +@@ -89,8 +89,7 @@ tests_general_ir_test_SOURCES = \ + tests/builtin_variable_test.cpp \ + tests/invalidate_locations_test.cpp \ + tests/general_ir_test.cpp \ +- tests/varyings_test.cpp \ +- tests/common.c ++ tests/varyings_test.cpp + tests_general_ir_test_CFLAGS = \ + $(PTHREAD_CFLAGS) + tests_general_ir_test_LDADD = \ +@@ -103,8 +102,7 @@ tests_uniform_initializer_test_SOURCES = \ + tests/copy_constant_to_storage_tests.cpp \ + tests/set_uniform_initializer_tests.cpp \ + tests/uniform_initializer_utils.cpp \ +- tests/uniform_initializer_utils.h \ +- tests/common.c ++ tests/uniform_initializer_utils.h + tests_uniform_initializer_test_CFLAGS = \ + $(PTHREAD_CFLAGS) + tests_uniform_initializer_test_LDADD = \ +@@ -114,8 +112,7 @@ tests_uniform_initializer_test_LDADD = \ + $(PTHREAD_LIBS) + + tests_sampler_types_test_SOURCES = \ +- tests/sampler_types_test.cpp \ +- tests/common.c ++ tests/sampler_types_test.cpp + tests_sampler_types_test_CFLAGS = \ + $(PTHREAD_CFLAGS) + tests_sampler_types_test_LDADD = \ +@@ -133,8 +130,7 @@ libglcpp_la_SOURCES = \ + $(LIBGLCPP_FILES) + + glcpp_glcpp_SOURCES = \ +- glcpp/glcpp.c \ +- tests/common.c ++ glcpp/glcpp.c + glcpp_glcpp_LDADD = \ + libglcpp.la \ + $(top_builddir)/src/libglsl_util.la \ +@@ -164,7 +160,6 @@ glsl_compiler_LDADD = \ + + glsl_test_SOURCES = \ + standalone_scaffolding.cpp \ +- tests/common.c \ + test.cpp \ + test_optpass.cpp \ + test_optpass.h +diff --git a/src/glsl/SConscript b/src/glsl/SConscript +index d18a8a7..455f5e8 100644 +--- a/src/glsl/SConscript ++++ b/src/glsl/SConscript +@@ -117,6 +117,6 @@ env.Alias('glsl_compiler', glsl_compiler) + + glcpp = env.Program( + target = 'glcpp/glcpp', +- source = ['glcpp/glcpp.c', 'tests/common.c'] + mesa_objs, ++ source = ['glcpp/glcpp.c'] + mesa_objs, + ) + env.Alias('glcpp', glcpp) +diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp +index ccac839..fc54ddd 100644 +--- a/src/glsl/main.cpp ++++ b/src/glsl/main.cpp +@@ -41,12 +41,6 @@ + + static int glsl_version = 330; + +-extern "C" void +-_mesa_error_no_memory(const char *caller) +-{ +- fprintf(stderr, "Mesa error: out of memory in %s", caller); +-} +- + static void + initialize_context(struct gl_context *ctx, gl_api api) + { +diff --git a/src/glsl/tests/common.c b/src/glsl/tests/common.c +deleted file mode 100644 +index d69f54d..0000000 +--- a/src/glsl/tests/common.c ++++ /dev/null +@@ -1,30 +0,0 @@ +-/* +- * Copyright © 2014 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 in the Software without restriction, including without limitation +- * the rights to use, copy, modify, merge, publish, distribute, sublicense, +- * and/or sell copies of the Software, and to permit persons to whom the +- * Software is furnished to do so, subject to the following conditions: +- * +- * The above copyright notice and this permission notice (including the next +- * paragraph) shall be included in all copies or substantial portions of the +- * Software. +- * +- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +- * DEALINGS IN THE SOFTWARE. +- */ +-#include +-#include "main/errors.h" +- +-void +-_mesa_error_no_memory(const char *caller) +-{ +- fprintf(stderr, "Mesa error: out of memory in %s", caller); +-} + +From patchwork Wed Apr 15 14:08:07 2015 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [Mesa-dev, + 6/9] freedreno/ir3: use the weak _mesa_error_no_memory() symbol +From: Emil Velikov +X-Patchwork-Id: 47218 +Message-Id: <1429106890-32645-6-git-send-email-emil.l.velikov@gmail.com> +To: mesa-dev@lists.freedesktop.org +Cc: emil.l.velikov@gmail.com, Rob Clark +Date: Wed, 15 Apr 2015 15:08:07 +0100 + +We no longer need to (although we can) provide this symbol ourselves. + +Cc: Rob Clark +Signed-off-by: Emil Velikov + +--- +src/gallium/drivers/freedreno/ir3/ir3_cmdline.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c b/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c +index d0517aa..0b16cc1 100644 +--- a/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c ++++ b/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c +@@ -360,11 +360,3 @@ int main(int argc, char **argv) + } + dump_info(&v, info); + } +- +-void _mesa_error_no_memory(const char *caller); +- +-void +-_mesa_error_no_memory(const char *caller) +-{ +- fprintf(stderr, "Mesa error: out of memory in %s", caller); +-} + +From patchwork Wed Apr 15 14:08:08 2015 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [Mesa-dev,7/9] st/xa: use the weak _mesa_error_no_memory() symbol +From: Emil Velikov +X-Patchwork-Id: 47217 +Message-Id: <1429106890-32645-7-git-send-email-emil.l.velikov@gmail.com> +To: mesa-dev@lists.freedesktop.org +Cc: emil.l.velikov@gmail.com, Rob Clark +Date: Wed, 15 Apr 2015 15:08:08 +0100 + +Thus we can remove the workaround that we previously had. + +Cc: Rob Clark +Signed-off-by: Emil Velikov + +--- +src/gallium/state_trackers/xa/xa_tracker.c | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/src/gallium/state_trackers/xa/xa_tracker.c b/src/gallium/state_trackers/xa/xa_tracker.c +index 8901998..f69ac8e 100644 +--- a/src/gallium/state_trackers/xa/xa_tracker.c ++++ b/src/gallium/state_trackers/xa/xa_tracker.c +@@ -535,15 +535,3 @@ xa_surface_format(const struct xa_surface *srf) + { + return srf->fdesc.xa_format; + } +- +-/* +- * _mesa_error_no_memory() is expected by NIR to be provided by the +- * user. Normally this is in mesa st, but other state trackers +- * must provide their own. +- */ +-void _mesa_error_no_memory(const char *caller); +-void +-_mesa_error_no_memory(const char *caller) +-{ +- debug_printf("Mesa error: out of memory in %s", caller); +-} + +From patchwork Wed Apr 15 14:08:09 2015 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [Mesa-dev,8/9] targets/nine: link against libnir/libglsl_util +From: Emil Velikov +X-Patchwork-Id: 47219 +Message-Id: <1429106890-32645-8-git-send-email-emil.l.velikov@gmail.com> +To: mesa-dev@lists.freedesktop.org +Cc: emil.l.velikov@gmail.com +Date: Wed, 15 Apr 2015 15:08:09 +0100 + +Similar to commit 127f8767e0a and 101142c4010. + +Signed-off-by: Emil Velikov + +--- +src/gallium/targets/d3dadapter9/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/gallium/targets/d3dadapter9/Makefile.am b/src/gallium/targets/d3dadapter9/Makefile.am +index 1dc55f5..591978f 100644 +--- a/src/gallium/targets/d3dadapter9/Makefile.am ++++ b/src/gallium/targets/d3dadapter9/Makefile.am +@@ -74,6 +74,8 @@ endif # HAVE_LD_VERSION_SCRIPT + d3dadapter9_la_LIBADD = \ + $(top_builddir)/src/gallium/auxiliary/libgalliumvl_stub.la \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ ++ $(top_builddir)/src/glsl/libnir.la \ ++ $(top_builddir)/src/libglsl_util.la \ + $(top_builddir)/src/gallium/state_trackers/nine/libninetracker.la \ + $(top_builddir)/src/util/libmesautil.la \ + $(top_builddir)/src/gallium/winsys/sw/wrapper/libwsw.la \ diff --git a/mesa.spec b/mesa.spec index ddf0c94..add47cc 100644 --- a/mesa.spec +++ b/mesa.spec @@ -78,6 +78,9 @@ Patch15: mesa-9.2-hardware-float.patch Patch20: mesa-10.2-evergreen-big-endian.patch Patch30: mesa-10.3-bigendian-assert.patch +# https://bugs.freedesktop.org/show_bug.cgi?id=90466 +Patch60: mesa-10.6-nir-linker.patch + # https://bugs.freedesktop.org/show_bug.cgi?id=73512 Patch99: 0001-opencl-use-versioned-.so-in-mesa.icd.patch @@ -364,6 +367,8 @@ grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1 %patch20 -p1 -b .egbe %patch30 -p1 -b .beassert +%patch60 -p1 -b .nir + %if 0%{?with_opencl} %patch99 -p1 -b .icd %endif From 7f1320a9527e4edc8a38111252e3a494094265a1 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 17 May 2015 22:09:37 +0300 Subject: [PATCH 07/12] 5a55f68 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + Makefile | 30 ++++++++++++++++++++++++ make-git-snapshot.sh | 34 --------------------------- mesa.spec | 16 ++++++------- sanitize-tarball.sh | 55 -------------------------------------------- sources | 2 +- vl_decoder.c | 20 ++++++++++++++++ vl_mpeg12_decoder.c | 7 ++++++ 8 files changed, 67 insertions(+), 98 deletions(-) create mode 100644 Makefile delete mode 100755 make-git-snapshot.sh delete mode 100755 sanitize-tarball.sh create mode 100644 vl_decoder.c create mode 100644 vl_mpeg12_decoder.c diff --git a/.gitignore b/.gitignore index 62d9f41..3fc9a21 100644 --- a/.gitignore +++ b/.gitignore @@ -108,3 +108,4 @@ mesa-20100720.tar.bz2 /mesa-3282e57.tar.xz /mesa-c1485f4.tar.xz /mesa-51e3453.tar.xz +/mesa-5a55f68.tar.xz diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..b264810 --- /dev/null +++ b/Makefile @@ -0,0 +1,30 @@ +COMMIT ?= +BRANCH ?= +SANITIZE ?= 1 + +ifeq ($(strip $(COMMIT)),) + COMMIT = `date +%Y%m%d` + BRANCH = 10.5 +else + BRANCH = master +endif +DIRNAME = mesa-${COMMIT} + +all: archive + +clean: + rm -rf $(DIRNAME)/ + +clone: clean + git clone --depth 1 --branch $(BRANCH) \ + git://git.freedesktop.org/git/mesa/mesa $(DIRNAME) + +sanitize: clone vl_mpeg12_decoder.c vl_decoder.c +ifdef SANITIZE + cat < vl_mpeg12_decoder.c > $(DIRNAME)/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c + cat < vl_decoder.c > $(DIRNAME)/src/gallium/auxiliary/vl/vl_decoder.c +endif + +archive: clone sanitize + tar -cvf ${DIRNAME}.tar.xz ${DIRNAME} + diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh deleted file mode 100755 index 36df675..0000000 --- a/make-git-snapshot.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -# Usage: ./make-git-snapshot.sh [COMMIT] -# -# to make a snapshot of the given tag/branch. Defaults to HEAD. -# Point env var REF to a local mesa repo to reduce clone time. - -if [ -e /usr/bin/pxz ]; then - XZ=/usr/bin/pxz -else - XZ=/usr/bin/xz -fi - -if [ -z "$1" ]; then - DIRNAME=mesa-$( date +%Y%m%d ) - BRANCH=10.5 -else - DIRNAME=mesa-$1 - BRANCH=master -fi - -echo REF ${REF:+--reference $REF} -echo DIRNAME $DIRNAME -echo HEAD ${1:-$BRANCH} - -rm -rf $DIRNAME - -git clone --depth 1 ${REF:+--reference $REF} --branch $BRANCH \ - git://git.freedesktop.org/git/mesa/mesa $DIRNAME - -GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \ - | $XZ > $DIRNAME.tar.xz - -# rm -rf $DIRNAME diff --git a/mesa.spec b/mesa.spec index add47cc..6c704b0 100644 --- a/mesa.spec +++ b/mesa.spec @@ -49,22 +49,21 @@ %define _default_patch_fuzz 2 #% define gitdate 20150218 -%define githash 51e3453 +%define githash 5a55f68 %define git %{?githash:%{githash}}%{!?githash:%{gitdate}} Summary: Mesa graphics libraries Name: mesa Version: 10.6.0 -Release: 0.devel.5.%{git}%{?dist} +Release: 0.devel.6.%{git}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org -# Source0: MesaLib-%{version}.tar.xz Source0: %{name}-%{git}.tar.xz -Source1: sanitize-tarball.sh -Source2: make-release-tarball.sh -Source3: make-git-snapshot.sh +Source1: Makefile +Source2: vl_decoder.c +Source3: vl_mpeg12_decoder.c # src/gallium/auxiliary/postprocess/pp_mlaa* have an ... interestingly worded license. # Source4 contains email correspondence clarifying the license terms. @@ -716,9 +715,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/d3d/*.so %endif -# Generate changelog using: -# git log old_commit_sha..new_commit_sha --format="- %H: %s (%an)" %changelog +* Sun May 17 2015 Igor Gnatenko - 10.6.0-0.devel.6.5a55f68 +- 5a55f68 + * Thu May 07 2015 Igor Gnatenko - 10.6.0-0.devel.5.51e3453 - 51e3453 diff --git a/sanitize-tarball.sh b/sanitize-tarball.sh deleted file mode 100755 index 414882a..0000000 --- a/sanitize-tarball.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# -# usage: sanitize-tarball.sh [tarball] - -if [ "x$1" = "x" ]; then - echo "Usage: sanitize-tarball.sh [tarball]" - exit 1 -fi - -if [ -e /usr/bin/pxz ]; then - XZ=/usr/bin/pxz -else - XZ=/usr/bin/xz -fi - -dirname=$(basename $(basename "$1" .tar.bz2) .tar.xz) - -tar xf "$1" -pushd $dirname - -cat > src/gallium/auxiliary/vl/vl_mpeg12_decoder.c << EOF -#include "vl_mpeg12_decoder.h" -struct pipe_video_codec * -vl_create_mpeg12_decoder(struct pipe_context *context, - const struct pipe_video_codec *templat) -{ - return NULL; -} -EOF - -cat > src/gallium/auxiliary/vl/vl_decoder.c << EOF -#include "vl_decoder.h" -bool -vl_profile_supported(struct pipe_screen *screen, enum pipe_video_profile profile, - enum pipe_video_entrypoint entrypoint) -{ - return false; -} - -int -vl_level_supported(struct pipe_screen *screen, enum pipe_video_profile profile) -{ - return 0; -} - -struct pipe_video_codec * -vl_create_decoder(struct pipe_context *pipe, - const struct pipe_video_codec *templat) -{ - return NULL; -} -EOF - -popd -tar cf - $dirname | $XZ > $dirname.tar.xz diff --git a/sources b/sources index 62363f4..f7f5d42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -42b604d6c6d27403a5df88a569c38f03 mesa-51e3453.tar.xz +5fa6fdf74185ee5a72893bd744de8342 mesa-5a55f68.tar.xz diff --git a/vl_decoder.c b/vl_decoder.c new file mode 100644 index 0000000..1e715b6 --- /dev/null +++ b/vl_decoder.c @@ -0,0 +1,20 @@ +#include "vl_decoder.h" +bool +vl_profile_supported(struct pipe_screen *screen, enum pipe_video_profile profile, + enum pipe_video_entrypoint entrypoint) +{ + return false; +} + +int +vl_level_supported(struct pipe_screen *screen, enum pipe_video_profile profile) +{ + return 0; +} + +struct pipe_video_codec * +vl_create_decoder(struct pipe_context *pipe, + const struct pipe_video_codec *templat) +{ + return NULL; +} diff --git a/vl_mpeg12_decoder.c b/vl_mpeg12_decoder.c new file mode 100644 index 0000000..85ac2c9 --- /dev/null +++ b/vl_mpeg12_decoder.c @@ -0,0 +1,7 @@ +#include "vl_mpeg12_decoder.h" +struct pipe_video_codec * +vl_create_mpeg12_decoder(struct pipe_context *context, + const struct pipe_video_codec *templat) +{ + return NULL; +} From aef09c57447e784a7813f318db9d40423db33da0 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 17 May 2015 22:22:48 +0300 Subject: [PATCH 08/12] add git to BR if we are building githash Signed-off-by: Igor Gnatenko --- mesa.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mesa.spec b/mesa.spec index 6c704b0..0b1ca80 100644 --- a/mesa.spec +++ b/mesa.spec @@ -83,6 +83,9 @@ Patch60: mesa-10.6-nir-linker.patch # https://bugs.freedesktop.org/show_bug.cgi?id=73512 Patch99: 0001-opencl-use-versioned-.so-in-mesa.icd.patch +%if %{?githash} +BuildRequires: git +%endif BuildRequires: pkgconfig autoconf automake libtool %if %{with_hardware} BuildRequires: kernel-headers From b4e2acb6069666aa61f11211b0f3f8b515068c41 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 17 May 2015 22:29:43 +0300 Subject: [PATCH 09/12] fix macro Signed-off-by: Igor Gnatenko --- mesa.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mesa.spec b/mesa.spec index 0b1ca80..aaea9c5 100644 --- a/mesa.spec +++ b/mesa.spec @@ -83,9 +83,7 @@ Patch60: mesa-10.6-nir-linker.patch # https://bugs.freedesktop.org/show_bug.cgi?id=73512 Patch99: 0001-opencl-use-versioned-.so-in-mesa.icd.patch -%if %{?githash} -BuildRequires: git -%endif +%{?githash:BuildRequires: git} BuildRequires: pkgconfig autoconf automake libtool %if %{with_hardware} BuildRequires: kernel-headers From fcdd55359205df12cf4d067cdcbf7a211ccb8b9a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 18 May 2015 10:02:50 +0300 Subject: [PATCH 10/12] add git to BR everywhere Signed-off-by: Igor Gnatenko --- mesa.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index aaea9c5..b7c31a7 100644 --- a/mesa.spec +++ b/mesa.spec @@ -55,7 +55,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 10.6.0 -Release: 0.devel.6.%{git}%{?dist} +Release: 0.devel.7.%{git}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -83,7 +83,9 @@ Patch60: mesa-10.6-nir-linker.patch # https://bugs.freedesktop.org/show_bug.cgi?id=73512 Patch99: 0001-opencl-use-versioned-.so-in-mesa.icd.patch -%{?githash:BuildRequires: git} +# To have sha info in glxinfo +BuildRequires: git + BuildRequires: pkgconfig autoconf automake libtool %if %{with_hardware} BuildRequires: kernel-headers @@ -717,6 +719,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon May 18 2015 Igor Gnatenko - 10.6.0-0.devel.7.5a55f68 +- add git to BR everywhere + * Sun May 17 2015 Igor Gnatenko - 10.6.0-0.devel.6.5a55f68 - 5a55f68 From 4de1f0c875ee303a7e642affb521667919a38f91 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 20:00:56 +0000 Subject: [PATCH 11/12] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- mesa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa.spec b/mesa.spec index b7c31a7..e56e277 100644 --- a/mesa.spec +++ b/mesa.spec @@ -55,7 +55,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 10.6.0 -Release: 0.devel.7.%{git}%{?dist} +Release: 0.devel.7.%{git}%{?dist}.1 License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -719,6 +719,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 10.6.0-0.devel.7.5a55f68.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon May 18 2015 Igor Gnatenko - 10.6.0-0.devel.7.5a55f68 - add git to BR everywhere From 719a8c9d6042cb0042750fea94a71cbc4948061e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 18 Jun 2015 19:16:48 +0300 Subject: [PATCH 12/12] Makefile: switch to 10.6 Signed-off-by: Igor Gnatenko --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b264810..df96da0 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ SANITIZE ?= 1 ifeq ($(strip $(COMMIT)),) COMMIT = `date +%Y%m%d` - BRANCH = 10.5 + BRANCH = 10.6 else BRANCH = master endif