summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward O'Callaghan <funfunctor@folklore1984.net>2016-08-13 15:04:45 +1000
committerEdward O'Callaghan <funfunctor@folklore1984.net>2016-08-13 15:06:09 +1000
commitbacc30d66332d7e9c65dde8d03e95c91ae61ee73 (patch)
tree4c160f094de43ad293e314e6ce51ef68bd2f27ca
parente356be3051eb2bfeb9ebfada480ae41ef05cacf9 (diff)
radeonsi: Enable ARB_query_buffer_objectARB_query_buffer_object-radeonsi
Signed-off-by: Edward O'Callaghan <funfunctor@folklore1984.net>
-rw-r--r--docs/GL3.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/GL3.txt b/docs/GL3.txt
index 084c17edea..00efd99751 100644
--- a/docs/GL3.txt
+++ b/docs/GL3.txt
@@ -201,7 +201,7 @@ GL 4.4, GLSL 4.40:
- 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/gen8+, 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 5181fa0124..a7c5976c94 100644
--- a/docs/relnotes/12.1.0.html
+++ b/docs/relnotes/12.1.0.html
@@ -44,6 +44,7 @@ Note: some of the new features are only available with certain drivers.
</p>
<ul>
+<li>GL_ARB_query_buffer_object on radeonsi</li>
<li>GL_ARB_clear_texture on r600, radeonsi</li>
<li>GL_ARB_enhanced_layouts on i965</li>
<li>GL_ARB_indirect_parameters on radeonsi</li>
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index 62b62db34a..b776dc4c4f 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -387,6 +387,7 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
case PIPE_CAP_POLYGON_OFFSET_UNITS_UNSCALED:
case PIPE_CAP_STRING_MARKER:
case PIPE_CAP_CLEAR_TEXTURE:
+ case PIPE_CAP_QUERY_BUFFER_OBJECT:
return 1;
case PIPE_CAP_RESOURCE_FROM_USER_MEMORY:
@@ -435,7 +436,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_CULL_DISTANCE:
case PIPE_CAP_PRIMITIVE_RESTART_FOR_PATCHES:
case PIPE_CAP_TGSI_VOTE: