freedreno/a3xx: there's no r8i/ui rb format, only rg8i/rg8ui
authorIlia Mirkin <imirkin@alum.mit.edu>
Sun, 17 May 2020 01:37:53 +0000 (21:37 -0400)
committerIlia Mirkin <imirkin@alum.mit.edu>
Sun, 17 May 2020 18:39:42 +0000 (14:39 -0400)
This fixes a number of dEQP tests:

  dEQP-GLES3.functional.fbo.blit.conversion.r8*
  dEQP-GLES3.texture.specification.basic_teximage2d.r8*

and others. The reason why this enum showed up in traces for R8 is that
it was an "upgraded" texture to R8G8.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5073>

.gitlab-ci/deqp-freedreno-a307-fails.txt
src/freedreno/registers/a3xx.xml
src/gallium/drivers/freedreno/a3xx/fd3_format.c

index c0e53542372afb95ff749d5665dd08fac60cd112..1fcd57ad1dfe447db7ca051fb75436dea550fbd9 100644 (file)
@@ -42,36 +42,6 @@ dEQP-GLES3.functional.draw.instancing.draw_arrays_instanced_grid_32x32
 dEQP-GLES3.functional.draw.instancing.draw_elements_instanced_grid_100x100
 dEQP-GLES3.functional.draw.instancing.draw_elements_instanced_grid_32x32
 dEQP-GLES3.functional.draw.random.124
-dEQP-GLES3.functional.fbo.blit.conversion.r16i_to_r8i
-dEQP-GLES3.functional.fbo.blit.conversion.r16ui_to_r8ui
-dEQP-GLES3.functional.fbo.blit.conversion.r32i_to_r8i
-dEQP-GLES3.functional.fbo.blit.conversion.r32ui_to_r8ui
-dEQP-GLES3.functional.fbo.blit.conversion.r8i_to_r16i
-dEQP-GLES3.functional.fbo.blit.conversion.r8i_to_r32i
-dEQP-GLES3.functional.fbo.blit.conversion.r8i_to_r8i
-dEQP-GLES3.functional.fbo.blit.conversion.r8i_to_rg16i
-dEQP-GLES3.functional.fbo.blit.conversion.r8i_to_rg32i
-dEQP-GLES3.functional.fbo.blit.conversion.r8i_to_rgba16i
-dEQP-GLES3.functional.fbo.blit.conversion.r8i_to_rgba32i
-dEQP-GLES3.functional.fbo.blit.conversion.r8i_to_rgba8i
-dEQP-GLES3.functional.fbo.blit.conversion.r8ui_to_r16ui
-dEQP-GLES3.functional.fbo.blit.conversion.r8ui_to_r32ui
-dEQP-GLES3.functional.fbo.blit.conversion.r8ui_to_r8ui
-dEQP-GLES3.functional.fbo.blit.conversion.r8ui_to_rg16ui
-dEQP-GLES3.functional.fbo.blit.conversion.r8ui_to_rg32ui
-dEQP-GLES3.functional.fbo.blit.conversion.r8ui_to_rgba16ui
-dEQP-GLES3.functional.fbo.blit.conversion.r8ui_to_rgba32ui
-dEQP-GLES3.functional.fbo.blit.conversion.r8ui_to_rgba8ui
-dEQP-GLES3.functional.fbo.blit.conversion.rg16i_to_r8i
-dEQP-GLES3.functional.fbo.blit.conversion.rg16ui_to_r8ui
-dEQP-GLES3.functional.fbo.blit.conversion.rg32i_to_r8i
-dEQP-GLES3.functional.fbo.blit.conversion.rg32ui_to_r8ui
-dEQP-GLES3.functional.fbo.blit.conversion.rgba16i_to_r8i
-dEQP-GLES3.functional.fbo.blit.conversion.rgba16ui_to_r8ui
-dEQP-GLES3.functional.fbo.blit.conversion.rgba32i_to_r8i
-dEQP-GLES3.functional.fbo.blit.conversion.rgba32ui_to_r8ui
-dEQP-GLES3.functional.fbo.blit.conversion.rgba8i_to_r8i
-dEQP-GLES3.functional.fbo.blit.conversion.rgba8ui_to_r8ui
 dEQP-GLES3.functional.fbo.blit.depth_stencil.depth24_stencil8_basic
 dEQP-GLES3.functional.fbo.blit.depth_stencil.depth24_stencil8_scale
 dEQP-GLES3.functional.fbo.blit.depth_stencil.depth24_stencil8_stencil_only
