diff options
| author | Gert Wollny <gert.wollny@collabora.com> | 2019-11-18 11:57:00 +0100 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-11-26 16:43:04 -0800 |
| commit | 2e8af7b3e0ab6fd39299cde9797c524fd82b33b5 (patch) | |
| tree | ae1f424b20bc0f351929eaf69d6d0042fd4c2db2 | |
| parent | 5b9decf632ff5bafd847cc074b4ef841e021f564 (diff) | |
| download | mesa-2e8af7b3e0ab6fd39299cde9797c524fd82b33b5.tar.gz mesa-2e8af7b3e0ab6fd39299cde9797c524fd82b33b5.tar.bz2 mesa-2e8af7b3e0ab6fd39299cde9797c524fd82b33b5.zip | |
r600: Disable eight bit three channel formats
Commit 0899bf55 made some deqp-gles3 tests related to RGB8 PBOs fail
on R600 because it exposed PIPE_FORMAT_R8G8B8_UNORM and R600 doesn't
propely handle this. Disabling this format also for buffers fixes the
issue.
In addition, disabling also the related RGB8 integer formats for buffers
fixes some deqp-gles3 tests:
dEQP-GLES3.functional.texture.specification.teximage2d_pbo.rgb8ui_cube
dEQP-GLES3.functional.texture.specification.texsubimage2d_pbo.rgb8i_2d
dEQP-GLES3.functional.texture.specification.texsubimage2d_pbo.rgb8i_cube
dEQP-GLES3.functional.texture.specification.texsubimage2d_pbo.rgb8ui_2d
dEQP-GLES3.functional.texture.specification.texsubimage2d_pbo.rgb8ui_cube
dEQP-GLES3.functional.texture.specification.teximage3d_pbo.rgb8i_2d_array
dEQP-GLES3.functional.texture.specification.teximage3d_pbo.rgb8i_3d
dEQP-GLES3.functional.texture.specification.teximage3d_pbo.rgb8ui_2d_array
dEQP-GLES3.functional.texture.specification.teximage3d_pbo.rgb8ui_3d
dEQP-GLES3.functional.texture.specification.texsubimage3d_pbo.rgb8i_2d_array
dEQP-GLES3.functional.texture.specification.texsubimage3d_pbo.rgb8i_3d
dEQP-GLES3.functional.texture.specification.texsubimage3d_pbo.rgb8ui_2d_array
dEQP-GLES3.functional.texture.specification.texsubimage3d_pbo.rgb8ui_3d
Fixes: 0899bf55
st/mesa: Map MESA_FORMAT_RGB_UNORM8 <-> PIPE_FORMAT_R8G8B8_UNORM
Closes #2118
Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
(cherry picked from commit e41958e344cb4b15d01008140a1ee08817104334)
| -rw-r--r-- | src/gallium/drivers/r600/r600_formats.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/drivers/r600/r600_formats.h b/src/gallium/drivers/r600/r600_formats.h index 9533aaa1378..ad9c51a259a 100644 --- a/src/gallium/drivers/r600/r600_formats.h +++ b/src/gallium/drivers/r600/r600_formats.h @@ -115,6 +115,10 @@ static inline bool r600_is_vertex_format_supported(enum pipe_format format) desc->channel[i].type == UTIL_FORMAT_TYPE_UNSIGNED)) return false; + /* No 8 bit 3 channel formats */ + if (desc->channel[i].size == 8 && desc->nr_channels == 3) + return false; + return true; } |