From cd3f38606962977821913792e841da6444244baa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolai=20H=C3=A4hnle?= Date: Thu, 30 Mar 2017 08:55:22 +0200 Subject: [PATCH] radeonsi: enable ARB_shader_clock MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Samuel Pitoiset Reviewed-by: Marek Olšák --- docs/features.txt | 2 +- docs/relnotes/17.1.0.html | 1 + src/gallium/drivers/radeonsi/si_pipe.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/features.txt b/docs/features.txt index b4e54a7d1a5..d707f011850 100644 --- a/docs/features.txt +++ b/docs/features.txt @@ -293,7 +293,7 @@ Khronos, ARB, and OES extensions that are not part of any OpenGL or OpenGL ES ve GL_ARB_seamless_cubemap_per_texture DONE (i965, nvc0, radeonsi, r600, softpipe, swr) GL_ARB_shader_atomic_counter_ops DONE (i965/gen7+, nvc0, radeonsi, softpipe) GL_ARB_shader_ballot not started - GL_ARB_shader_clock DONE (i965/gen7+) + GL_ARB_shader_clock DONE (i965/gen7+, radeonsi) GL_ARB_shader_draw_parameters DONE (i965, nvc0, radeonsi) GL_ARB_shader_group_vote DONE (nvc0) GL_ARB_shader_stencil_export DONE (i965/gen9+, radeonsi, softpipe, llvmpipe, swr) diff --git a/docs/relnotes/17.1.0.html b/docs/relnotes/17.1.0.html index b1d4aa011a9..c2a0166f72c 100644 --- a/docs/relnotes/17.1.0.html +++ b/docs/relnotes/17.1.0.html @@ -45,6 +45,7 @@ Note: some of the new features are only available with certain drivers.
  • GL_ARB_gpu_shader_int64 on i965/gen8+, nvc0, radeonsi, softpipe, llvmpipe
    • +
  • GL_ARB_shader_clock on radeonsi
  • GL_ARB_transform_feedback2 on i965/gen6
  • GL_ARB_transform_feedback_overflow_query on i965/gen6+
  • Geometry shaders enabled on swr
    • diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 29887e43e1b..2369471aa58 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -421,6 +421,7 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param) case PIPE_CAP_INT64: case PIPE_CAP_INT64_DIVMOD: + case PIPE_CAP_TGSI_CLOCK: return HAVE_LLVM >= 0x0309; case PIPE_CAP_RESOURCE_FROM_USER_MEMORY: @@ -485,7 +486,6 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param) case PIPE_CAP_TGSI_FS_FBFETCH: case PIPE_CAP_TGSI_MUL_ZERO_WINS: case PIPE_CAP_UMA: - case PIPE_CAP_TGSI_CLOCK: return 0; case PIPE_CAP_QUERY_BUFFER_OBJECT: -- 2.30.2