diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-03-10 04:15:09 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-03-10 04:15:09 +0000 |
| commit | 602f8c7f6f47624df1ff30957c65299861b5e190 (patch) | |
| tree | 69af7ec44b4bf0fb6b30f6eb6df9ebe1ccd68d4a /lib/mesa/generated/src | |
| parent | f48bdcc559295c4d58e4aa8042d571fe9586498d (diff) | |
revert upstream Mesa changes to remove non-TLS paths
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17814
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17213
Emulated TLS isn't enough when many shared libraries are involved.
This caused problems with some ports: kitty, calibre, qutebrowser.
reported by tb@ and others
Diffstat (limited to 'lib/mesa/generated/src')
19 files changed, 38 insertions, 38 deletions
diff --git a/lib/mesa/generated/src/amd/vulkan/bvh/converter_internal.comp.spv.h b/lib/mesa/generated/src/amd/vulkan/bvh/converter_internal.comp.spv.h index f5b887aa9..0205b99a4 100644 --- a/lib/mesa/generated/src/amd/vulkan/bvh/converter_internal.comp.spv.h +++ b/lib/mesa/generated/src/amd/vulkan/bvh/converter_internal.comp.spv.h @@ -1,5 +1,5 @@ - // 1011.11.0 - 0x07230203,0x00010500,0x0008000a,0x00000273,0x00000000,0x00020011,0x00000001,0x00020011, + // 1112.0.0 + 0x07230203,0x00010500,0x0008000b,0x00000273,0x00000000,0x00020011,0x00000001,0x00020011, 0x0000000b,0x00020011,0x000014e1,0x00020011,0x000014e3,0x0006000b,0x00000001,0x4c534c47, 0x6474732e,0x3035342e,0x00000000,0x0003000e,0x000014e4,0x00000003,0x0007000f,0x00000005, 0x00000004,0x6e69616d,0x00000000,0x00000081,0x0000009f,0x00060010,0x00000004,0x00000011, diff --git a/lib/mesa/generated/src/amd/vulkan/bvh/converter_leaf.comp.spv.h b/lib/mesa/generated/src/amd/vulkan/bvh/converter_leaf.comp.spv.h index 6aad6fa65..92962ebb7 100644 --- a/lib/mesa/generated/src/amd/vulkan/bvh/converter_leaf.comp.spv.h +++ b/lib/mesa/generated/src/amd/vulkan/bvh/converter_leaf.comp.spv.h @@ -1,5 +1,5 @@ - // 1011.11.0 - 0x07230203,0x00010500,0x0008000a,0x0000012c,0x00000000,0x00020011,0x00000001,0x00020011, + // 1112.0.0 + 0x07230203,0x00010500,0x0008000b,0x0000012c,0x00000000,0x00020011,0x00000001,0x00020011, 0x0000000b,0x00020011,0x000014e3,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e, 0x00000000,0x0003000e,0x000014e4,0x00000001,0x0007000f,0x00000005,0x00000004,0x6e69616d, 0x00000000,0x00000017,0x00000028,0x00060010,0x00000004,0x00000011,0x00000040,0x00000001, diff --git a/lib/mesa/generated/src/amd/vulkan/bvh/copy.comp.spv.h b/lib/mesa/generated/src/amd/vulkan/bvh/copy.comp.spv.h index 0dbadf55e..0053974c5 100644 --- a/lib/mesa/generated/src/amd/vulkan/bvh/copy.comp.spv.h +++ b/lib/mesa/generated/src/amd/vulkan/bvh/copy.comp.spv.h @@ -1,5 +1,5 @@ - // 1011.11.0 - 0x07230203,0x00010500,0x0008000a,0x0000010c,0x00000000,0x00020011,0x00000001,0x00020011, + // 1112.0.0 + 0x07230203,0x00010500,0x0008000b,0x0000010c,0x00000000,0x00020011,0x00000001,0x00020011, 0x0000000b,0x00020011,0x00001160,0x00020011,0x000014e3,0x0006000b,0x00000001,0x4c534c47, 0x6474732e,0x3035342e,0x00000000,0x0003000e,0x000014e4,0x00000001,0x0008000f,0x00000005, 0x00000004,0x6e69616d,0x00000000,0x0000000b,0x00000011,0x00000020,0x00060010,0x00000004, diff --git a/lib/mesa/generated/src/amd/vulkan/bvh/lbvh_internal.comp.spv.h b/lib/mesa/generated/src/amd/vulkan/bvh/lbvh_internal.comp.spv.h index 12c305c0c..d45005122 100644 --- a/lib/mesa/generated/src/amd/vulkan/bvh/lbvh_internal.comp.spv.h +++ b/lib/mesa/generated/src/amd/vulkan/bvh/lbvh_internal.comp.spv.h @@ -1,5 +1,5 @@ - // 1011.11.0 - 0x07230203,0x00010500,0x0008000a,0x000000d0,0x00000000,0x00020011,0x00000001,0x00020011, + // 1112.0.0 + 0x07230203,0x00010500,0x0008000b,0x000000d0,0x00000000,0x00020011,0x00000001,0x00020011, 0x0000000b,0x00020011,0x000014e3,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e, 0x00000000,0x0003000e,0x000014e4,0x00000001,0x0007000f,0x00000005,0x00000004,0x6e69616d, 0x00000000,0x0000001e,0x0000002f,0x00060010,0x00000004,0x00000011,0x00000040,0x00000001, diff --git a/lib/mesa/generated/src/amd/vulkan/bvh/leaf.comp.spv.h b/lib/mesa/generated/src/amd/vulkan/bvh/leaf.comp.spv.h index ab2c98513..158e7c67b 100644 --- a/lib/mesa/generated/src/amd/vulkan/bvh/leaf.comp.spv.h +++ b/lib/mesa/generated/src/amd/vulkan/bvh/leaf.comp.spv.h @@ -1,5 +1,5 @@ - // 1011.11.0 - 0x07230203,0x00010500,0x0008000a,0x00000499,0x00000000,0x00020011,0x00000001,0x00020011, + // 1112.0.0 + 0x07230203,0x00010500,0x0008000b,0x00000499,0x00000000,0x00020011,0x00000001,0x00020011, 0x0000000b,0x00020011,0x00000016,0x00020011,0x00000027,0x00020011,0x0000003d,0x00020011, 0x00000040,0x00020011,0x00001151,0x00020011,0x00001160,0x00020011,0x000014e3,0x0006000b, 0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x000014e4,0x00000001, diff --git a/lib/mesa/generated/src/amd/vulkan/bvh/morton.comp.spv.h b/lib/mesa/generated/src/amd/vulkan/bvh/morton.comp.spv.h index a3304db4a..7c022667e 100644 --- a/lib/mesa/generated/src/amd/vulkan/bvh/morton.comp.spv.h +++ b/lib/mesa/generated/src/amd/vulkan/bvh/morton.comp.spv.h @@ -1,5 +1,5 @@ - // 1011.11.0 - 0x07230203,0x00010500,0x0008000a,0x00000104,0x00000000,0x00020011,0x00000001,0x00020011, + // 1112.0.0 + 0x07230203,0x00010500,0x0008000b,0x00000104,0x00000000,0x00020011,0x00000001,0x00020011, 0x0000000b,0x00020011,0x000014e3,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e, 0x00000000,0x0003000e,0x000014e4,0x00000001,0x0007000f,0x00000005,0x00000004,0x6e69616d, 0x00000000,0x00000070,0x00000087,0x00060010,0x00000004,0x00000011,0x00000040,0x00000001, diff --git a/lib/mesa/generated/src/amd/vulkan/bvh/ploc_internal.comp.spv.h b/lib/mesa/generated/src/amd/vulkan/bvh/ploc_internal.comp.spv.h index 9603fb45f..01c452c5b 100644 --- a/lib/mesa/generated/src/amd/vulkan/bvh/ploc_internal.comp.spv.h +++ b/lib/mesa/generated/src/amd/vulkan/bvh/ploc_internal.comp.spv.h @@ -1,5 +1,5 @@ - // 1011.11.0 - 0x07230203,0x00010500,0x0008000a,0x000004e5,0x00000000,0x00020011,0x00000001,0x00020011, + // 1112.0.0 + 0x07230203,0x00010500,0x0008000b,0x000004e5,0x00000000,0x00020011,0x00000001,0x00020011, 0x0000000b,0x00020011,0x0000003d,0x00020011,0x0000003f,0x00020011,0x00000040,0x00020011, 0x000014e1,0x00020011,0x000014e3,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e, 0x00000000,0x0003000e,0x000014e4,0x00000003,0x0014000f,0x00000005,0x00000004,0x6e69616d, diff --git a/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/fill.comp.spv.h b/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/fill.comp.spv.h index d613e452e..1e9f42d4c 100644 --- a/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/fill.comp.spv.h +++ b/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/fill.comp.spv.h @@ -1,5 +1,5 @@ - // 1011.11.0 - 0x07230203,0x00010300,0x0008000a,0x00000076,0x00000000,0x00020011,0x00000001,0x00020011, + // 1112.0.0 + 0x07230203,0x00010300,0x0008000b,0x00000076,0x00000000,0x00020011,0x00000001,0x00020011, 0x0000000b,0x00020011,0x000014e3,0x0009000a,0x5f565053,0x5f52484b,0x73796870,0x6c616369, 0x6f74735f,0x65676172,0x6675625f,0x00726566,0x0006000b,0x00000001,0x4c534c47,0x6474732e, 0x3035342e,0x00000000,0x0003000e,0x000014e4,0x00000001,0x0007000f,0x00000005,0x00000004, diff --git a/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/histogram.comp.spv.h b/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/histogram.comp.spv.h index cbb5152d7..3a380605b 100644 --- a/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/histogram.comp.spv.h +++ b/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/histogram.comp.spv.h @@ -1,5 +1,5 @@ - // 1011.11.0 - 0x07230203,0x00010300,0x0008000a,0x000001d9,0x00000000,0x00020011,0x00000001,0x00020011, + // 1112.0.0 + 0x07230203,0x00010300,0x0008000b,0x000001d9,0x00000000,0x00020011,0x00000001,0x00020011, 0x0000000b,0x00020011,0x000014e3,0x0009000a,0x5f565053,0x5f52484b,0x73796870,0x6c616369, 0x6f74735f,0x65676172,0x6675625f,0x00726566,0x0006000b,0x00000001,0x4c534c47,0x6474732e, 0x3035342e,0x00000000,0x0003000e,0x000014e4,0x00000001,0x0007000f,0x00000005,0x00000004, diff --git a/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/init.comp.spv.h b/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/init.comp.spv.h index b27d7c0a8..db78969fe 100644 --- a/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/init.comp.spv.h +++ b/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/init.comp.spv.h @@ -1,5 +1,5 @@ - // 1011.11.0 - 0x07230203,0x00010300,0x0008000a,0x0000009b,0x00000000,0x00020011,0x00000001,0x00020011, + // 1112.0.0 + 0x07230203,0x00010300,0x0008000b,0x0000009b,0x00000000,0x00020011,0x00000001,0x00020011, 0x0000000b,0x00020011,0x000014e3,0x0009000a,0x5f565053,0x5f52484b,0x73796870,0x6c616369, 0x6f74735f,0x65676172,0x6675625f,0x00726566,0x0006000b,0x00000001,0x4c534c47,0x6474732e, 0x3035342e,0x00000000,0x0003000e,0x000014e4,0x00000001,0x0005000f,0x00000005,0x00000004, diff --git a/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/prefix.comp.spv.h b/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/prefix.comp.spv.h index 472900f97..8ea13dece 100644 --- a/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/prefix.comp.spv.h +++ b/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/prefix.comp.spv.h @@ -1,5 +1,5 @@ - // 1011.11.0 - 0x07230203,0x00010300,0x0008000a,0x00000095,0x00000000,0x00020011,0x00000001,0x00020011, + // 1112.0.0 + 0x07230203,0x00010300,0x0008000b,0x00000095,0x00000000,0x00020011,0x00000001,0x00020011, 0x0000000b,0x00020011,0x0000003d,0x00020011,0x0000003f,0x00020011,0x00000040,0x00020011, 0x000014e3,0x0009000a,0x5f565053,0x5f52484b,0x73796870,0x6c616369,0x6f74735f,0x65676172, 0x6675625f,0x00726566,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000, diff --git a/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/scatter_0_even.comp.spv.h b/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/scatter_0_even.comp.spv.h index 1cbd631db..7da62cf7c 100644 --- a/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/scatter_0_even.comp.spv.h +++ b/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/scatter_0_even.comp.spv.h @@ -1,5 +1,5 @@ - // 1011.11.0 - 0x07230203,0x00010300,0x0008000a,0x000003de,0x00000000,0x00020011,0x00000001,0x00020011, + // 1112.0.0 + 0x07230203,0x00010300,0x0008000b,0x000003de,0x00000000,0x00020011,0x00000001,0x00020011, 0x0000000b,0x00020011,0x0000003d,0x00020011,0x0000003f,0x00020011,0x00000040,0x00020011, 0x000014e1,0x00020011,0x000014e3,0x0009000a,0x5f565053,0x5f52484b,0x73796870,0x6c616369, 0x6f74735f,0x65676172,0x6675625f,0x00726566,0x0008000a,0x5f565053,0x5f52484b,0x6b6c7576, diff --git a/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/scatter_0_odd.comp.spv.h b/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/scatter_0_odd.comp.spv.h index 0fefa08fe..e79d3c101 100644 --- a/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/scatter_0_odd.comp.spv.h +++ b/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/scatter_0_odd.comp.spv.h @@ -1,5 +1,5 @@ - // 1011.11.0 - 0x07230203,0x00010300,0x0008000a,0x000003de,0x00000000,0x00020011,0x00000001,0x00020011, + // 1112.0.0 + 0x07230203,0x00010300,0x0008000b,0x000003de,0x00000000,0x00020011,0x00000001,0x00020011, 0x0000000b,0x00020011,0x0000003d,0x00020011,0x0000003f,0x00020011,0x00000040,0x00020011, 0x000014e1,0x00020011,0x000014e3,0x0009000a,0x5f565053,0x5f52484b,0x73796870,0x6c616369, 0x6f74735f,0x65676172,0x6675625f,0x00726566,0x0008000a,0x5f565053,0x5f52484b,0x6b6c7576, diff --git a/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/scatter_1_even.comp.spv.h b/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/scatter_1_even.comp.spv.h index 9c9d306df..c65ca79f2 100644 --- a/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/scatter_1_even.comp.spv.h +++ b/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/scatter_1_even.comp.spv.h @@ -1,5 +1,5 @@ - // 1011.11.0 - 0x07230203,0x00010300,0x0008000a,0x000003de,0x00000000,0x00020011,0x00000001,0x00020011, + // 1112.0.0 + 0x07230203,0x00010300,0x0008000b,0x000003de,0x00000000,0x00020011,0x00000001,0x00020011, 0x0000000b,0x00020011,0x0000003d,0x00020011,0x0000003f,0x00020011,0x00000040,0x00020011, 0x000014e1,0x00020011,0x000014e3,0x0009000a,0x5f565053,0x5f52484b,0x73796870,0x6c616369, 0x6f74735f,0x65676172,0x6675625f,0x00726566,0x0008000a,0x5f565053,0x5f52484b,0x6b6c7576, diff --git a/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/scatter_1_odd.comp.spv.h b/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/scatter_1_odd.comp.spv.h index 331ee810a..6c8a80ab2 100644 --- a/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/scatter_1_odd.comp.spv.h +++ b/lib/mesa/generated/src/amd/vulkan/radix_sort/shaders/scatter_1_odd.comp.spv.h @@ -1,5 +1,5 @@ - // 1011.11.0 - 0x07230203,0x00010300,0x0008000a,0x000003de,0x00000000,0x00020011,0x00000001,0x00020011, + // 1112.0.0 + 0x07230203,0x00010300,0x0008000b,0x000003de,0x00000000,0x00020011,0x00000001,0x00020011, 0x0000000b,0x00020011,0x0000003d,0x00020011,0x0000003f,0x00020011,0x00000040,0x00020011, 0x000014e1,0x00020011,0x000014e3,0x0009000a,0x5f565053,0x5f52484b,0x73796870,0x6c616369, 0x6f74735f,0x65676172,0x6675625f,0x00726566,0x0008000a,0x5f565053,0x5f52484b,0x6b6c7576, diff --git a/lib/mesa/generated/src/compiler/glsl/glcpp/glcpp-lex.c b/lib/mesa/generated/src/compiler/glsl/glcpp/glcpp-lex.c index 0dc1177ec..e0399ba69 100644 --- a/lib/mesa/generated/src/compiler/glsl/glcpp/glcpp-lex.c +++ b/lib/mesa/generated/src/compiler/glsl/glcpp/glcpp-lex.c @@ -4,7 +4,7 @@ #define YY_INT_ALIGNED short int -/* $OpenBSD: glcpp-lex.c,v 1.10 2023/01/28 08:56:20 jsg Exp $ */ +/* $OpenBSD: glcpp-lex.c,v 1.11 2023/03/10 04:15:06 jsg Exp $ */ /* A lexical scanner generated by flex */ @@ -26,7 +26,7 @@ /* end standard C headers. */ -/* $OpenBSD: glcpp-lex.c,v 1.10 2023/01/28 08:56:20 jsg Exp $ */ +/* $OpenBSD: glcpp-lex.c,v 1.11 2023/03/10 04:15:06 jsg Exp $ */ /* flex integer type definitions */ diff --git a/lib/mesa/generated/src/compiler/glsl/glsl_lexer.cpp b/lib/mesa/generated/src/compiler/glsl/glsl_lexer.cpp index be48dda5f..41defc0aa 100644 --- a/lib/mesa/generated/src/compiler/glsl/glsl_lexer.cpp +++ b/lib/mesa/generated/src/compiler/glsl/glsl_lexer.cpp @@ -4,7 +4,7 @@ #define YY_INT_ALIGNED short int -/* $OpenBSD: glsl_lexer.cpp,v 1.10 2023/01/28 08:56:20 jsg Exp $ */ +/* $OpenBSD: glsl_lexer.cpp,v 1.11 2023/03/10 04:15:06 jsg Exp $ */ /* A lexical scanner generated by flex */ @@ -26,7 +26,7 @@ /* end standard C headers. */ -/* $OpenBSD: glsl_lexer.cpp,v 1.10 2023/01/28 08:56:20 jsg Exp $ */ +/* $OpenBSD: glsl_lexer.cpp,v 1.11 2023/03/10 04:15:06 jsg Exp $ */ /* flex integer type definitions */ diff --git a/lib/mesa/generated/src/intel/vulkan/float64_spv.h b/lib/mesa/generated/src/intel/vulkan/float64_spv.h index 7c37fc330..54eb2b9e2 100644 --- a/lib/mesa/generated/src/intel/vulkan/float64_spv.h +++ b/lib/mesa/generated/src/intel/vulkan/float64_spv.h @@ -1,8 +1,8 @@ #ifndef FLOAT64_SPV_H #define FLOAT64_SPV_H - // 1011.11.0 + // 1112.0.0 static const uint32_t float64_spv_source[] = { - 0x07230203,0x00010000,0x0008000a,0x000010bd,0x00000000,0x00020011,0x00000001,0x00020011, + 0x07230203,0x00010000,0x0008000b,0x000010bd,0x00000000,0x00020011,0x00000001,0x00020011, 0x0000000b,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e, 0x00000000,0x00000001,0x0005000f,0x00000000,0x00000004,0x6e69616d,0x00000000,0x00030003, 0x00000002,0x000001c2,0x00070004,0x415f4c47,0x675f4252,0x735f7570,0x65646168,0x6e695f72, diff --git a/lib/mesa/generated/src/mesa/program/lex.yy.c b/lib/mesa/generated/src/mesa/program/lex.yy.c index 2eecb8054..fbd323cd1 100644 --- a/lib/mesa/generated/src/mesa/program/lex.yy.c +++ b/lib/mesa/generated/src/mesa/program/lex.yy.c @@ -4,7 +4,7 @@ #define YY_INT_ALIGNED short int -/* $OpenBSD: lex.yy.c,v 1.10 2023/01/28 08:56:31 jsg Exp $ */ +/* $OpenBSD: lex.yy.c,v 1.11 2023/03/10 04:15:07 jsg Exp $ */ /* A lexical scanner generated by flex */ @@ -26,7 +26,7 @@ /* end standard C headers. */ -/* $OpenBSD: lex.yy.c,v 1.10 2023/01/28 08:56:31 jsg Exp $ */ +/* $OpenBSD: lex.yy.c,v 1.11 2023/03/10 04:15:07 jsg Exp $ */ /* flex integer type definitions */ |