From c738cfe8dd100f481251990f60d973c4a01ed803 Mon Sep 17 00:00:00 2001 From: Robert Mader Date: Thu, 15 Aug 2024 20:20:48 +0200 Subject: [PATCH] egl: Stop requiring texture_3D_image for EGL 1.5 Neither VK-GL-CTS nor dri2_setup_screen() require it, unlike texture_2D_image and texture_cubemap_image. Crucially, older etnaviv generations and vc4 in general do not support 3d textures. Thus drop the requirement in order to support EGL 1.5 across the board. Signed-off-by: Robert Mader Reviewed-by: Adam Jackson Acked-by: Daniel Stone Part-of: --- src/egl/main/eglapi.c | 1 - src/gallium/auxiliary/util/u_screen.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index ef772d652e6..fd2c6970e19 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -651,7 +651,6 @@ _eglComputeVersion(_EGLDisplay *disp) if (disp->Extensions.KHR_fence_sync && disp->Extensions.KHR_cl_event2 && disp->Extensions.KHR_wait_sync && disp->Extensions.KHR_image_base && disp->Extensions.KHR_gl_texture_2D_image && - disp->Extensions.KHR_gl_texture_3D_image && disp->Extensions.KHR_gl_texture_cubemap_image && disp->Extensions.KHR_gl_renderbuffer_image && disp->Extensions.KHR_create_context && diff --git a/src/gallium/auxiliary/util/u_screen.c b/src/gallium/auxiliary/util/u_screen.c index 6218f386b3b..ff2f91abcf0 100644 --- a/src/gallium/auxiliary/util/u_screen.c +++ b/src/gallium/auxiliary/util/u_screen.c @@ -73,7 +73,6 @@ u_pipe_screen_get_param_defaults(struct pipe_screen *pscreen, return 0; case PIPE_CAP_MAX_TEXTURE_2D_SIZE: - case PIPE_CAP_MAX_TEXTURE_3D_LEVELS: case PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS: unreachable("driver must implement these."); @@ -86,6 +85,7 @@ u_pipe_screen_get_param_defaults(struct pipe_screen *pscreen, case PIPE_CAP_PRIMITIVE_RESTART_FIXED_INDEX: case PIPE_CAP_INDEP_BLEND_ENABLE: case PIPE_CAP_INDEP_BLEND_FUNC: + case PIPE_CAP_MAX_TEXTURE_3D_LEVELS: case PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS: /* Enables GL_EXT_texture_array */ case PIPE_CAP_FS_COORD_ORIGIN_UPPER_LEFT: case PIPE_CAP_FS_COORD_ORIGIN_LOWER_LEFT: