diff --git a/src/etnaviv/ci/deqp-etnaviv-gc2000.toml b/src/etnaviv/ci/deqp-etnaviv-gc2000.toml index 3a8cd7cba0c..82194db04fc 100644 --- a/src/etnaviv/ci/deqp-etnaviv-gc2000.toml +++ b/src/etnaviv/ci/deqp-etnaviv-gc2000.toml @@ -8,3 +8,4 @@ deqp_args = [ ] version_check = "GL ES 2.0.*git" renderer_check = "GC2000" +extensions_check = "/install/etnaviv-gc2000-r5108-gles2-extensions.txt" diff --git a/src/etnaviv/ci/deqp-etnaviv-gc3000.toml b/src/etnaviv/ci/deqp-etnaviv-gc3000.toml index f17fe988326..0d096558dbc 100644 --- a/src/etnaviv/ci/deqp-etnaviv-gc3000.toml +++ b/src/etnaviv/ci/deqp-etnaviv-gc3000.toml @@ -8,3 +8,4 @@ deqp_args = [ ] version_check = "GL ES 2.0.*git" renderer_check = "GC3000" +extensions_check = "/install/etnaviv-gc3000-r5450-gles2-extensions.txt" diff --git a/src/etnaviv/ci/deqp-etnaviv-gc7000.toml b/src/etnaviv/ci/deqp-etnaviv-gc7000-r6204.toml similarity index 82% rename from src/etnaviv/ci/deqp-etnaviv-gc7000.toml rename to src/etnaviv/ci/deqp-etnaviv-gc7000-r6204.toml index 0b5bc9615d1..9bca0551339 100644 --- a/src/etnaviv/ci/deqp-etnaviv-gc7000.toml +++ b/src/etnaviv/ci/deqp-etnaviv-gc7000-r6204.toml @@ -8,3 +8,4 @@ deqp_args = [ ] version_check = "GL ES 2.0.*git" renderer_check = "GC7000" +extensions_check = "/install/etnaviv-gc7000-r6204-gles2-extensions.txt" diff --git a/src/etnaviv/ci/deqp-etnaviv-gc7000-r6214.toml b/src/etnaviv/ci/deqp-etnaviv-gc7000-r6214.toml new file mode 100644 index 00000000000..35c22db59f6 --- /dev/null +++ b/src/etnaviv/ci/deqp-etnaviv-gc7000-r6214.toml @@ -0,0 +1,11 @@ +[[deqp]] +deqp = "/deqp-gles/modules/gles2/deqp-gles2" +caselists = ["/deqp-gles/mustpass/gles2-main.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms0", +] +version_check = "GL ES 2.0.*git" +renderer_check = "GC7000" +extensions_check = "/install/etnaviv-gc7000-r6214-gles2-extensions.txt" diff --git a/src/etnaviv/ci/etnaviv-gc2000-r5108-gles2-extensions.txt b/src/etnaviv/ci/etnaviv-gc2000-r5108-gles2-extensions.txt new file mode 100644 index 00000000000..3ff98c0e0f1 --- /dev/null +++ b/src/etnaviv/ci/etnaviv-gc2000-r5108-gles2-extensions.txt @@ -0,0 +1,69 @@ +GL_AMD_performance_monitor +GL_ANGLE_pack_reverse_row_order +GL_ANGLE_texture_compression_dxt3 +GL_ANGLE_texture_compression_dxt5 +GL_APPLE_sync +GL_APPLE_texture_max_level +GL_EXT_blend_minmax +GL_EXT_compressed_ETC1_RGB8_sub_texture +GL_EXT_debug_label +GL_EXT_discard_framebuffer +GL_EXT_draw_buffers +GL_EXT_draw_elements_base_vertex +GL_EXT_frag_depth +GL_EXT_map_buffer_range +GL_EXT_multi_draw_arrays +GL_EXT_occlusion_query_boolean +GL_EXT_read_format_bgra +GL_EXT_separate_shader_objects +GL_EXT_shadow_samplers +GL_EXT_texture_border_clamp +GL_EXT_texture_compression_dxt1 +GL_EXT_texture_compression_s3tc +GL_EXT_texture_compression_s3tc_srgb +GL_EXT_texture_filter_anisotropic +GL_EXT_texture_format_BGRA8888 +GL_EXT_texture_storage +GL_EXT_texture_type_2_10_10_10_REV +GL_EXT_unpack_subimage +GL_INTEL_blackhole_render +GL_KHR_context_flush_control +GL_KHR_debug +GL_KHR_no_error +GL_KHR_parallel_shader_compile +GL_KHR_texture_compression_astc_ldr +GL_KHR_texture_compression_astc_sliced_3d +GL_MESA_bgra +GL_MESA_sampler_objects +GL_NV_conditional_render +GL_NV_draw_buffers +GL_NV_fbo_color_attachments +GL_NV_pack_subimage +GL_NV_pixel_buffer_object +GL_NV_read_buffer +GL_NV_read_depth +GL_NV_read_depth_stencil +GL_NV_read_stencil +GL_NV_texture_barrier +GL_OES_compressed_ETC1_RGB8_texture +GL_OES_depth_texture +GL_OES_depth24 +GL_OES_draw_elements_base_vertex +GL_OES_EGL_image +GL_OES_EGL_image_external +GL_OES_EGL_sync +GL_OES_element_index_uint +GL_OES_fbo_render_mipmap +GL_OES_get_program_binary +GL_OES_mapbuffer +GL_OES_packed_depth_stencil +GL_OES_required_internalformat +GL_OES_rgb8_rgba8 +GL_OES_standard_derivatives +GL_OES_stencil8 +GL_OES_surfaceless_context +GL_OES_texture_3D +GL_OES_texture_border_clamp +GL_OES_texture_npot +GL_OES_vertex_array_object +GL_OES_vertex_half_float diff --git a/src/etnaviv/ci/etnaviv-gc3000-r5450-gles2-extensions.txt b/src/etnaviv/ci/etnaviv-gc3000-r5450-gles2-extensions.txt new file mode 100644 index 00000000000..7e36c6d8a72 --- /dev/null +++ b/src/etnaviv/ci/etnaviv-gc3000-r5450-gles2-extensions.txt @@ -0,0 +1,74 @@ +GL_AMD_performance_monitor +GL_ANGLE_pack_reverse_row_order +GL_ANGLE_texture_compression_dxt3 +GL_ANGLE_texture_compression_dxt5 +GL_APPLE_sync +GL_APPLE_texture_max_level +GL_EXT_blend_minmax +GL_EXT_color_buffer_half_float +GL_EXT_compressed_ETC1_RGB8_sub_texture +GL_EXT_debug_label +GL_EXT_discard_framebuffer +GL_EXT_draw_buffers +GL_EXT_draw_elements_base_vertex +GL_EXT_draw_instanced +GL_EXT_frag_depth +GL_EXT_instanced_arrays +GL_EXT_map_buffer_range +GL_EXT_multi_draw_arrays +GL_EXT_occlusion_query_boolean +GL_EXT_read_format_bgra +GL_EXT_separate_shader_objects +GL_EXT_shadow_samplers +GL_EXT_texture_border_clamp +GL_EXT_texture_compression_dxt1 +GL_EXT_texture_compression_s3tc +GL_EXT_texture_compression_s3tc_srgb +GL_EXT_texture_filter_anisotropic +GL_EXT_texture_format_BGRA8888 +GL_EXT_texture_storage +GL_EXT_texture_type_2_10_10_10_REV +GL_EXT_unpack_subimage +GL_INTEL_blackhole_render +GL_KHR_context_flush_control +GL_KHR_debug +GL_KHR_no_error +GL_KHR_parallel_shader_compile +GL_KHR_texture_compression_astc_ldr +GL_KHR_texture_compression_astc_sliced_3d +GL_MESA_bgra +GL_MESA_sampler_objects +GL_NV_conditional_render +GL_NV_draw_buffers +GL_NV_fbo_color_attachments +GL_NV_pack_subimage +GL_NV_pixel_buffer_object +GL_NV_read_buffer +GL_NV_read_depth +GL_NV_read_depth_stencil +GL_NV_read_stencil +GL_NV_texture_barrier +GL_OES_compressed_ETC1_RGB8_texture +GL_OES_depth_texture +GL_OES_depth24 +GL_OES_draw_elements_base_vertex +GL_OES_EGL_image +GL_OES_EGL_image_external +GL_OES_EGL_sync +GL_OES_element_index_uint +GL_OES_fbo_render_mipmap +GL_OES_get_program_binary +GL_OES_mapbuffer +GL_OES_packed_depth_stencil +GL_OES_required_internalformat +GL_OES_rgb8_rgba8 +GL_OES_standard_derivatives +GL_OES_stencil8 +GL_OES_surfaceless_context +GL_OES_texture_3D +GL_OES_texture_border_clamp +GL_OES_texture_half_float +GL_OES_texture_half_float_linear +GL_OES_texture_npot +GL_OES_vertex_array_object +GL_OES_vertex_half_float diff --git a/src/etnaviv/ci/etnaviv-gc7000-r6204-gles2-extensions.txt b/src/etnaviv/ci/etnaviv-gc7000-r6204-gles2-extensions.txt new file mode 100644 index 00000000000..02eb27b9f97 --- /dev/null +++ b/src/etnaviv/ci/etnaviv-gc7000-r6204-gles2-extensions.txt @@ -0,0 +1,76 @@ +GL_AMD_performance_monitor +GL_ANGLE_pack_reverse_row_order +GL_ANGLE_texture_compression_dxt3 +GL_ANGLE_texture_compression_dxt5 +GL_APPLE_sync +GL_APPLE_texture_max_level +GL_EXT_blend_minmax +GL_EXT_color_buffer_half_float +GL_EXT_compressed_ETC1_RGB8_sub_texture +GL_EXT_debug_label +GL_EXT_discard_framebuffer +GL_EXT_draw_buffers +GL_EXT_draw_elements_base_vertex +GL_EXT_draw_instanced +GL_EXT_frag_depth +GL_EXT_instanced_arrays +GL_EXT_map_buffer_range +GL_EXT_multi_draw_arrays +GL_EXT_occlusion_query_boolean +GL_EXT_read_format_bgra +GL_EXT_separate_shader_objects +GL_EXT_shadow_samplers +GL_EXT_sRGB +GL_EXT_texture_border_clamp +GL_EXT_texture_compression_dxt1 +GL_EXT_texture_compression_s3tc +GL_EXT_texture_compression_s3tc_srgb +GL_EXT_texture_format_BGRA8888 +GL_EXT_texture_rg +GL_EXT_texture_storage +GL_EXT_texture_type_2_10_10_10_REV +GL_EXT_unpack_subimage +GL_INTEL_blackhole_render +GL_KHR_context_flush_control +GL_KHR_debug +GL_KHR_no_error +GL_KHR_parallel_shader_compile +GL_KHR_texture_compression_astc_ldr +GL_KHR_texture_compression_astc_sliced_3d +GL_MESA_bgra +GL_MESA_sampler_objects +GL_NV_conditional_render +GL_NV_draw_buffers +GL_NV_fbo_color_attachments +GL_NV_generate_mipmap_sRGB +GL_NV_pack_subimage +GL_NV_pixel_buffer_object +GL_NV_read_buffer +GL_NV_read_depth +GL_NV_read_depth_stencil +GL_NV_read_stencil +GL_NV_texture_barrier +GL_OES_compressed_ETC1_RGB8_texture +GL_OES_depth_texture +GL_OES_depth24 +GL_OES_draw_elements_base_vertex +GL_OES_EGL_image +GL_OES_EGL_image_external +GL_OES_EGL_sync +GL_OES_element_index_uint +GL_OES_fbo_render_mipmap +GL_OES_get_program_binary +GL_OES_mapbuffer +GL_OES_packed_depth_stencil +GL_OES_required_internalformat +GL_OES_rgb8_rgba8 +GL_OES_standard_derivatives +GL_OES_stencil8 +GL_OES_surfaceless_context +GL_OES_texture_3D +GL_OES_texture_border_clamp +GL_OES_texture_half_float +GL_OES_texture_half_float_linear +GL_OES_texture_npot +GL_OES_vertex_array_object +GL_OES_vertex_half_float diff --git a/src/etnaviv/ci/etnaviv-gc7000-r6214-gles2-extensions.txt b/src/etnaviv/ci/etnaviv-gc7000-r6214-gles2-extensions.txt new file mode 100644 index 00000000000..6af3c7bdc09 --- /dev/null +++ b/src/etnaviv/ci/etnaviv-gc7000-r6214-gles2-extensions.txt @@ -0,0 +1,77 @@ +GL_AMD_performance_monitor +GL_ANGLE_pack_reverse_row_order +GL_ANGLE_texture_compression_dxt3 +GL_ANGLE_texture_compression_dxt5 +GL_APPLE_sync +GL_APPLE_texture_max_level +GL_EXT_blend_minmax +GL_EXT_color_buffer_half_float +GL_EXT_compressed_ETC1_RGB8_sub_texture +GL_EXT_debug_label +GL_EXT_discard_framebuffer +GL_EXT_draw_buffers +GL_EXT_draw_elements_base_vertex +GL_EXT_draw_instanced +GL_EXT_frag_depth +GL_EXT_instanced_arrays +GL_EXT_map_buffer_range +GL_EXT_multi_draw_arrays +GL_EXT_occlusion_query_boolean +GL_EXT_read_format_bgra +GL_EXT_separate_shader_objects +GL_EXT_shadow_samplers +GL_EXT_sRGB +GL_EXT_texture_border_clamp +GL_EXT_texture_compression_dxt1 +GL_EXT_texture_compression_s3tc +GL_EXT_texture_compression_s3tc_srgb +GL_EXT_texture_filter_anisotropic +GL_EXT_texture_format_BGRA8888 +GL_EXT_texture_rg +GL_EXT_texture_storage +GL_EXT_texture_type_2_10_10_10_REV +GL_EXT_unpack_subimage +GL_INTEL_blackhole_render +GL_KHR_context_flush_control +GL_KHR_debug +GL_KHR_no_error +GL_KHR_parallel_shader_compile +GL_KHR_texture_compression_astc_ldr +GL_KHR_texture_compression_astc_sliced_3d +GL_MESA_bgra +GL_MESA_sampler_objects +GL_NV_conditional_render +GL_NV_draw_buffers +GL_NV_fbo_color_attachments +GL_NV_generate_mipmap_sRGB +GL_NV_pack_subimage +GL_NV_pixel_buffer_object +GL_NV_read_buffer +GL_NV_read_depth +GL_NV_read_depth_stencil +GL_NV_read_stencil +GL_NV_texture_barrier +GL_OES_compressed_ETC1_RGB8_texture +GL_OES_depth_texture +GL_OES_depth24 +GL_OES_draw_elements_base_vertex +GL_OES_EGL_image +GL_OES_EGL_image_external +GL_OES_EGL_sync +GL_OES_element_index_uint +GL_OES_fbo_render_mipmap +GL_OES_get_program_binary +GL_OES_mapbuffer +GL_OES_packed_depth_stencil +GL_OES_required_internalformat +GL_OES_rgb8_rgba8 +GL_OES_standard_derivatives +GL_OES_stencil8 +GL_OES_surfaceless_context +GL_OES_texture_3D +GL_OES_texture_border_clamp +GL_OES_texture_half_float +GL_OES_texture_half_float_linear +GL_OES_texture_npot +GL_OES_vertex_array_object +GL_OES_vertex_half_float diff --git a/src/etnaviv/ci/gitlab-ci-inc.yml b/src/etnaviv/ci/gitlab-ci-inc.yml index b307ae2bbf5..1d2cbe44937 100644 --- a/src/etnaviv/ci/gitlab-ci-inc.yml +++ b/src/etnaviv/ci/gitlab-ci-inc.yml @@ -10,6 +10,7 @@ - src/etnaviv/ci/deqp-$DEQP_SUITE.toml - src/etnaviv/ci/$GPU_VERSION-fails.txt - src/etnaviv/ci/$GPU_VERSION-flakes.txt + - src/etnaviv/ci/$GPU_VERSION-gles2-extensions.txt - src/etnaviv/ci/$GPU_VERSION-skips.txt - src/etnaviv/drm/**/* - src/etnaviv/drm-shim/**/* diff --git a/src/etnaviv/ci/gitlab-ci.yml b/src/etnaviv/ci/gitlab-ci.yml index ec2b221120a..99af90b5eb5 100644 --- a/src/etnaviv/ci/gitlab-ci.yml +++ b/src/etnaviv/ci/gitlab-ci.yml @@ -54,7 +54,7 @@ gc7000-imx8mq-gles2: - .austriancoder-imx8mq-nitrogen:arm64 - .etnaviv-manual-rules variables: - DEQP_SUITE: etnaviv-gc7000 + DEQP_SUITE: etnaviv-gc7000-r6214 FLAKES_CHANNEL: "" CI_TRON_TIMEOUT__OVERALL__MINUTES: 28 timeout: 30m @@ -65,5 +65,5 @@ gc7000-imx8mp-gles2: - .pengutronix-imx8mp-mba8mpxl:arm64 - .etnaviv-manual-rules variables: - DEQP_SUITE: etnaviv-gc7000 + DEQP_SUITE: etnaviv-gc7000-r6204 timeout: 30m