@@ -90,33 +60,17 @@ dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_y
 dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_x
 dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_y
 dEQP-GLES3.functional.fbo.color.blend.r8_src_over
-dEQP-GLES3.functional.fbo.color.clear.r8i
-dEQP-GLES3.functional.fbo.color.clear.r8ui
-dEQP-GLES3.functional.fbo.color.repeated_clear.blit.rbo.r8i
-dEQP-GLES3.functional.fbo.color.repeated_clear.blit.rbo.r8ui
-dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.r8i
-dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.r8ui
 dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.rgb10_a2ui
-dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.r8i
-dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.r8ui
 dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.rgb10_a2ui
-dEQP-GLES3.functional.fbo.color.tex2darray.r8i
-dEQP-GLES3.functional.fbo.color.tex2darray.r8ui
 dEQP-GLES3.functional.fbo.color.tex2darray.rgb10_a2ui
-dEQP-GLES3.functional.fbo.color.tex2d.r8i
-dEQP-GLES3.functional.fbo.color.tex2d.r8ui
 dEQP-GLES3.functional.fbo.color.tex2d.rgb10_a2ui
-dEQP-GLES3.functional.fbo.color.tex3d.r8i
-dEQP-GLES3.functional.fbo.color.tex3d.r8ui
 dEQP-GLES3.functional.fbo.color.tex3d.rgb10_a2ui
-dEQP-GLES3.functional.fbo.color.texcube.r8i
-dEQP-GLES3.functional.fbo.color.texcube.r8ui
 dEQP-GLES3.functional.fbo.color.texcube.rgb10_a2ui
-dEQP-GLES3.functional.fbo.completeness.renderable.renderbuffer.color0.rg8i
-dEQP-GLES3.functional.fbo.completeness.renderable.renderbuffer.color0.rg8ui
+dEQP-GLES3.functional.fbo.completeness.renderable.renderbuffer.color0.r8i
+dEQP-GLES3.functional.fbo.completeness.renderable.renderbuffer.color0.r8ui
 dEQP-GLES3.functional.fbo.completeness.renderable.renderbuffer.color0.rgb10_a2ui
-dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.rg8i
-dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.rg8ui
+dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.r8i
+dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.r8ui
 dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.rgb10_a2ui
 dEQP-GLES3.functional.fbo.completeness.renderable.texture.depth.rgb10_a2ui
 dEQP-GLES3.functional.fbo.completeness.renderable.texture.stencil.rgb10_a2ui
@@ -135,8 +89,6 @@ dEQP-GLES3.functional.fbo.depth.depth_write_clamp.depth32f_stencil8
 dEQP-GLES3.functional.fbo.depth.depth_write_clamp.depth_component16
 dEQP-GLES3.functional.fbo.depth.depth_write_clamp.depth_component24
 dEQP-GLES3.functional.fbo.depth.depth_write_clamp.depth_component32f
-dEQP-GLES3.functional.fbo.invalidate.format.r8i
-dEQP-GLES3.functional.fbo.invalidate.format.r8ui
 dEQP-GLES3.functional.fbo.invalidate.format.rgb10_a2ui
 dEQP-GLES3.functional.fbo.invalidate.sub.unbind_blit_color
 dEQP-GLES3.functional.fbo.invalidate.sub.unbind_blit_depth
@@ -186,10 +138,6 @@ dEQP-GLES3.functional.fbo.msaa.4_samples.rgba4
 dEQP-GLES3.functional.fbo.msaa.4_samples.rgba8
 dEQP-GLES3.functional.fbo.msaa.4_samples.srgb8_alpha8
 dEQP-GLES3.functional.fbo.msaa.4_samples.stencil_index8
-dEQP-GLES3.functional.fbo.render.recreate_color.rbo_r8i_depth_stencil_rbo_depth24_stencil8
-dEQP-GLES3.functional.fbo.render.recreate_color.rbo_r8ui_depth_stencil_rbo_depth24_stencil8
-dEQP-GLES3.functional.fbo.render.recreate_color.tex2d_r8i_depth_stencil_rbo_depth24_stencil8
-dEQP-GLES3.functional.fbo.render.recreate_color.tex2d_r8ui_depth_stencil_rbo_depth24_stencil8
 dEQP-GLES3.functional.fbo.render.recreate_color.tex2d_rgb10_a2ui_depth_stencil_rbo_depth24_stencil8
 dEQP-GLES3.functional.fbo.render.recreate_depth_stencil.tex2d_rgba8_depth_rbo_depth_component16
 dEQP-GLES3.functional.fbo.render.recreate_depth_stencil.tex2d_rgba8_depth_rbo_depth_component24
@@ -202,10 +150,6 @@ dEQP-GLES3.functional.fbo.render.recreate_depth_stencil.tex2d_rgba8_depth_tex2d_
 dEQP-GLES3.functional.fbo.render.recreate_depth_stencil.tex2d_rgba8_depth_tex2d_depth_component24
 dEQP-GLES3.functional.fbo.render.recreate_depth_stencil.tex2d_rgba8_depth_tex2d_depth_component32f
 dEQP-GLES3.functional.fbo.render.recreate_depth_stencil.tex2d_rgba8_stencil_rbo_stencil_index8
-dEQP-GLES3.functional.fbo.render.resize.rbo_r8i
-dEQP-GLES3.functional.fbo.render.resize.rbo_r8ui
-dEQP-GLES3.functional.fbo.render.resize.tex2d_r8i
-dEQP-GLES3.functional.fbo.render.resize.tex2d_r8ui
 dEQP-GLES3.functional.fbo.render.resize.tex2d_rgb10_a2ui
 dEQP-GLES3.functional.fbo.render.shared_colorbuffer.rbo_r8
 dEQP-GLES3.functional.fbo.render.shared_colorbuffer.rbo_r8_depth_rbo_depth24_stencil8
@@ -213,65 +157,6 @@ dEQP-GLES3.functional.fbo.render.shared_colorbuffer.rbo_r8_depth_stencil_rbo_dep
 dEQP-GLES3.functional.fbo.render.shared_colorbuffer.tex2d_r8
 dEQP-GLES3.functional.fbo.render.shared_colorbuffer.tex2d_r8_depth_rbo_depth24_stencil8
 dEQP-GLES3.functional.fbo.render.shared_colorbuffer.tex2d_r8_depth_stencil_rbo_depth24_stencil8
-dEQP-GLES3.functional.fragment_out.array.int.r8i_highp_int
-dEQP-GLES3.functional.fragment_out.array.int.r8i_highp_ivec2
-dEQP-GLES3.functional.fragment_out.array.int.r8i_highp_ivec3
-dEQP-GLES3.functional.fragment_out.array.int.r8i_highp_ivec4
-dEQP-GLES3.functional.fragment_out.array.int.r8i_lowp_int
-dEQP-GLES3.functional.fragment_out.array.int.r8i_lowp_ivec2
-dEQP-GLES3.functional.fragment_out.array.int.r8i_lowp_ivec3
-dEQP-GLES3.functional.fragment_out.array.int.r8i_lowp_ivec4
-dEQP-GLES3.functional.fragment_out.array.int.r8i_mediump_int
-dEQP-GLES3.functional.fragment_out.array.int.r8i_mediump_ivec2
-dEQP-GLES3.functional.fragment_out.array.int.r8i_mediump_ivec3
-dEQP-GLES3.functional.fragment_out.array.int.r8i_mediump_ivec4
-dEQP-GLES3.functional.fragment_out.array.uint.r8ui_highp_uint
-dEQP-GLES3.functional.fragment_out.array.uint.r8ui_highp_uvec2
-dEQP-GLES3.functional.fragment_out.array.uint.r8ui_highp_uvec3
-dEQP-GLES3.functional.fragment_out.array.uint.r8ui_highp_uvec4
-dEQP-GLES3.functional.fragment_out.array.uint.r8ui_lowp_uint
-dEQP-GLES3.functional.fragment_out.array.uint.r8ui_lowp_uvec2
-dEQP-GLES3.functional.fragment_out.array.uint.r8ui_lowp_uvec3
-dEQP-GLES3.functional.fragment_out.array.uint.r8ui_lowp_uvec4
-dEQP-GLES3.functional.fragment_out.array.uint.r8ui_mediump_uint
-dEQP-GLES3.functional.fragment_out.array.uint.r8ui_mediump_uvec2
-dEQP-GLES3.functional.fragment_out.array.uint.r8ui_mediump_uvec3
-dEQP-GLES3.functional.fragment_out.array.uint.r8ui_mediump_uvec4
-dEQP-GLES3.functional.fragment_out.basic.int.r8i_highp_int
-dEQP-GLES3.functional.fragment_out.basic.int.r8i_highp_ivec2
-dEQP-GLES3.functional.fragment_out.basic.int.r8i_highp_ivec3
-dEQP-GLES3.functional.fragment_out.basic.int.r8i_highp_ivec4
-dEQP-GLES3.functional.fragment_out.basic.int.r8i_lowp_int
-dEQP-GLES3.functional.fragment_out.basic.int.r8i_lowp_ivec2
-dEQP-GLES3.functional.fragment_out.basic.int.r8i_lowp_ivec3
-dEQP-GLES3.functional.fragment_out.basic.int.r8i_lowp_ivec4
-dEQP-GLES3.functional.fragment_out.basic.int.r8i_mediump_int
-dEQP-GLES3.functional.fragment_out.basic.int.r8i_mediump_ivec2
-dEQP-GLES3.functional.fragment_out.basic.int.r8i_mediump_ivec3
-dEQP-GLES3.functional.fragment_out.basic.int.r8i_mediump_ivec4
-dEQP-GLES3.functional.fragment_out.basic.uint.r8ui_highp_uint
-dEQP-GLES3.functional.fragment_out.basic.uint.r8ui_highp_uvec2
-dEQP-GLES3.functional.fragment_out.basic.uint.r8ui_highp_uvec3
-dEQP-GLES3.functional.fragment_out.basic.uint.r8ui_highp_uvec4
-dEQP-GLES3.functional.fragment_out.basic.uint.r8ui_lowp_uint
-dEQP-GLES3.functional.fragment_out.basic.uint.r8ui_lowp_uvec2
-dEQP-GLES3.functional.fragment_out.basic.uint.r8ui_lowp_uvec3
-dEQP-GLES3.functional.fragment_out.basic.uint.r8ui_lowp_uvec4
-dEQP-GLES3.functional.fragment_out.basic.uint.r8ui_mediump_uint
-dEQP-GLES3.functional.fragment_out.basic.uint.r8ui_mediump_uvec2
-dEQP-GLES3.functional.fragment_out.basic.uint.r8ui_mediump_uvec3
-dEQP-GLES3.functional.fragment_out.basic.uint.r8ui_mediump_uvec4
-dEQP-GLES3.functional.fragment_out.random.10
-dEQP-GLES3.functional.fragment_out.random.12
-dEQP-GLES3.functional.fragment_out.random.24
-dEQP-GLES3.functional.fragment_out.random.36
-dEQP-GLES3.functional.fragment_out.random.51
-dEQP-GLES3.functional.fragment_out.random.55
-dEQP-GLES3.functional.fragment_out.random.58
-dEQP-GLES3.functional.fragment_out.random.88
-dEQP-GLES3.functional.fragment_out.random.91
-dEQP-GLES3.functional.fragment_out.random.94
-dEQP-GLES3.functional.fragment_out.random.98
 dEQP-GLES3.functional.lifetime.attach.deleted_input.buffer_vertex_array
 dEQP-GLES3.functional.lifetime.attach.deleted_output.buffer_transform_feedback
 dEQP-GLES3.functional.multisample.fbo_max_samples.proportionality_alpha_to_coverage
