From 62fd87198432f3eac7b36fee4dfa2568cc1a5aad Mon Sep 17 00:00:00 2001 From: Roland Scheidegger Date: Thu, 28 Aug 2014 03:38:55 +0200 Subject: [PATCH] llvmpipe: (trivial) enable cube map arrays The code is all in place now so enable it. Seems to pass all relevant piglit tests (just like cube maps, some of the cube map array tests need GALLIVM_DEBUG=no_quad_lod,no_rho_approx) Reviewed-by: Jose Fonseca --- docs/GL3.txt | 2 +- src/gallium/drivers/llvmpipe/lp_screen.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/GL3.txt b/docs/GL3.txt index 9727e8747a5..56c4994e563 100644 --- a/docs/GL3.txt +++ b/docs/GL3.txt @@ -114,7 +114,7 @@ GL 4.0, GLSL 4.00: GL_ARB_shader_subroutine not started GL_ARB_tessellation_shader started (Chris, Ilia) GL_ARB_texture_buffer_object_rgb32 DONE (i965, nvc0, r600, radeonsi, llvmpipe, softpipe) - GL_ARB_texture_cube_map_array DONE (i965, nv50, nvc0, r600, radeonsi, softpipe) + GL_ARB_texture_cube_map_array DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe) GL_ARB_texture_gather DONE (i965, nv50, nvc0, r600, radeonsi) GL_ARB_texture_query_lod DONE (i965, nv50, nvc0, r600, radeonsi) GL_ARB_transform_feedback2 DONE (i965, nv50, nvc0, r600, radeonsi) diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c index b1749c0187a..2da52080d6b 100644 --- a/src/gallium/drivers/llvmpipe/lp_screen.c +++ b/src/gallium/drivers/llvmpipe/lp_screen.c @@ -224,10 +224,11 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_DRAW_INDIRECT: return 1; + case PIPE_CAP_CUBE_MAP_ARRAY: + return 1; case PIPE_CAP_CONSTANT_BUFFER_OFFSET_ALIGNMENT: return 16; case PIPE_CAP_TEXTURE_MULTISAMPLE: - case PIPE_CAP_CUBE_MAP_ARRAY: return 0; case PIPE_CAP_MIN_MAP_BUFFER_ALIGNMENT: return 64; -- 2.30.2