From 171e94fe629011a7282c81f5777603752058169e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tapani=20P=C3=A4lli?= Date: Tue, 1 Sep 2020 14:21:03 +0300 Subject: [PATCH] mesa/st: enable EXT_color_buffer_half_float when formats supported MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Tapani Pälli Reviewed-by: Marek Olšák Part-of: --- .gitlab-ci.yml | 2 +- .gitlab-ci/deqp-panfrost-t860-fails.txt | 21 +++++++++++++++++++++ .gitlab-ci/piglit/quick_gl.txt | 11 +++-------- docs/features.txt | 1 + src/mesa/state_tracker/st_extensions.c | 6 ++++++ 5 files changed, 32 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 234f8e6524c..ebd9f258056 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -297,7 +297,7 @@ x86_test-base: x86_test-gl: extends: .use-x86_test-base variables: - FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-08-31-deqp-version" + FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-09-03-deqp-version" # Debian 10 based x86 test image for VK x86_test-vk: diff --git a/.gitlab-ci/deqp-panfrost-t860-fails.txt b/.gitlab-ci/deqp-panfrost-t860-fails.txt index 1ff0008fe65..f4a7fa3e830 100644 --- a/.gitlab-ci/deqp-panfrost-t860-fails.txt +++ b/.gitlab-ci/deqp-panfrost-t860-fails.txt @@ -40,3 +40,24 @@ dEQP-GLES3.functional.fbo.msaa.4_samples.rgba16f dEQP-GLES3.functional.fbo.msaa.4_samples.rgba32f dEQP-GLES3.functional.fbo.msaa.4_samples.stencil_index8 dEQP-GLES3.functional.fence_sync.client_wait_sync_finish +dEQP-GLES3.functional.fbo.color.blend.rgb16f_src_over +dEQP-GLES3.functional.fbo.color.clear.rgb16f +dEQP-GLES3.functional.fbo.color.repeated_clear.blit.rbo.rgb16f +dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.rgb16f +dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.rgb16f +dEQP-GLES3.functional.fbo.color.tex2d.rgb16f +dEQP-GLES3.functional.fbo.color.tex2darray.rgb16f +dEQP-GLES3.functional.fbo.color.tex3d.rgb16f +dEQP-GLES3.functional.fbo.color.texcube.rgb16f +dEQP-GLES3.functional.fbo.render.recreate_color.tex2d_rgb16f_depth_stencil_rbo_depth24_stencil8 +dEQP-GLES3.functional.fbo.render.resize.rbo_rgb16f +dEQP-GLES3.functional.fbo.render.shared_colorbuffer.rbo_rgb16f_depth_rbo_depth24_stencil8 +dEQP-GLES3.functional.fbo.render.shared_colorbuffer.tex2d_rgb16f +dEQP-GLES3.functional.fbo.render.shared_colorbuffer.tex2d_rgb16f_depth_stencil_rbo_depth24_stencil8 +dEQP-GLES3.functional.fbo.render.shared_colorbuffer_clear.tex2d_rgb16f +dEQP-GLES3.functional.fbo.render.recreate_color.rbo_rgb16f_depth_stencil_rbo_depth24_stencil8 +dEQP-GLES3.functional.fbo.render.resize.tex2d_rgb16f +dEQP-GLES3.functional.fbo.render.shared_colorbuffer.rbo_rgb16f +dEQP-GLES3.functional.fbo.render.shared_colorbuffer.rbo_rgb16f_depth_stencil_rbo_depth24_stencil8 +dEQP-GLES3.functional.fbo.render.shared_colorbuffer.tex2d_rgb16f_depth_rbo_depth24_stencil8 +dEQP-GLES3.functional.fbo.render.shared_colorbuffer_clear.rbo_rgb16f diff --git a/.gitlab-ci/piglit/quick_gl.txt b/.gitlab-ci/piglit/quick_gl.txt index 1e630e5cb85..a24ae0d3647 100644 --- a/.gitlab-ci/piglit/quick_gl.txt +++ b/.gitlab-ci/piglit/quick_gl.txt @@ -1617,19 +1617,14 @@ spec/oes_texture_view/rendering-formats/clear gl_rgba8 as gl_rg16f: fail spec/oes_texture_view/rendering-formats/clear gl_rgba8 as gl_rg16i: fail spec/oes_texture_view/rendering-formats/clear gl_rgba8 as gl_rgba8_snorm: fail spec/oes_texture_view/rendering-formats/clear gl_rgba8 as gl_rgba8i: fail -spec/oes_texture_view/rendering-formats/render to gl_rgb16 as gl_rgb16f: skip spec/oes_texture_view/rendering-formats/render to gl_rgb16 as gl_rgb16i: skip spec/oes_texture_view/rendering-formats/render to gl_rgb16 as gl_rgb16ui: skip -spec/oes_texture_view/rendering-formats/render to gl_rgb16_snorm as gl_rgb16f: skip spec/oes_texture_view/rendering-formats/render to gl_rgb16_snorm as gl_rgb16i: skip spec/oes_texture_view/rendering-formats/render to gl_rgb16_snorm as gl_rgb16ui: skip -spec/oes_texture_view/rendering-formats/render to gl_rgb16f as gl_rgb16f: skip spec/oes_texture_view/rendering-formats/render to gl_rgb16f as gl_rgb16i: skip spec/oes_texture_view/rendering-formats/render to gl_rgb16f as gl_rgb16ui: skip -spec/oes_texture_view/rendering-formats/render to gl_rgb16i as gl_rgb16f: skip spec/oes_texture_view/rendering-formats/render to gl_rgb16i as gl_rgb16i: skip spec/oes_texture_view/rendering-formats/render to gl_rgb16i as gl_rgb16ui: skip -spec/oes_texture_view/rendering-formats/render to gl_rgb16ui as gl_rgb16f: skip spec/oes_texture_view/rendering-formats/render to gl_rgb16ui as gl_rgb16i: skip spec/oes_texture_view/rendering-formats/render to gl_rgb16ui as gl_rgb16ui: skip spec/oes_texture_view/rendering-formats/render to gl_rgb32f as gl_rgb32f: skip @@ -1661,10 +1656,10 @@ wgl/wgl-sanity: skip summary: name: results ---- -------- - pass: 23064 + pass: 23074 fail: 198 crash: 0 - skip: 1438 + skip: 1433 timeout: 0 warn: 6 incomplete: 0 @@ -1673,4 +1668,4 @@ summary: changes: 0 fixes: 0 regressions: 0 - total: 24724 + total: 24729 diff --git a/docs/features.txt b/docs/features.txt index 13a96439cd2..c6f92402d3e 100644 --- a/docs/features.txt +++ b/docs/features.txt @@ -318,6 +318,7 @@ Khronos, ARB, and OES extensions that are not part of any OpenGL or OpenGL ES ve GL_ARB_sparse_texture2 not started GL_ARB_sparse_texture_clamp not started GL_ARB_texture_filter_minmax not started + GL_EXT_color_buffer_half_float DONE (gallium drivers supporting required formats) GL_EXT_memory_object DONE (radeonsi) GL_EXT_memory_object_fd DONE (radeonsi) GL_EXT_memory_object_win32 not started diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index d1e662d2156..f5443b02753 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -869,6 +869,12 @@ void st_init_extensions(struct pipe_screen *screen, PIPE_FORMAT_R16_SNORM, PIPE_FORMAT_R16G16_SNORM, PIPE_FORMAT_R16G16B16A16_SNORM } }, + + { { o(EXT_color_buffer_half_float) }, + { PIPE_FORMAT_R16_FLOAT, + PIPE_FORMAT_R16G16_FLOAT, + PIPE_FORMAT_R16G16B16X16_FLOAT, + PIPE_FORMAT_R16G16B16A16_FLOAT } }, }; /* Required: render target, sampler, and blending */