[Mesa-dev] [PATCH 9/9] radeonsi: enable ARB_query_buffer_object

[Nicolai Hähnle]

On 16.09.2016 15:57, Nicolai Hähnle wrote:
> From: Nicolai Hähnle <nicolai.haehnle at amd.com>
>
> ---
>  docs/features.txt                      | 2 +-
>  docs/relnotes/12.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 9850a43..8b87b08 100644
> --- a/docs/features.txt
> +++ b/docs/features.txt
> @@ -194,21 +194,21 @@ GL 4.4, GLSL 4.40 -- all DONE: i965/gen8+
>    GL_ARB_buffer_storage                                 DONE (i965, nv50, nvc0, r600, radeonsi)
>    GL_ARB_clear_texture                                  DONE (i965, nv50, nvc0, r600, radeonsi)
>    GL_ARB_enhanced_layouts                               DONE (i965)
>    - compile-time constant expressions                   DONE
>    - explicit byte offsets for blocks                    DONE
>    - forced alignment within blocks                      DONE
>    - specified vec4-slot component numbers               DONE (i965)
>    - 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)
>
>  GL 4.5, GLSL 4.50:
>
>    GL_ARB_ES3_1_compatibility                            DONE (i965/hsw+, nvc0, radeonsi)
>    GL_ARB_clip_control                                   DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe, swr)
>    GL_ARB_conditional_render_inverted                    DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe, swr)
>    GL_ARB_cull_distance                                  DONE (i965, nv50, nvc0, radeonsi, llvmpipe, softpipe, swr)
> diff --git a/docs/relnotes/12.1.0.html b/docs/relnotes/12.1.0.html
> index 8e0a84e..5a45a1d 100644
> --- a/docs/relnotes/12.1.0.html
> +++ b/docs/relnotes/12.1.0.html
> @@ -44,20 +44,21 @@ Note: some of the new features are only available with certain drivers.
>  </p>
>
>  <ul>
>  <li>OpenGL ES 3.1 on i965/hsw</li>
>  <li>GL_ARB_ES3_1_compatibility on i965</li>
>  <li>GL_ARB_ES3_2_compatibility on i965/gen8+</li>
>  <li>GL_ARB_clear_texture on r600, radeonsi</li>
>  <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_stencil_texturing on i965/hsw</li>
>  <li>GL_ARB_texture_stencil8 on i965/hsw</li>
>  <li>GL_EXT_window_rectangles on nv50, nvc0</li>
>  <li>GL_KHR_blend_equation_advanced on i965</li>
>  <li>GL_KHR_texture_compression_astc_sliced_3d on i965</li>
>  <li>GL_OES_copy_image on nv50, nvc0, r600, radeonsi, softpipe, llvmpipe</li>
>  <li>GL_OES_geometry_shader on i965/gen8+, nvc0, radeonsi</li>
>  <li>GL_OES_primitive_bounding_box on i965/gen7+, nvc0, radeonsi</li>
> diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
> index 730be9d..84f9796 100644
> --- a/src/gallium/drivers/radeonsi/si_pipe.c
> +++ b/src/gallium/drivers/radeonsi/si_pipe.c
> @@ -393,20 +393,21 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
>  	case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS:
>  	case PIPE_CAP_QUERY_MEMORY_INFO:
>  	case PIPE_CAP_TGSI_PACK_HALF_FLOAT:
>  	case PIPE_CAP_FRAMEBUFFER_NO_ATTACHMENT:
>  	case PIPE_CAP_ROBUST_BUFFER_ACCESS_BEHAVIOR:
>  	case PIPE_CAP_GENERATE_MIPMAP:
>  	case PIPE_CAP_POLYGON_OFFSET_UNITS_UNSCALED:
>  	case PIPE_CAP_STRING_MARKER:
>  	case PIPE_CAP_CLEAR_TEXTURE:
>  	case PIPE_CAP_CULL_DISTANCE:
> +	case PIPE_CAP_QUERY_BUFFER_OBJECT:

Actually, this needs to be gated the same as ARB_compute_shader, the 
expression for that is in si_get_shader_param.

Nicolai

>  		return 1;
>
>  	case PIPE_CAP_RESOURCE_FROM_USER_MEMORY:
>  		return !SI_BIG_ENDIAN && sscreen->b.info.has_userptr;
>
>  	case PIPE_CAP_DEVICE_RESET_STATUS_QUERY:
>  		return (sscreen->b.info.drm_major == 2 &&
>  			sscreen->b.info.drm_minor >= 43) ||
>  		       sscreen->b.info.drm_major == 3;
>
> @@ -441,21 +442,20 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
>  	case PIPE_CAP_BUFFER_SAMPLER_VIEW_RGBA_ONLY:
>  		return 0;
>
>  	/* Unsupported features. */
>  	case PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT:
>  	case PIPE_CAP_TGSI_CAN_COMPACT_CONSTANTS:
>  	case PIPE_CAP_USER_VERTEX_BUFFERS:
>  	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_DRAW_PARAMETERS:
>  	case PIPE_CAP_MULTI_DRAW_INDIRECT:
>  	case PIPE_CAP_MULTI_DRAW_INDIRECT_PARAMS:
>  		return sscreen->has_draw_indirect_multi;
>
>