From 3091f5a7f412d8b7d92f96cdc0fd55cfe071f726 Mon Sep 17 00:00:00 2001 From: Asahi Lina Date: Wed, 14 Dec 2022 18:46:37 +0900 Subject: [PATCH] asahi: Enable VS_INSTANCEID and VERTEX_ELEMENT_INSTANCE_DIVISOR caps These two should be functional at this point. The latter is required (and quite well tested) by Darwinia. Signed-off-by: Asahi Lina Part-of: --- docs/features.txt | 4 ++-- src/gallium/drivers/asahi/agx_pipe.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/features.txt b/docs/features.txt index f29781bfd87..c302f2bd5b6 100644 --- a/docs/features.txt +++ b/docs/features.txt @@ -72,7 +72,7 @@ GL 3.0, GLSL 1.30 --- all DONE: freedreno, i965, nv50, nvc0, r600, radeonsi, llv GL 3.1, GLSL 1.40 --- all DONE: freedreno, i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe, virgl, zink, d3d12, panfrost Forward compatible context support/deprecations DONE - GL_ARB_draw_instanced (Instanced drawing) DONE (etnaviv/HALTI2, v3d) + GL_ARB_draw_instanced (Instanced drawing) DONE (etnaviv/HALTI2, v3d, asahi) GL_ARB_copy_buffer (Buffer copying) DONE (v3d, vc4, lima, asahi) GL_NV_primitive_restart (Primitive restart) DONE (v3d, asahi) 16 vertex texture image units DONE () @@ -107,7 +107,7 @@ GL 3.3, GLSL 3.30 --- all DONE: freedreno, i965, nv50, nvc0, r600, radeonsi, llv GL_ARB_texture_rgb10_a2ui DONE (v3d, panfrost, asahi) GL_ARB_texture_swizzle DONE (v3d, vc4, panfrost, lima, asahi) GL_ARB_timer_query DONE () - GL_ARB_instanced_arrays DONE (etnaviv/HALTI2, v3d, panfrost) + GL_ARB_instanced_arrays DONE (etnaviv/HALTI2, v3d, panfrost, asahi) GL_ARB_vertex_type_2_10_10_10_rev DONE (v3d, panfrost, asahi) diff --git a/src/gallium/drivers/asahi/agx_pipe.c b/src/gallium/drivers/asahi/agx_pipe.c index 3009bf6e579..f5c157392a5 100644 --- a/src/gallium/drivers/asahi/agx_pipe.c +++ b/src/gallium/drivers/asahi/agx_pipe.c @@ -1263,10 +1263,10 @@ agx_get_param(struct pipe_screen* pscreen, enum pipe_cap param) case PIPE_CAP_SHADER_ARRAY_COMPONENTS: case PIPE_CAP_PACKED_UNIFORMS: case PIPE_CAP_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION: - return 1; - case PIPE_CAP_VS_INSTANCEID: case PIPE_CAP_VERTEX_ELEMENT_INSTANCE_DIVISOR: + return 1; + case PIPE_CAP_TEXTURE_MULTISAMPLE: case PIPE_CAP_SURFACE_SAMPLE_COUNT: case PIPE_CAP_SAMPLE_SHADING: