OSDN Git Service

r600: Disable eight bit three channel formats
authorGert Wollny <gert.wollny@collabora.com>
Mon, 18 Nov 2019 10:57:00 +0000 (11:57 +0100)
committerDylan Baker <dylan@pnwbakers.com>
Wed, 27 Nov 2019 00:43:04 +0000 (16:43 -0800)
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)

src/gallium/drivers/r600/r600_formats.h

index 9533aaa..ad9c51a 100644 (file)
@@ -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;
 }