summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2020-12-28 14:20:23 -0800
committerMarge Bot <eric+marge@anholt.net>2020-12-29 19:37:52 +0000
commit02328637c1af9a4dce8d6743641241344b17d606 (patch)
tree9896ddb41f01507bfcb2a2e5a0c20015127684ba
parent9fe5859d5de16245272932cfd876450f5e11be13 (diff)
freedreno: Enable GLSL 1.50, updating us to GL 3.2 contexts.
We have been advertising 3.1, which waffle has issues creating contexts for, causing coverage (and performance!) issues in piglit. We should support all the necessary features already. Some new failures are caught by the 3.2 CTS, but they look like they're existing issues simply not covered by the minimal GL 3.0 CTS. Fixes: #3037 Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8255>
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--.gitlab-ci/deqp-freedreno-a630-fails.txt24
-rw-r--r--docs/relnotes/new_features.txt1
-rw-r--r--src/gallium/drivers/freedreno/freedreno_screen.c7
4 files changed, 21 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd550741045..99229f2f80d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1406,7 +1406,7 @@ arm64_a630_gl:
- .baremetal-deqp-test
- .arm64-a630-test
variables:
- DEQP_VER: gl30
+ DEQP_VER: gl32
arm64_a630_gles_others:
extends:
diff --git a/.gitlab-ci/deqp-freedreno-a630-fails.txt b/.gitlab-ci/deqp-freedreno-a630-fails.txt
index 42b142076cb..48157db46c8 100644
--- a/.gitlab-ci/deqp-freedreno-a630-fails.txt
+++ b/.gitlab-ci/deqp-freedreno-a630-fails.txt
@@ -1,14 +1,16 @@
-KHR-GL30.transform_feedback.api_errors_test,Fail
-KHR-GL30.transform_feedback.capture_vertex_interleaved_test,Fail
-KHR-GL30.transform_feedback.capture_vertex_separate_test,Fail
-KHR-GL30.transform_feedback.discard_vertex_test,Fail
-KHR-GL30.transform_feedback.draw_xfb_feedbackk_test,Crash
-KHR-GL30.transform_feedback.draw_xfb_instanced_test,Crash
-KHR-GL30.transform_feedback.draw_xfb_stream_instanced_test,Crash
-KHR-GL30.transform_feedback.draw_xfb_test,Crash
-KHR-GL30.transform_feedback.get_xfb_varying,Fail
-KHR-GL30.transform_feedback.query_vertex_interleaved_test,Fail
-KHR-GL30.transform_feedback.query_vertex_separate_test,Fail
+KHR-GL32.packed_depth_stencil.blit.depth24_stencil8,Fail
+KHR-GL32.packed_depth_stencil.verify_get_tex_image.depth24_stencil8,Fail
+KHR-GL32.packed_depth_stencil.verify_read_pixels.depth24_stencil8,Fail
+KHR-GL32.transform_feedback.api_errors_test,Fail
+KHR-GL32.transform_feedback.capture_vertex_interleaved_test,Fail
+KHR-GL32.transform_feedback.capture_vertex_separate_test,Fail
+KHR-GL32.transform_feedback.discard_vertex_test,Fail
+KHR-GL32.transform_feedback.draw_xfb_feedbackk_test,Crash
+KHR-GL32.transform_feedback.draw_xfb_instanced_test,Crash
+KHR-GL32.transform_feedback.draw_xfb_stream_instanced_test,Crash
+KHR-GL32.transform_feedback.draw_xfb_test,Crash
+KHR-GL32.transform_feedback.query_vertex_interleaved_test,Fail
+KHR-GL32.transform_feedback.query_vertex_separate_test,Fail
dEQP-VK.api.object_management.single_alloc_callbacks.compute_pipeline,Fail
dEQP-VK.compute.indirect_dispatch.gen_in_compute.multiple_groups_multiple_invocations,Fail
dEQP-VK.compute.indirect_dispatch.upload_buffer.multiple_groups,Fail
diff --git a/docs/relnotes/new_features.txt b/docs/relnotes/new_features.txt
index 9a016aa2884..627a317b623 100644
--- a/docs/relnotes/new_features.txt
+++ b/docs/relnotes/new_features.txt
@@ -7,3 +7,4 @@ Removed support for loading DRI drivers older than Mesa 8.0, including all DRI1
Add support for VK_VALVE_mutable_descriptor_type on RADV
Removed classic OSMesa in favor of the newly improved gallium OSMesa
VK_KHR_fragment_shading_rate on RADV (RDNA2 only)
+Freedreno a6xx exposes GL 3.2
diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c
index 1ff5e9f4439..3f986a9e807 100644
--- a/src/gallium/drivers/freedreno/freedreno_screen.c
+++ b/src/gallium/drivers/freedreno/freedreno_screen.c
@@ -309,7 +309,12 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
case PIPE_CAP_GLSL_FEATURE_LEVEL:
case PIPE_CAP_GLSL_FEATURE_LEVEL_COMPATIBILITY:
- return is_ir3(screen) ? 140 : 120;
+ if (is_a6xx(screen))
+ return 150;
+ else if (is_ir3(screen))
+ return 140;
+ else
+ return 120;
case PIPE_CAP_ESSL_FEATURE_LEVEL:
/* we can probably enable 320 for a5xx too, but need to test: */