@@ -305,10 +190,6 @@ dEQP-GLES3.functional.occlusion_query.scissor_stencil_write_stencil_clear
 dEQP-GLES3.functional.occlusion_query.stencil_clear
 dEQP-GLES3.functional.occlusion_query.stencil_write
 dEQP-GLES3.functional.occlusion_query.stencil_write_stencil_clear
-dEQP-GLES3.functional.pbo.renderbuffer.rg8i_clears
-dEQP-GLES3.functional.pbo.renderbuffer.rg8i_triangles
-dEQP-GLES3.functional.pbo.renderbuffer.rg8ui_clears
-dEQP-GLES3.functional.pbo.renderbuffer.rg8ui_triangles
 dEQP-GLES3.functional.pbo.renderbuffer.rgb10_a2ui_clears
 dEQP-GLES3.functional.pbo.renderbuffer.rgb10_a2ui_triangles
 dEQP-GLES3.functional.polygon_offset.fixed16_displacement_with_units
@@ -608,26 +489,12 @@ dEQP-GLES3.functional.texture.format.sized.3d.rgb10_a2ui_pot
 dEQP-GLES3.functional.texture.format.sized.cube.rgb10_a2ui_npot
 dEQP-GLES3.functional.texture.format.sized.cube.rgb10_a2ui_pot
 dEQP-GLES3.functional.texture.mipmap.cube.max_level.linear_nearest
-dEQP-GLES3.functional.texture.specification.basic_teximage2d.r8i_2d
-dEQP-GLES3.functional.texture.specification.basic_teximage2d.r8i_cube
-dEQP-GLES3.functional.texture.specification.basic_teximage2d.r8ui_2d
-dEQP-GLES3.functional.texture.specification.basic_teximage2d.r8ui_cube
 dEQP-GLES3.functional.texture.specification.basic_teximage2d.rgb10_a2ui_2d
 dEQP-GLES3.functional.texture.specification.basic_teximage2d.rgb10_a2ui_cube
-dEQP-GLES3.functional.texture.specification.basic_teximage3d.r8i_2d_array
-dEQP-GLES3.functional.texture.specification.basic_teximage3d.r8i_3d
-dEQP-GLES3.functional.texture.specification.basic_teximage3d.r8ui_2d_array
-dEQP-GLES3.functional.texture.specification.basic_teximage3d.r8ui_3d
 dEQP-GLES3.functional.texture.specification.basic_teximage3d.rgb10_a2ui_2d_array
 dEQP-GLES3.functional.texture.specification.basic_teximage3d.rgb10_a2ui_3d
-dEQP-GLES3.functional.texture.specification.basic_texsubimage2d.r8i_2d
-dEQP-GLES3.functional.texture.specification.basic_texsubimage2d.r8i_cube
-dEQP-GLES3.functional.texture.specification.basic_texsubimage2d.r8ui_2d
-dEQP-GLES3.functional.texture.specification.basic_texsubimage2d.r8ui_cube
 dEQP-GLES3.functional.texture.specification.basic_texsubimage2d.rgb10_a2ui_2d
 dEQP-GLES3.functional.texture.specification.basic_texsubimage2d.rgb10_a2ui_cube
-dEQP-GLES3.functional.texture.specification.basic_texsubimage3d.r8i_3d
-dEQP-GLES3.functional.texture.specification.basic_texsubimage3d.r8ui_3d
 dEQP-GLES3.functional.texture.specification.basic_texsubimage3d.rgb10_a2ui_3d
 dEQP-GLES3.functional.texture.specification.random_teximage2d.cube_3
 dEQP-GLES3.functional.texture.specification.teximage2d_depth.depth_component32f
@@ -665,7 +532,6 @@ dEQP-GLES3.functional.texture.units.8_units.only_2d.0
 dEQP-GLES3.functional.texture.units.8_units.only_2d.6
 dEQP-GLES3.functional.texture.units.8_units.only_2d_array.0
 dEQP-GLES3.functional.texture.units.8_units.only_2d_array.6
