diff options
| author | Eric Anholt <[email protected]> | 2019-08-29 15:45:18 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2019-10-20 04:39:48 +0000 |
| commit | 236b478b2ec0d65ef5dfe1165ae8ab027dde0a42 (patch) | |
| tree | ba0825512a12788b3a95e07251a2a1b8e27fbaee /src/mesa/swrast | |
| parent | 1165e3f36084ff0c4ff0c4f5a069185b0f28386f (diff) | |
mesa: Replace the LA16_UNORM packed formats with one array format.
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 <[email protected]>
Diffstat (limited to 'src/mesa/swrast')
| -rw-r--r-- | src/mesa/swrast/s_texfetch.c | 3 | ||||
| -rw-r--r-- | src/mesa/swrast/s_texfetch_tmp.h | 3 |
2 files changed, 2 insertions, 4 deletions
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), diff --git a/src/mesa/swrast/s_texfetch_tmp.h b/src/mesa/swrast/s_texfetch_tmp.h index 8261ebf46ef..72bb13498af 100644 --- a/src/mesa/swrast/s_texfetch_tmp.h +++ b/src/mesa/swrast/s_texfetch_tmp.h @@ -137,13 +137,12 @@ FETCH_RGBA(R_UNORM16, GLushort, 1) FETCH_RGBA(A8L8_UNORM, GLushort, 1) FETCH_RGBA(R16G16_UNORM, GLuint, 1) FETCH_RGBA(G16R16_UNORM, GLuint, 1) -FETCH_RGBA(L16A16_UNORM, GLuint, 1) -FETCH_RGBA(A16L16_UNORM, GLuint, 1) FETCH_RGBA(B2G3R3_UNORM, GLubyte, 1) FETCH_RGBA(A_UNORM8, GLubyte, 1) FETCH_RGBA(A_UNORM16, GLushort, 1) FETCH_RGBA(L_UNORM8, GLubyte, 1) FETCH_RGBA(L_UNORM16, GLushort, 1) +FETCH_RGBA(LA_UNORM16, GLushort, 2) FETCH_RGBA(I_UNORM8, GLubyte, 1) FETCH_RGBA(I_UNORM16, GLushort, 1) FETCH_RGBA(BGR_SRGB8, GLubyte, 3) |