From df6682d7823e8334ed90462ed31abfc2107358bd Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 3 Jul 2020 09:47:50 +1000 Subject: [PATCH] llvmpipe: bump texture/scene limits to enable GL 4.1 Do we need to make this more dynamic? or have some options for vmware embedded? Reviewed-by: Roland Scheidegger Part-of: --- .gitlab-ci/deqp-virgl-gl-fails.txt | 1 + .gitlab-ci/piglit/quick_gl.txt | 8 +++++--- src/gallium/drivers/llvmpipe/lp_limits.h | 6 +++--- src/gallium/drivers/llvmpipe/lp_scene.h | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci/deqp-virgl-gl-fails.txt b/.gitlab-ci/deqp-virgl-gl-fails.txt index 5f4fd1ecad7..e0c2e258f4b 100644 --- a/.gitlab-ci/deqp-virgl-gl-fails.txt +++ b/.gitlab-ci/deqp-virgl-gl-fails.txt @@ -640,6 +640,7 @@ dEQP-GLES31.functional.draw_indirect.compute_interop.separate.drawelements_compu dEQP-GLES31.functional.draw_indirect.compute_interop.separate.drawelements_compute_data_and_indices dEQP-GLES31.functional.draw_indirect.compute_interop.separate.drawelements_compute_indices dEQP-GLES31.functional.draw_indirect.random.20 +dEQP-GLES31.functional.fbo.no_attachments.maximums.all dEQP-GLES31.functional.image_load_store.2d_array.atomic.add_r32i_result dEQP-GLES31.functional.image_load_store.2d_array.atomic.add_r32i_return_value dEQP-GLES31.functional.image_load_store.2d_array.atomic.add_r32ui_result diff --git a/.gitlab-ci/piglit/quick_gl.txt b/.gitlab-ci/piglit/quick_gl.txt index 6c9f2d8f561..9999e272062 100644 --- a/.gitlab-ci/piglit/quick_gl.txt +++ b/.gitlab-ci/piglit/quick_gl.txt @@ -619,8 +619,10 @@ spec/arb_shader_image_load_store/invalid/imageload/address bounds test/image2d/r spec/arb_shader_image_load_store/invalid/imageload/address bounds test/image2d/rg8_snorm: fail spec/arb_shader_image_load_store/invalid/imageload/address bounds test/image2d/rg8i: fail spec/arb_shader_image_load_store/invalid/imageload/address bounds test/image2d/rg8ui: fail -spec/arb_shader_image_load_store/max-size/imagecube max size test/8192x8192x6x1: skip -spec/arb_shader_image_load_store/max-size/imagecubearray max size test/8192x8192x6x1: skip +spec/arb_shader_image_load_store/max-size/image2dmsarray max size test/4x16384x8x8: skip +spec/arb_shader_image_load_store/max-size/image2dmsarray max size test/4x8x16384x8: skip +spec/arb_shader_image_load_store/max-size/imagecube max size test/16384x16384x6x1: skip +spec/arb_shader_image_load_store/max-size/imagecubearray max size test/16384x16384x6x1: skip spec/arb_shader_texture_image_samples/builtin-image/r8/compute/image2dms samples test/2x8x96x1: skip spec/arb_shader_texture_image_samples/builtin-image/r8/compute/image2dmsarray samples test/2x8x16x6: skip spec/arb_shader_texture_image_samples/builtin-image/r8/fragment/image2dms samples test/2x8x96x1: skip @@ -1689,7 +1691,7 @@ summary: pass: 21839 fail: 215 crash: 0 - skip: 1446 + skip: 1448 timeout: 0 warn: 6 incomplete: 0 diff --git a/src/gallium/drivers/llvmpipe/lp_limits.h b/src/gallium/drivers/llvmpipe/lp_limits.h index 8ce15c33028..1b8a37e2bb0 100644 --- a/src/gallium/drivers/llvmpipe/lp_limits.h +++ b/src/gallium/drivers/llvmpipe/lp_limits.h @@ -48,10 +48,10 @@ * llvm GEP as well as avx2 gather use signed offsets). */ #define LP_MAX_TEXTURE_SIZE (2 * 1024 * 1024 * 1024ULL) -#define LP_MAX_TEXTURE_2D_LEVELS 14 /* 8K x 8K for now */ +#define LP_MAX_TEXTURE_2D_LEVELS 15 /* 16K x 16K for now */ #define LP_MAX_TEXTURE_3D_LEVELS 12 /* 2K x 2K x 2K for now */ -#define LP_MAX_TEXTURE_CUBE_LEVELS 14 /* 8K x 8K for now */ -#define LP_MAX_TEXTURE_ARRAY_LAYERS 512 /* 8K x 512 / 8K x 8K x 512 */ +#define LP_MAX_TEXTURE_CUBE_LEVELS 15 /* 16K x 16K for now */ +#define LP_MAX_TEXTURE_ARRAY_LAYERS 2048 /* 16K x 2048 / 16K x 16K x 2048 */ /** This must be the larger of LP_MAX_TEXTURE_2D/3D_LEVELS */ diff --git a/src/gallium/drivers/llvmpipe/lp_scene.h b/src/gallium/drivers/llvmpipe/lp_scene.h index 9f90dbbb02a..679e2c07b28 100644 --- a/src/gallium/drivers/llvmpipe/lp_scene.h +++ b/src/gallium/drivers/llvmpipe/lp_scene.h @@ -60,7 +60,7 @@ struct lp_rast_state; /* Scene temporary storage is clamped to this size: */ -#define LP_SCENE_MAX_SIZE (9*1024*1024) +#define LP_SCENE_MAX_SIZE (36*1024*1024) /* The maximum amount of texture storage referenced by a scene is * clamped to this size: -- 2.30.2