From 236b478b2ec0d65ef5dfe1165ae8ab027dde0a42 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 29 Aug 2019 15:45:18 -0700 Subject: mesa: Replace the LA16_UNORM packed formats with one array format. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The array format is what the GL API wants (and we made a mistake in the format returned for texbos on big-endian!), and it's exactly what the gallium-side PIPE_FORMAT_L16A16 is. The only downside is that dri_util tries to fall back to sampling RG16 using LA16, which doesn't have a match for big-endian any more. No HW drivers supported A16L16 anyway. Reviewed-by: Marek Olšák --- src/mesa/swrast/s_texfetch.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/mesa/swrast/s_texfetch.c') diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c index 5f0b06e915c..1fe5e21162a 100644 --- a/src/mesa/swrast/s_texfetch.c +++ b/src/mesa/swrast/s_texfetch.c @@ -134,8 +134,6 @@ texfetch_funcs[] = FETCH_FUNCS(B8G8R8X8_UNORM), FETCH_FUNCS(A8R8G8B8_UNORM), FETCH_FUNCS(X8R8G8B8_UNORM), - FETCH_FUNCS(L16A16_UNORM), - FETCH_FUNCS(A16L16_UNORM), FETCH_FUNCS(B5G6R5_UNORM), FETCH_FUNCS(R5G6B5_UNORM), FETCH_FUNCS(B4G4R4A4_UNORM), @@ -175,6 +173,7 @@ texfetch_funcs[] = FETCH_FUNCS(A_UNORM16), FETCH_FUNCS(L_UNORM8), FETCH_FUNCS(L_UNORM16), + FETCH_FUNCS(LA_UNORM16), FETCH_FUNCS(I_UNORM8), FETCH_FUNCS(I_UNORM16), FETCH_FUNCS(R_UNORM8), -- cgit v1.2.3