-dEQP-GLES3.functional.texture.units.8_units.only_3d.0
 dEQP-GLES3.functional.texture.units.8_units.only_3d.6
 dEQP-GLES3.functional.texture.units.8_units.only_3d.8
 dEQP-GLES3.functional.texture.units.8_units.only_cube.1
@@ -681,7 +547,6 @@ dEQP-GLES3.functional.texture.units.all_units.only_2d.6
 dEQP-GLES3.functional.texture.units.all_units.only_2d_array.0
 dEQP-GLES3.functional.texture.units.all_units.only_2d_array.5
 dEQP-GLES3.functional.texture.units.all_units.only_2d_array.6
-dEQP-GLES3.functional.texture.units.all_units.only_3d.0
 dEQP-GLES3.functional.texture.units.all_units.only_3d.5
 dEQP-GLES3.functional.texture.units.all_units.only_3d.6
 dEQP-GLES3.functional.texture.units.all_units.only_cube.1
index 3605e3ae40950a941cf2cffd104d022fbc00d78e..6c92d442dad46078df40384627bb9f706df187ed 100644 (file)
@@ -236,8 +236,8 @@ xsi:schemaLocation="http://nouveau.freedesktop.org/ rules-ng.xsd">
        <value name="RB_R8G8B8A8_SINT"      value="0x0b"/>
        <value name="RB_R8G8_UNORM"         value="0x0c"/>
        <value name="RB_R8G8_SNORM"         value="0x0d"/>
-       <value name="RB_R8_UINT"            value="0x0e"/> <!-- also used for R8G8_UINT? -->
-       <value name="RB_R8_SINT"            value="0x0f"/> <!-- also used for R8G8_SINT? -->
+       <value name="RB_R8G8_UINT"          value="0x0e"/>
+       <value name="RB_R8G8_SINT"          value="0x0f"/>
        <value name="RB_R10G10B10A2_UNORM"  value="0x10"/>
        <value name="RB_A2R10G10B10_UNORM"  value="0x11"/>
        <value name="RB_R10G10B10A2_UINT"   value="0x12"/>
index d83738a8989b25b6194a57b3aa93d9765a7a619e..a62223ee8ebda402745747f4990dd0a22d97cea8 100644 (file)
@@ -75,8 +75,8 @@ static struct fd3_format formats[PIPE_FORMAT_COUNT] = {
        /* 8-bit */
        VT(R8_UNORM,   8_UNORM, R8_UNORM, WZYX),
        VT(R8_SNORM,   8_SNORM, NONE,     WZYX),
-       VT(R8_UINT,    8_UINT,  R8_UINT,  WZYX),
-       VT(R8_SINT,    8_SINT,  R8_SINT,  WZYX),
+       VT(R8_UINT,    8_UINT,  NONE,     WZYX),
+       VT(R8_SINT,    8_SINT,  NONE,     WZYX),
        V_(R8_USCALED, 8_UINT,  NONE,     WZYX),
        V_(R8_SSCALED, 8_SINT,  NONE,     WZYX),
 
@@ -111,8 +111,8 @@ static struct fd3_format formats[PIPE_FORMAT_COUNT] = {
 
        VT(R8G8_UNORM,   8_8_UNORM, R8G8_UNORM, WZYX),
        VT(R8G8_SNORM,   8_8_SNORM, R8G8_SNORM, WZYX),
-       VT(R8G8_UINT,    8_8_UINT,  NONE,       WZYX),
-       VT(R8G8_SINT,    8_8_SINT,  NONE,       WZYX),
+       VT(R8G8_UINT,    8_8_UINT,  R8G8_UINT,  WZYX),
+       VT(R8G8_SINT,    8_8_SINT,  R8G8_SINT,  WZYX),
        V_(R8G8_USCALED, 8_8_UINT,  NONE,       WZYX),
        V_(R8G8_SSCALED, 8_8_SINT,  NONE,       WZYX),