summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolai Hähnle <nicolai.haehnle@amd.com>2016-09-14 09:43:42 +0200
committerNicolai Hähnle <nicolai.haehnle@amd.com>2016-09-16 15:39:27 +0200
commitec3c39e5a51389e2de4ce60c2f6b0cb16a85b64a (patch)
tree2c194474917b8afcb6dd56fb228f4424594394dc
parentb09617b50c429a5c9817db8cc5152e6f217e8860 (diff)
radeonsi: enable ARB_query_buffer_objectquery-buffer-object
-rw-r--r--docs/features.txt2
-rw-r--r--docs/relnotes/12.1.0.html1
-rw-r--r--src/gallium/drivers/radeonsi/si_pipe.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/docs/features.txt b/docs/features.txt
index 9850a43fd5..8b87b0832f 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 8e0a84e463..5a45a1d3de 100644
--- a/docs/relnotes/12.1.0.html
+++ b/docs/relnotes/12.1.0.html
@@ -51,6 +51,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_stencil_texturing on i965/hsw</li>
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index 730be9d55d..84f9796406 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -400,6 +400,7 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
case PIPE_CAP_STRING_MARKER:
case PIPE_CAP_CLEAR_TEXTURE:
case PIPE_CAP_CULL_DISTANCE:
+ case PIPE_CAP_QUERY_BUFFER_OBJECT:
return 1;
case PIPE_CAP_RESOURCE_FROM_USER_MEMORY:
@@ -448,7 +449,6 @@ 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: