diff options
| author | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2016-09-14 09:43:42 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2016-09-29 11:15:00 +0200 |
| commit | 7a0e543836a69c7f51b264825316215d3f6bae8a (patch) | |
| tree | 0455ac49cd1e40037886a38f4301df7e95a95ab0 | |
| parent | 15e26611373e6368eb6dd8365007b208668d0508 (diff) | |
| download | external_mesa3d-7a0e543836a69c7f51b264825316215d3f6bae8a.zip external_mesa3d-7a0e543836a69c7f51b264825316215d3f6bae8a.tar.gz external_mesa3d-7a0e543836a69c7f51b264825316215d3f6bae8a.tar.bz2 | |
radeonsi: enable ARB_query_buffer_object (v2)
v2: enable only when compute is available
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
| -rw-r--r-- | docs/features.txt | 2 | ||||
| -rw-r--r-- | docs/relnotes/12.1.0.html | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_pipe.c | 21 |
3 files changed, 16 insertions, 8 deletions
diff --git a/docs/features.txt b/docs/features.txt index fbb3952..037ee97 100644 --- a/docs/features.txt +++ b/docs/features.txt @@ -201,7 +201,7 @@ GL 4.4, GLSL 4.40 -- all DONE: i965/gen8+ - specified transform/feedback layout DONE - input/output block locations DONE GL_ARB_multi_bind DONE (all drivers) - GL_ARB_query_buffer_object DONE (i965/hsw+, nvc0) + GL_ARB_query_buffer_object DONE (i965/hsw+, nvc0, radeonsi) GL_ARB_texture_mirror_clamp_to_edge DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe, swr) GL_ARB_texture_stencil8 DONE (i965/hsw+, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe, swr) GL_ARB_vertex_type_10f_11f_11f_rev DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe, swr) diff --git a/docs/relnotes/12.1.0.html b/docs/relnotes/12.1.0.html index cdd8909..dd17979 100644 --- a/docs/relnotes/12.1.0.html +++ b/docs/relnotes/12.1.0.html @@ -52,6 +52,7 @@ Note: some of the new features are only available with certain drivers. <li>GL_ARB_cull_distance on radeonsi</li> <li>GL_ARB_enhanced_layouts on i965</li> <li>GL_ARB_indirect_parameters on radeonsi</li> +<li>GL_ARB_query_buffer_object on radeonsi</li> <li>GL_ARB_shader_draw_parameters on radeonsi</li> <li>GL_ARB_shader_group_vote on nvc0</li> <li>GL_ARB_shader_viewport_layer_array on i965/gen6+</li> diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 730be9d..60ef548 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -316,6 +316,16 @@ fail: /* * pipe_screen */ +static bool si_have_tgsi_compute(struct si_screen *sscreen) +{ + /* Old kernels disallowed some register writes for SI + * that are used for indirect dispatches. */ + return HAVE_LLVM >= 0x309 && + (sscreen->b.chip_class >= CIK || + sscreen->b.info.drm_major == 3 || + (sscreen->b.info.drm_major == 2 && + sscreen->b.info.drm_minor >= 45)); +} static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param) { @@ -448,12 +458,14 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param) case PIPE_CAP_FAKE_SW_MSAA: case PIPE_CAP_TEXTURE_GATHER_OFFSETS: case PIPE_CAP_VERTEXID_NOBASE: - case PIPE_CAP_QUERY_BUFFER_OBJECT: case PIPE_CAP_PRIMITIVE_RESTART_FOR_PATCHES: case PIPE_CAP_TGSI_VOTE: case PIPE_CAP_MAX_WINDOW_RECTANGLES: return 0; + case PIPE_CAP_QUERY_BUFFER_OBJECT: + return si_have_tgsi_compute(sscreen); + case PIPE_CAP_DRAW_PARAMETERS: case PIPE_CAP_MULTI_DRAW_INDIRECT: case PIPE_CAP_MULTI_DRAW_INDIRECT_PARAMS: @@ -567,12 +579,7 @@ static int si_get_shader_param(struct pipe_screen* pscreen, unsigned shader, enu case PIPE_SHADER_CAP_SUPPORTED_IRS: { int ir = 1 << PIPE_SHADER_IR_NATIVE; - /* Old kernels disallowed some register writes for SI - * that are used for indirect dispatches. */ - if (HAVE_LLVM >= 0x309 && (sscreen->b.chip_class >= CIK || - sscreen->b.info.drm_major == 3 || - (sscreen->b.info.drm_major == 2 && - sscreen->b.info.drm_minor >= 45))) + if (si_have_tgsi_compute(sscreen)) ir |= 1 << PIPE_SHADER_IR_TGSI; return ir; |