diff options
Diffstat (limited to 'meta/recipes-graphics/piglit/piglit/0001-tests-Fix-narrowing-errors-seen-with-clang.patch')
-rw-r--r-- | meta/recipes-graphics/piglit/piglit/0001-tests-Fix-narrowing-errors-seen-with-clang.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-narrowing-errors-seen-with-clang.patch b/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-narrowing-errors-seen-with-clang.patch new file mode 100644 index 0000000000..08e709b1d0 --- /dev/null +++ b/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-narrowing-errors-seen-with-clang.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | From 77f327909e4a99c64261290cd76e234e10cc64d2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 3 May 2023 21:59:43 -0700 | ||
4 | Subject: [PATCH] tests: Fix narrowing errors seen with clang | ||
5 | |||
6 | Fixes | ||
7 | piglit-test-pattern.cpp:656:26: error: type 'float' cannot be narrowed to 'int' in initiali | ||
8 | zer list [-Wc++11-narrowing] | ||
9 | |||
10 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/807] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | .../spec/ext_framebuffer_multisample/draw-buffers-common.cpp | 4 ++-- | ||
14 | tests/util/piglit-test-pattern.cpp | 4 ++-- | ||
15 | 2 files changed, 4 insertions(+), 4 deletions(-) | ||
16 | |||
17 | diff --git a/tests/spec/ext_framebuffer_multisample/draw-buffers-common.cpp b/tests/spec/ext_framebuffer_multisample/draw-buffers-common.cpp | ||
18 | index 48e1ad4a5..b36830c45 100644 | ||
19 | --- a/tests/spec/ext_framebuffer_multisample/draw-buffers-common.cpp | ||
20 | +++ b/tests/spec/ext_framebuffer_multisample/draw-buffers-common.cpp | ||
21 | @@ -353,8 +353,8 @@ draw_pattern(bool sample_alpha_to_coverage, | ||
22 | float vertices[4][2] = { | ||
23 | { 0.0f, 0.0f + i * (pattern_height / num_rects) }, | ||
24 | { 0.0f, (i + 1.0f) * (pattern_height / num_rects) }, | ||
25 | - { pattern_width, (i + 1.0f) * (pattern_height / num_rects) }, | ||
26 | - { pattern_width, 0.0f + i * (pattern_height / num_rects) } }; | ||
27 | + { static_cast<float>(pattern_width), (i + 1.0f) * (pattern_height / num_rects) }, | ||
28 | + { static_cast<float>(pattern_width), 0.0f + i * (pattern_height / num_rects) } }; | ||
29 | |||
30 | glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, | ||
31 | sizeof(vertices[0]), | ||
32 | diff --git a/tests/util/piglit-test-pattern.cpp b/tests/util/piglit-test-pattern.cpp | ||
33 | index 43d451d6a..52ee94457 100644 | ||
34 | --- a/tests/util/piglit-test-pattern.cpp | ||
35 | +++ b/tests/util/piglit-test-pattern.cpp | ||
36 | @@ -653,12 +653,12 @@ ColorGradientSunburst::draw_with_scale_and_offset(const float (*proj)[4], | ||
37 | { | ||
38 | switch (out_type) { | ||
39 | case GL_INT: { | ||
40 | - int clear_color[4] = { offset, offset, offset, offset }; | ||
41 | + int clear_color[4] = { static_cast<int>(offset), static_cast<int>(offset), static_cast<int>(offset), static_cast<int>(offset) }; | ||
42 | glClearBufferiv(GL_COLOR, 0, clear_color); | ||
43 | break; | ||
44 | } | ||
45 | case GL_UNSIGNED_INT: { | ||
46 | - unsigned clear_color[4] = { offset, offset, offset, offset }; | ||
47 | + unsigned clear_color[4] = { static_cast<unsigned>(offset), static_cast<unsigned>(offset), static_cast<unsigned>(offset), static_cast<unsigned>(offset) }; | ||
48 | glClearBufferuiv(GL_COLOR, 0, clear_color); | ||
49 | break; | ||
50 | } | ||