From 6bfcc5fdc662d5bbe9f7caa71394aef0ae5337d9 Mon Sep 17 00:00:00 2001 From: Windsome Zeng Date: Tue, 16 Aug 2022 17:30:53 +0800 Subject: [PATCH] [mesa3d] Delete or rename patch files according to DDK 1.17. --- ...hen-making-a-context-current-withou.patch} | 0 ...akeCurrent-for-the-case-where-nothi.patch} | 0 ...r_pixel_local_storage2-entry-points.patch} | 0 ...framebuffer_downsample-entry-points.patch} | 0 ... 0011-GL_OVR_multiview-entry-points.patch} | 0 ...view_multisampled_render_to_texture.patch} | 0 ...ll-wayland-drm.xml-to-the-configure.patch} | 0 ...er-sharing-in-the-kms_swrast-driver.patch} | 0 ...add-support-for-RGB565-back-buffers.patch} | 0 ...dri3-fix-segfault-in-eglCopyBuffers.patch} | 0 ...-call-eglReleaseThread-on-thread-te.patch} | 0 ...0018-egl-add-Tizen-platform-support.patch} | 0 ...-for-EGL_TIZEN_image_native_surface.patch} | 0 ...d-post-maximum-damage-when-blitting.patch} | 0 ...-flush-the-drawable-before-blitting.patch} | 0 ...an-internal-_EGLImage-for-each-tbm-.patch} | 0 ...upported-API-in-driCreateNewContext.patch} | 0 ...t.patch => 0024-gbm-add-gbm_bo_blit.patch} | 0 ...ssert-if-DRI-context-creation-fails.patch} | 0 ...026-egl-wayland-add-pbuffer-support.patch} | 0 ...-DRI-driver-handling-of-swap-preser.patch} | 0 ...-eglBindAPI-workaround-for-dEQP-bug.patch} | 0 ...XT_multi_draw_indirect-entry-points.patch} | 0 ...-dri-add-support-for-YUV-DRI-config.patch} | 0 ...egl-add-support-for-EXT_yuv_surface.patch} | 0 ..._DRI_IMAGE_COMPONENTS-define-for-EG.patch} | 0 ...land-expose-EXT_yuv_surface-support.patch} | 0 ...izen-expose-EXT_yuv_surface-support.patch} | 0 ...> 0035-gbm-add-some-new-GBM-formats.patch} | 0 ...patch => 0036-egl-add-null-platform.patch} | 0 ... 0037-egl-add-config-debug-printout.patch} | 0 ...support-for-EXT_image_gl_colorspace.patch} | 0 ...meson-force-C-2011-for-thread_local.patch} | 0 ...ort-for-swap-intervals-other-than-1.patch} | 0 ...-support-for-explicit-synchronisati.patch} | 0 ...dri2-add-support-for-image-modifiers.patch | 372 ------------------ ...y-the-supported-ES2-context-version.patch} | 0 ...allow-libGL-to-be-built-without-GLX.patch} | 0 ...process-non-resized-window-movement.patch} | 0 ...framebuffer_object-from-ARB-version.patch} | 0 ...ort-for-async-flip-with-front-buffe.patch} | 0 ...tch => 0048-gbm-add-pbuffer-support.patch} | 0 ...null-expose-EXT_yuv_surface-support.patch} | 0 ...fer-config-attribs-to-0-for-non-pbu.patch} | 0 44 files changed, 372 deletions(-) rename package/mesa3d/{0008-egl-Be-stricter-when-making-a-context-current-withou.patch => 0007-egl-Be-stricter-when-making-a-context-current-withou.patch} (100%) rename package/mesa3d/{0009-egl-optimise-eglMakeCurrent-for-the-case-where-nothi.patch => 0008-egl-optimise-eglMakeCurrent-for-the-case-where-nothi.patch} (100%) rename package/mesa3d/{0010-GL_EXT_shader_pixel_local_storage2-entry-points.patch => 0009-GL_EXT_shader_pixel_local_storage2-entry-points.patch} (100%) rename package/mesa3d/{0011-GL_IMG_framebuffer_downsample-entry-points.patch => 0010-GL_IMG_framebuffer_downsample-entry-points.patch} (100%) rename package/mesa3d/{0012-GL_OVR_multiview-entry-points.patch => 0011-GL_OVR_multiview-entry-points.patch} (100%) rename package/mesa3d/{0013-Add-OVR_multiview_multisampled_render_to_texture.patch => 0012-Add-OVR_multiview_multisampled_render_to_texture.patch} (100%) rename package/mesa3d/{0014-wayland-drm-install-wayland-drm.xml-to-the-configure.patch => 0013-wayland-drm-install-wayland-drm.xml-to-the-configure.patch} (100%) rename package/mesa3d/{0015-Enable-buffer-sharing-in-the-kms_swrast-driver.patch => 0014-Enable-buffer-sharing-in-the-kms_swrast-driver.patch} (100%) rename package/mesa3d/{0016-egl-wayland-add-support-for-RGB565-back-buffers.patch => 0015-egl-wayland-add-support-for-RGB565-back-buffers.patch} (100%) rename package/mesa3d/{0017-egl-dri3-fix-segfault-in-eglCopyBuffers.patch => 0016-egl-dri3-fix-segfault-in-eglCopyBuffers.patch} (100%) rename package/mesa3d/{0018-egl-automatically-call-eglReleaseThread-on-thread-te.patch => 0017-egl-automatically-call-eglReleaseThread-on-thread-te.patch} (100%) rename package/mesa3d/{0019-egl-add-Tizen-platform-support.patch => 0018-egl-add-Tizen-platform-support.patch} (100%) rename package/mesa3d/{0020-egl-add-support-for-EGL_TIZEN_image_native_surface.patch => 0019-egl-add-support-for-EGL_TIZEN_image_native_surface.patch} (100%) rename package/mesa3d/{0021-egl-wayland-post-maximum-damage-when-blitting.patch => 0020-egl-wayland-post-maximum-damage-when-blitting.patch} (100%) rename package/mesa3d/{0022-egl-wayland-flush-the-drawable-before-blitting.patch => 0021-egl-wayland-flush-the-drawable-before-blitting.patch} (100%) rename package/mesa3d/{0023-egl-tizen-create-an-internal-_EGLImage-for-each-tbm-.patch => 0022-egl-tizen-create-an-internal-_EGLImage-for-each-tbm-.patch} (100%) rename package/mesa3d/{0024-dri-use-a-supported-API-in-driCreateNewContext.patch => 0023-dri-use-a-supported-API-in-driCreateNewContext.patch} (100%) rename package/mesa3d/{0025-gbm-add-gbm_bo_blit.patch => 0024-gbm-add-gbm_bo_blit.patch} (100%) rename package/mesa3d/{0026-gbm-don-t-assert-if-DRI-context-creation-fails.patch => 0025-gbm-don-t-assert-if-DRI-context-creation-fails.patch} (100%) rename package/mesa3d/{0027-egl-wayland-add-pbuffer-support.patch => 0026-egl-wayland-add-pbuffer-support.patch} (100%) rename package/mesa3d/{0028-egl-tizen-support-DRI-driver-handling-of-swap-preser.patch => 0027-egl-tizen-support-DRI-driver-handling-of-swap-preser.patch} (100%) rename package/mesa3d/{0029-egl-eglBindAPI-workaround-for-dEQP-bug.patch => 0028-egl-eglBindAPI-workaround-for-dEQP-bug.patch} (100%) rename package/mesa3d/{0030-GL_EXT_multi_draw_indirect-entry-points.patch => 0029-GL_EXT_multi_draw_indirect-entry-points.patch} (100%) rename package/mesa3d/{0031-dri-add-support-for-YUV-DRI-config.patch => 0030-dri-add-support-for-YUV-DRI-config.patch} (100%) rename package/mesa3d/{0032-egl-add-support-for-EXT_yuv_surface.patch => 0031-egl-add-support-for-EXT_yuv_surface.patch} (100%) rename package/mesa3d/{0033-dri-add-missing-__DRI_IMAGE_COMPONENTS-define-for-EG.patch => 0032-dri-add-missing-__DRI_IMAGE_COMPONENTS-define-for-EG.patch} (100%) rename package/mesa3d/{0034-egl-wayland-expose-EXT_yuv_surface-support.patch => 0033-egl-wayland-expose-EXT_yuv_surface-support.patch} (100%) rename package/mesa3d/{0035-egl-tizen-expose-EXT_yuv_surface-support.patch => 0034-egl-tizen-expose-EXT_yuv_surface-support.patch} (100%) rename package/mesa3d/{0036-gbm-add-some-new-GBM-formats.patch => 0035-gbm-add-some-new-GBM-formats.patch} (100%) rename package/mesa3d/{0037-egl-add-null-platform.patch => 0036-egl-add-null-platform.patch} (100%) rename package/mesa3d/{0038-egl-add-config-debug-printout.patch => 0037-egl-add-config-debug-printout.patch} (100%) rename package/mesa3d/{0039-egl-add-support-for-EXT_image_gl_colorspace.patch => 0038-egl-add-support-for-EXT_image_gl_colorspace.patch} (100%) rename package/mesa3d/{0040-meson-force-C-2011-for-thread_local.patch => 0039-meson-force-C-2011-for-thread_local.patch} (100%) rename package/mesa3d/{0041-dri2-add-support-for-swap-intervals-other-than-1.patch => 0040-dri2-add-support-for-swap-intervals-other-than-1.patch} (100%) rename package/mesa3d/{0042-null_platform-add-support-for-explicit-synchronisati.patch => 0041-null_platform-add-support-for-explicit-synchronisati.patch} (100%) delete mode 100644 package/mesa3d/0043-dri2-add-support-for-image-modifiers.patch rename package/mesa3d/{0044-egl-query-the-supported-ES2-context-version.patch => 0043-egl-query-the-supported-ES2-context-version.patch} (100%) rename package/mesa3d/{0045-meson-allow-libGL-to-be-built-without-GLX.patch => 0044-meson-allow-libGL-to-be-built-without-GLX.patch} (100%) rename package/mesa3d/{0046-egl-wayland-process-non-resized-window-movement.patch => 0045-egl-wayland-process-non-resized-window-movement.patch} (100%) rename package/mesa3d/{0047-Separate-EXT_framebuffer_object-from-ARB-version.patch => 0046-Separate-EXT_framebuffer_object-from-ARB-version.patch} (100%) rename package/mesa3d/{0048-egl-null-add-support-for-async-flip-with-front-buffe.patch => 0047-egl-null-add-support-for-async-flip-with-front-buffe.patch} (100%) rename package/mesa3d/{0049-gbm-add-pbuffer-support.patch => 0048-gbm-add-pbuffer-support.patch} (100%) rename package/mesa3d/{0050-egl-null-expose-EXT_yuv_surface-support.patch => 0049-egl-null-expose-EXT_yuv_surface-support.patch} (100%) rename package/mesa3d/{0007-egl_dri2-set-pbuffer-config-attribs-to-0-for-non-pbu.patch => 0067-egl_dri2-set-pbuffer-config-attribs-to-0-for-non-pbu.patch} (100%) diff --git a/package/mesa3d/0008-egl-Be-stricter-when-making-a-context-current-withou.patch b/package/mesa3d/0007-egl-Be-stricter-when-making-a-context-current-withou.patch similarity index 100% rename from package/mesa3d/0008-egl-Be-stricter-when-making-a-context-current-withou.patch rename to package/mesa3d/0007-egl-Be-stricter-when-making-a-context-current-withou.patch diff --git a/package/mesa3d/0009-egl-optimise-eglMakeCurrent-for-the-case-where-nothi.patch b/package/mesa3d/0008-egl-optimise-eglMakeCurrent-for-the-case-where-nothi.patch similarity index 100% rename from package/mesa3d/0009-egl-optimise-eglMakeCurrent-for-the-case-where-nothi.patch rename to package/mesa3d/0008-egl-optimise-eglMakeCurrent-for-the-case-where-nothi.patch diff --git a/package/mesa3d/0010-GL_EXT_shader_pixel_local_storage2-entry-points.patch b/package/mesa3d/0009-GL_EXT_shader_pixel_local_storage2-entry-points.patch similarity index 100% rename from package/mesa3d/0010-GL_EXT_shader_pixel_local_storage2-entry-points.patch rename to package/mesa3d/0009-GL_EXT_shader_pixel_local_storage2-entry-points.patch diff --git a/package/mesa3d/0011-GL_IMG_framebuffer_downsample-entry-points.patch b/package/mesa3d/0010-GL_IMG_framebuffer_downsample-entry-points.patch similarity index 100% rename from package/mesa3d/0011-GL_IMG_framebuffer_downsample-entry-points.patch rename to package/mesa3d/0010-GL_IMG_framebuffer_downsample-entry-points.patch diff --git a/package/mesa3d/0012-GL_OVR_multiview-entry-points.patch b/package/mesa3d/0011-GL_OVR_multiview-entry-points.patch similarity index 100% rename from package/mesa3d/0012-GL_OVR_multiview-entry-points.patch rename to package/mesa3d/0011-GL_OVR_multiview-entry-points.patch diff --git a/package/mesa3d/0013-Add-OVR_multiview_multisampled_render_to_texture.patch b/package/mesa3d/0012-Add-OVR_multiview_multisampled_render_to_texture.patch similarity index 100% rename from package/mesa3d/0013-Add-OVR_multiview_multisampled_render_to_texture.patch rename to package/mesa3d/0012-Add-OVR_multiview_multisampled_render_to_texture.patch diff --git a/package/mesa3d/0014-wayland-drm-install-wayland-drm.xml-to-the-configure.patch b/package/mesa3d/0013-wayland-drm-install-wayland-drm.xml-to-the-configure.patch similarity index 100% rename from package/mesa3d/0014-wayland-drm-install-wayland-drm.xml-to-the-configure.patch rename to package/mesa3d/0013-wayland-drm-install-wayland-drm.xml-to-the-configure.patch diff --git a/package/mesa3d/0015-Enable-buffer-sharing-in-the-kms_swrast-driver.patch b/package/mesa3d/0014-Enable-buffer-sharing-in-the-kms_swrast-driver.patch similarity index 100% rename from package/mesa3d/0015-Enable-buffer-sharing-in-the-kms_swrast-driver.patch rename to package/mesa3d/0014-Enable-buffer-sharing-in-the-kms_swrast-driver.patch diff --git a/package/mesa3d/0016-egl-wayland-add-support-for-RGB565-back-buffers.patch b/package/mesa3d/0015-egl-wayland-add-support-for-RGB565-back-buffers.patch similarity index 100% rename from package/mesa3d/0016-egl-wayland-add-support-for-RGB565-back-buffers.patch rename to package/mesa3d/0015-egl-wayland-add-support-for-RGB565-back-buffers.patch diff --git a/package/mesa3d/0017-egl-dri3-fix-segfault-in-eglCopyBuffers.patch b/package/mesa3d/0016-egl-dri3-fix-segfault-in-eglCopyBuffers.patch similarity index 100% rename from package/mesa3d/0017-egl-dri3-fix-segfault-in-eglCopyBuffers.patch rename to package/mesa3d/0016-egl-dri3-fix-segfault-in-eglCopyBuffers.patch diff --git a/package/mesa3d/0018-egl-automatically-call-eglReleaseThread-on-thread-te.patch b/package/mesa3d/0017-egl-automatically-call-eglReleaseThread-on-thread-te.patch similarity index 100% rename from package/mesa3d/0018-egl-automatically-call-eglReleaseThread-on-thread-te.patch rename to package/mesa3d/0017-egl-automatically-call-eglReleaseThread-on-thread-te.patch diff --git a/package/mesa3d/0019-egl-add-Tizen-platform-support.patch b/package/mesa3d/0018-egl-add-Tizen-platform-support.patch similarity index 100% rename from package/mesa3d/0019-egl-add-Tizen-platform-support.patch rename to package/mesa3d/0018-egl-add-Tizen-platform-support.patch diff --git a/package/mesa3d/0020-egl-add-support-for-EGL_TIZEN_image_native_surface.patch b/package/mesa3d/0019-egl-add-support-for-EGL_TIZEN_image_native_surface.patch similarity index 100% rename from package/mesa3d/0020-egl-add-support-for-EGL_TIZEN_image_native_surface.patch rename to package/mesa3d/0019-egl-add-support-for-EGL_TIZEN_image_native_surface.patch diff --git a/package/mesa3d/0021-egl-wayland-post-maximum-damage-when-blitting.patch b/package/mesa3d/0020-egl-wayland-post-maximum-damage-when-blitting.patch similarity index 100% rename from package/mesa3d/0021-egl-wayland-post-maximum-damage-when-blitting.patch rename to package/mesa3d/0020-egl-wayland-post-maximum-damage-when-blitting.patch diff --git a/package/mesa3d/0022-egl-wayland-flush-the-drawable-before-blitting.patch b/package/mesa3d/0021-egl-wayland-flush-the-drawable-before-blitting.patch similarity index 100% rename from package/mesa3d/0022-egl-wayland-flush-the-drawable-before-blitting.patch rename to package/mesa3d/0021-egl-wayland-flush-the-drawable-before-blitting.patch diff --git a/package/mesa3d/0023-egl-tizen-create-an-internal-_EGLImage-for-each-tbm-.patch b/package/mesa3d/0022-egl-tizen-create-an-internal-_EGLImage-for-each-tbm-.patch similarity index 100% rename from package/mesa3d/0023-egl-tizen-create-an-internal-_EGLImage-for-each-tbm-.patch rename to package/mesa3d/0022-egl-tizen-create-an-internal-_EGLImage-for-each-tbm-.patch diff --git a/package/mesa3d/0024-dri-use-a-supported-API-in-driCreateNewContext.patch b/package/mesa3d/0023-dri-use-a-supported-API-in-driCreateNewContext.patch similarity index 100% rename from package/mesa3d/0024-dri-use-a-supported-API-in-driCreateNewContext.patch rename to package/mesa3d/0023-dri-use-a-supported-API-in-driCreateNewContext.patch diff --git a/package/mesa3d/0025-gbm-add-gbm_bo_blit.patch b/package/mesa3d/0024-gbm-add-gbm_bo_blit.patch similarity index 100% rename from package/mesa3d/0025-gbm-add-gbm_bo_blit.patch rename to package/mesa3d/0024-gbm-add-gbm_bo_blit.patch diff --git a/package/mesa3d/0026-gbm-don-t-assert-if-DRI-context-creation-fails.patch b/package/mesa3d/0025-gbm-don-t-assert-if-DRI-context-creation-fails.patch similarity index 100% rename from package/mesa3d/0026-gbm-don-t-assert-if-DRI-context-creation-fails.patch rename to package/mesa3d/0025-gbm-don-t-assert-if-DRI-context-creation-fails.patch diff --git a/package/mesa3d/0027-egl-wayland-add-pbuffer-support.patch b/package/mesa3d/0026-egl-wayland-add-pbuffer-support.patch similarity index 100% rename from package/mesa3d/0027-egl-wayland-add-pbuffer-support.patch rename to package/mesa3d/0026-egl-wayland-add-pbuffer-support.patch diff --git a/package/mesa3d/0028-egl-tizen-support-DRI-driver-handling-of-swap-preser.patch b/package/mesa3d/0027-egl-tizen-support-DRI-driver-handling-of-swap-preser.patch similarity index 100% rename from package/mesa3d/0028-egl-tizen-support-DRI-driver-handling-of-swap-preser.patch rename to package/mesa3d/0027-egl-tizen-support-DRI-driver-handling-of-swap-preser.patch diff --git a/package/mesa3d/0029-egl-eglBindAPI-workaround-for-dEQP-bug.patch b/package/mesa3d/0028-egl-eglBindAPI-workaround-for-dEQP-bug.patch similarity index 100% rename from package/mesa3d/0029-egl-eglBindAPI-workaround-for-dEQP-bug.patch rename to package/mesa3d/0028-egl-eglBindAPI-workaround-for-dEQP-bug.patch diff --git a/package/mesa3d/0030-GL_EXT_multi_draw_indirect-entry-points.patch b/package/mesa3d/0029-GL_EXT_multi_draw_indirect-entry-points.patch similarity index 100% rename from package/mesa3d/0030-GL_EXT_multi_draw_indirect-entry-points.patch rename to package/mesa3d/0029-GL_EXT_multi_draw_indirect-entry-points.patch diff --git a/package/mesa3d/0031-dri-add-support-for-YUV-DRI-config.patch b/package/mesa3d/0030-dri-add-support-for-YUV-DRI-config.patch similarity index 100% rename from package/mesa3d/0031-dri-add-support-for-YUV-DRI-config.patch rename to package/mesa3d/0030-dri-add-support-for-YUV-DRI-config.patch diff --git a/package/mesa3d/0032-egl-add-support-for-EXT_yuv_surface.patch b/package/mesa3d/0031-egl-add-support-for-EXT_yuv_surface.patch similarity index 100% rename from package/mesa3d/0032-egl-add-support-for-EXT_yuv_surface.patch rename to package/mesa3d/0031-egl-add-support-for-EXT_yuv_surface.patch diff --git a/package/mesa3d/0033-dri-add-missing-__DRI_IMAGE_COMPONENTS-define-for-EG.patch b/package/mesa3d/0032-dri-add-missing-__DRI_IMAGE_COMPONENTS-define-for-EG.patch similarity index 100% rename from package/mesa3d/0033-dri-add-missing-__DRI_IMAGE_COMPONENTS-define-for-EG.patch rename to package/mesa3d/0032-dri-add-missing-__DRI_IMAGE_COMPONENTS-define-for-EG.patch diff --git a/package/mesa3d/0034-egl-wayland-expose-EXT_yuv_surface-support.patch b/package/mesa3d/0033-egl-wayland-expose-EXT_yuv_surface-support.patch similarity index 100% rename from package/mesa3d/0034-egl-wayland-expose-EXT_yuv_surface-support.patch rename to package/mesa3d/0033-egl-wayland-expose-EXT_yuv_surface-support.patch diff --git a/package/mesa3d/0035-egl-tizen-expose-EXT_yuv_surface-support.patch b/package/mesa3d/0034-egl-tizen-expose-EXT_yuv_surface-support.patch similarity index 100% rename from package/mesa3d/0035-egl-tizen-expose-EXT_yuv_surface-support.patch rename to package/mesa3d/0034-egl-tizen-expose-EXT_yuv_surface-support.patch diff --git a/package/mesa3d/0036-gbm-add-some-new-GBM-formats.patch b/package/mesa3d/0035-gbm-add-some-new-GBM-formats.patch similarity index 100% rename from package/mesa3d/0036-gbm-add-some-new-GBM-formats.patch rename to package/mesa3d/0035-gbm-add-some-new-GBM-formats.patch diff --git a/package/mesa3d/0037-egl-add-null-platform.patch b/package/mesa3d/0036-egl-add-null-platform.patch similarity index 100% rename from package/mesa3d/0037-egl-add-null-platform.patch rename to package/mesa3d/0036-egl-add-null-platform.patch diff --git a/package/mesa3d/0038-egl-add-config-debug-printout.patch b/package/mesa3d/0037-egl-add-config-debug-printout.patch similarity index 100% rename from package/mesa3d/0038-egl-add-config-debug-printout.patch rename to package/mesa3d/0037-egl-add-config-debug-printout.patch diff --git a/package/mesa3d/0039-egl-add-support-for-EXT_image_gl_colorspace.patch b/package/mesa3d/0038-egl-add-support-for-EXT_image_gl_colorspace.patch similarity index 100% rename from package/mesa3d/0039-egl-add-support-for-EXT_image_gl_colorspace.patch rename to package/mesa3d/0038-egl-add-support-for-EXT_image_gl_colorspace.patch diff --git a/package/mesa3d/0040-meson-force-C-2011-for-thread_local.patch b/package/mesa3d/0039-meson-force-C-2011-for-thread_local.patch similarity index 100% rename from package/mesa3d/0040-meson-force-C-2011-for-thread_local.patch rename to package/mesa3d/0039-meson-force-C-2011-for-thread_local.patch diff --git a/package/mesa3d/0041-dri2-add-support-for-swap-intervals-other-than-1.patch b/package/mesa3d/0040-dri2-add-support-for-swap-intervals-other-than-1.patch similarity index 100% rename from package/mesa3d/0041-dri2-add-support-for-swap-intervals-other-than-1.patch rename to package/mesa3d/0040-dri2-add-support-for-swap-intervals-other-than-1.patch diff --git a/package/mesa3d/0042-null_platform-add-support-for-explicit-synchronisati.patch b/package/mesa3d/0041-null_platform-add-support-for-explicit-synchronisati.patch similarity index 100% rename from package/mesa3d/0042-null_platform-add-support-for-explicit-synchronisati.patch rename to package/mesa3d/0041-null_platform-add-support-for-explicit-synchronisati.patch diff --git a/package/mesa3d/0043-dri2-add-support-for-image-modifiers.patch b/package/mesa3d/0043-dri2-add-support-for-image-modifiers.patch deleted file mode 100644 index 8befe7c8..00000000 --- a/package/mesa3d/0043-dri2-add-support-for-image-modifiers.patch +++ /dev/null @@ -1,372 +0,0 @@ -From ac19d1d06ea2433fed707210f4433133a58a12dc Mon Sep 17 00:00:00 2001 -From: Luigi Santivetti -Date: Thu, 26 Sep 2019 13:32:15 +0100 -Subject: [PATCH 43/50] dri2: add support for image modifiers - -This change introduces support for image modifiers to platform_null. In -order for it to create an image with modifiers, it relies on libdrm to -populate all formats with associated modifiers supported by the display -for the primary drm plane in use. - -drmModePopulateFormats() is added to the DRM api in a different change -and it is not upstream at present. - -NOTES: - [1] IN_FORMATS blobs are available since kernel 4.14: - - db1689aa61bd1efb5ce9b896e7aa860a85b7f1b6 - - https://patchwork.freedesktop.org/patch/168543 - - [2] for the record, in order to test this change, it was needed to: - - edit pvrdri_impl.c, as fbc relies on the BVNC for selecting which - algorithm and fourcc code are to be used. To sidestep this, include - img_drm_fourcc_internal.h instead of powervr/img_drm_fourcc.h and - manually add the list of g_auiAll_mods[] - - edit null_disp_drv.h, by removing DRM_FORMAT_MOD_LINEAR - - edit pvrrem_conv_sw_fbdc.c, log from decompress_fb() by building - with RFB_DEBUG=1, the log file is under /var/log - - [3] the dri image->base.version threshold is 14. - - Unlike for platform_wayland, where no details were found regarding - why it's using 15 - - dri_interface.h makes createImageWithModifiers available since - version 14 - - dri/gbm_dri.c as an example checks for minimum version 14. - -Change-Id: I0f7b030f6e1943690692674bf18daabfc153208a -Signed-off-by: Luigi Santivetti ---- - src/egl/drivers/dri2/egl_dri2.h | 6 + - src/egl/drivers/dri2/platform_null.c | 174 +++++++++++++++++++++++---- - 2 files changed, 159 insertions(+), 21 deletions(-) - -diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h -index 3d5c9adb4f3..6ec9ee01885 100644 ---- a/src/egl/drivers/dri2/egl_dri2.h -+++ b/src/egl/drivers/dri2/egl_dri2.h -@@ -110,6 +110,7 @@ struct display_output { - drmModeModeInfo mode; - uint32_t mode_blob_id; - unsigned formats; -+ drmModeFormats *in_formats; - drmModeAtomicReq *atomic_state; - }; - #endif -@@ -274,6 +275,7 @@ struct dri2_egl_display - - #ifdef HAVE_NULL_PLATFORM - bool atomic_enabled; -+ bool in_formats_enabled; - struct display_output output; - #endif - -@@ -373,6 +375,10 @@ struct dri2_egl_surface - #if defined(HAVE_WAYLAND_PLATFORM) || defined(HAVE_NULL_PLATFORM) - int format; - #endif -+#if defined(HAVE_NULL_PLATFORM) -+ uint64_t *modifiers; -+ uint32_t count_modifiers; -+#endif - - #ifdef HAVE_DRM_PLATFORM - struct gbm_dri_surface *gbm_surf; -diff --git a/src/egl/drivers/dri2/platform_null.c b/src/egl/drivers/dri2/platform_null.c -index c25ae0b2a04..701460dde4e 100644 ---- a/src/egl/drivers/dri2/platform_null.c -+++ b/src/egl/drivers/dri2/platform_null.c -@@ -156,6 +156,18 @@ format_idx_get_from_drm_format(uint32_t drm_format) - return -1; - } - -+static inline uint32_t -+blob_id_from_property_value(uint64_t prop_value) -+{ -+ /* The KMS properties documetation, 01.org/linuxgraphics, says: -+ * -+ * For all property types except blob properties the value is a 64-bit -+ * unsigned integer. -+ */ -+ assert(!(prop_value >> 32)); -+ return (uint32_t) prop_value; -+} -+ - static int - atomic_state_add_object_properties(drmModeAtomicReq *atomic_state, - const struct object_property *props, -@@ -644,14 +656,45 @@ drm_event_process(int fd) - return 0; - } - -+static drmModeFormatsPtr -+plane_get_in_formats(int fd, drmModePlane *plane) -+{ -+ drmModeFormatsPtr drm_mode_fmt = NULL; -+ drmModePropertyBlobRes *blob; -+ uint64_t prop_value; -+ uint32_t blob_id; -+ int err; -+ -+ if (!plane) -+ return NULL; -+ -+ err = !object_property_value_for_name(fd, plane->plane_id, DRM_MODE_OBJECT_PLANE, -+ "IN_FORMATS", &prop_value); -+ if (err) -+ return NULL; -+ -+ blob_id = blob_id_from_property_value(prop_value); -+ blob = drmModeGetPropertyBlob(fd, blob_id); -+ -+ err = drmModePopulateFormats(blob, &drm_mode_fmt); -+ if (err) -+ _eglLog(_EGL_WARNING,"failed to populate in_formats (%d)", err); -+ -+ drmModeFreePropertyBlob(blob); -+ -+ return drm_mode_fmt; -+} -+ - static bool --display_output_init(int fd, struct display_output *output, bool use_atomic) -+display_output_init(int fd, struct display_output *output, bool use_atomic, -+ bool prefer_in_formats, bool *in_formats_enabled_out) - { - drmModeRes *resources; - drmModeConnector *connector; - drmModeCrtc *crtc; - drmModePlane *plane; - unsigned mode_idx; -+ uint32_t drm_format; - - resources = drmModeGetResources(fd); - if (!resources) -@@ -674,18 +717,41 @@ display_output_init(int fd, struct display_output *output, bool use_atomic) - goto err_free_plane; - output->mode = connector->modes[mode_idx]; - -+ assert(in_formats_enabled_out && !(*in_formats_enabled_out)); -+ -+ /* can in_formats be enabled for this display? */ -+ if (prefer_in_formats) { -+ output->in_formats = plane_get_in_formats(fd, plane); -+ if (!output->in_formats) { -+ _eglLog(_EGL_WARNING, -+ "fallback to plane formats, no in_formats found"); -+ } else if (output->in_formats->count != plane->count_formats) { -+ /* exit the process with generic failure 1 */ -+ _eglLog(_EGL_FATAL, -+ "kernel bug: formats count mismatch, exit"); -+ } else { -+ *in_formats_enabled_out = true; -+ } -+ } -+ - /* Record the display supported formats */ - for (unsigned i = 0; i < plane->count_formats; i++) { - int format_idx; - -- format_idx = format_idx_get_from_drm_format(plane->formats[i]); -+ drm_format = *in_formats_enabled_out ? -+ output->in_formats->formats[i].format : plane->formats[i]; -+ format_idx = format_idx_get_from_drm_format(drm_format); - if (format_idx == -1) - continue; - - output->formats |= (1 << format_idx); - } -+ -+ /* At this point we can only shut down if the look up failed and -+ * it is safe to pass NULL to drmModeFreeFormats(). -+ */ - if (!output->formats) -- goto err_free_plane; -+ goto err_free_formats; - - output->connector_id = connector->connector_id; - output->crtc_id = crtc->crtc_id; -@@ -705,6 +771,8 @@ display_output_init(int fd, struct display_output *output, bool use_atomic) - - return true; - -+err_free_formats: -+ drmModeFreeFormats(output->in_formats); - err_free_plane: - drmModeFreePlane(plane); - err_free_crtc: -@@ -983,10 +1051,12 @@ static bool - add_fb_for_dri_image(struct dri2_egl_display *dri2_dpy, __DRIimage *image, - uint32_t *fb_id_out) - { -+ uint64_t modifiers[4] = {0}; - uint32_t handles[4] = {0}; - uint32_t pitches[4] = {0}; - uint32_t offsets[4] = {0}; -- int handle, stride, width, height, format; -+ uint32_t flags = 0; -+ int handle, stride, width, height, format, l_mod, h_mod; - int format_idx; - - dri2_dpy->image->queryImage(image, __DRI_IMAGE_ATTRIB_HANDLE, &handle); -@@ -1001,9 +1071,41 @@ add_fb_for_dri_image(struct dri2_egl_display *dri2_dpy, __DRIimage *image, - format_idx = format_idx_get_from_dri_image_format(format); - assert(format_idx != -1); - -- return !drmModeAddFB2(dri2_dpy->fd, width, height, -- dri2_null_formats[format_idx].drm_format, -- handles, pitches, offsets, fb_id_out, 0); -+ if (dri2_dpy->in_formats_enabled) { -+ dri2_dpy->image->queryImage(image, __DRI_IMAGE_ATTRIB_MODIFIER_UPPER, &h_mod); -+ dri2_dpy->image->queryImage(image, __DRI_IMAGE_ATTRIB_MODIFIER_LOWER, &l_mod); -+ -+ modifiers[0] = combine_u32_into_u64((uint32_t) h_mod, (uint32_t) l_mod); -+ flags |= DRM_MODE_FB_MODIFIERS; -+ } -+ -+ return !drmModeAddFB2WithModifiers(dri2_dpy->fd, width, height, -+ dri2_null_formats[format_idx].drm_format, -+ handles, pitches, offsets, modifiers, -+ fb_id_out, flags); -+} -+ -+static __DRIimage * -+create_image(struct dri2_egl_surface *dri2_surf, uint32_t flags) -+{ -+ struct dri2_egl_display *dri2_dpy = -+ dri2_egl_display(dri2_surf->base.Resource.Display); -+ -+ if (dri2_dpy->in_formats_enabled) -+ return dri2_dpy->image->createImageWithModifiers(dri2_dpy->dri_screen, -+ dri2_surf->base.Width, -+ dri2_surf->base.Height, -+ dri2_surf->format, -+ dri2_surf->modifiers, -+ dri2_surf->count_modifiers, -+ NULL); -+ -+ return dri2_dpy->image->createImage(dri2_dpy->dri_screen, -+ dri2_surf->base.Width, -+ dri2_surf->base.Height, -+ dri2_surf->format, -+ flags, -+ NULL); - } - - static bool -@@ -1016,12 +1118,7 @@ get_front_bo(struct dri2_egl_surface *dri2_surf) - if (dri2_surf->base.Type == EGL_WINDOW_BIT) - use |= __DRI_IMAGE_USE_SCANOUT; - -- dri2_surf->front = dri2_dpy->image->createImage(dri2_dpy->dri_screen, -- dri2_surf->base.Width, -- dri2_surf->base.Height, -- dri2_surf->format, -- use, -- NULL); -+ dri2_surf->front = create_image(dri2_surf, use); - if (!dri2_surf->front) - return false; - -@@ -1058,13 +1155,8 @@ get_back_bo(struct dri2_egl_surface *dri2_surf) - } - - if (!dri2_surf->back->dri_image) { -- dri2_surf->back->dri_image = -- dri2_dpy->image->createImage(dri2_dpy->dri_screen, -- dri2_surf->base.Width, -- dri2_surf->base.Height, -- dri2_surf->format, -- __DRI_IMAGE_USE_SCANOUT, -- NULL); -+ dri2_surf->back->dri_image = create_image(dri2_surf, -+ __DRI_IMAGE_USE_SCANOUT); - if (!dri2_surf->back->dri_image) - goto err_unlock; - } -@@ -1094,6 +1186,26 @@ static void surface_swap_queue_init(struct dri2_egl_surface *dri2_surf) - swap_queue[i].kms_in_fence_fd = -1; - } - -+static bool -+in_formats_get_modifiers(drmModeFormats *in_formats, int drm_format, -+ uint64_t **out_modifiers, uint32_t *out_count) -+{ -+ unsigned i; -+ -+ if (!in_formats) -+ return false; -+ -+ for (i = 0; i < in_formats->count; i++) { -+ if (in_formats->formats[i].format == drm_format) { -+ *out_modifiers = in_formats->formats[i].modifiers; -+ *out_count = in_formats->formats[i].count_modifiers; -+ return true; -+ } -+ } -+ -+ return false; -+} -+ - static _EGLSurface * - create_surface(_EGLDisplay *disp, _EGLConfig *config, EGLint type, - const EGLint *attrib_list) -@@ -1105,6 +1217,7 @@ create_surface(_EGLDisplay *disp, _EGLConfig *config, EGLint type, - const __DRIconfig *dri_config; - _EGLSurface *surf; - int format_idx; -+ bool ret; - - dri2_surf = calloc(1, sizeof(*dri2_surf)); - if (!dri2_surf) { -@@ -1137,6 +1250,15 @@ create_surface(_EGLDisplay *disp, _EGLConfig *config, EGLint type, - - dri2_surf->format = dri2_null_formats[format_idx].dri_image_format; - -+ if (dri2_dpy->in_formats_enabled) { -+ ret = in_formats_get_modifiers(dri2_dpy->output.in_formats, -+ dri2_null_formats[format_idx].drm_format, -+ &dri2_surf->modifiers, -+ &dri2_surf->count_modifiers); -+ if (!ret || dri2_surf->count_modifiers <= 0) -+ goto err_free_surface; -+ } -+ - surface_swap_queue_init(dri2_surf); - - return surf; -@@ -1533,6 +1655,7 @@ EGLBoolean - dri2_initialize_null(_EGLDisplay *disp) - { - struct dri2_egl_display *dri2_dpy; -+ bool prefer_in_formats; - int err; - - dri2_dpy = calloc(1, sizeof(*dri2_dpy)); -@@ -1586,8 +1709,16 @@ dri2_initialize_null(_EGLDisplay *disp) - goto cleanup; - } - -+ /* in_formats could be supported by the platform, however not being -+ * actually enabled, i.e. in_formats init can still fail. -+ */ -+ prefer_in_formats = dri2_dpy->image->base.version >= 14 && -+ dri2_dpy->image->createImageWithModifiers; -+ - if (!display_output_init(dri2_dpy->fd, &dri2_dpy->output, -- dri2_dpy->atomic_enabled)) { -+ dri2_dpy->atomic_enabled, -+ prefer_in_formats, -+ &dri2_dpy->in_formats_enabled)) { - _eglError(EGL_NOT_INITIALIZED, "failed to create output"); - goto cleanup; - } -@@ -1616,6 +1747,7 @@ void - dri2_teardown_null(struct dri2_egl_display *dri2_dpy) - { - drmModeAtomicFree(dri2_dpy->output.atomic_state); -+ drmModeFreeFormats(dri2_dpy->output.in_formats); - - if (dri2_dpy->output.mode_blob_id) - drmModeDestroyPropertyBlob(dri2_dpy->fd, dri2_dpy->output.mode_blob_id); --- -2.17.1 - diff --git a/package/mesa3d/0044-egl-query-the-supported-ES2-context-version.patch b/package/mesa3d/0043-egl-query-the-supported-ES2-context-version.patch similarity index 100% rename from package/mesa3d/0044-egl-query-the-supported-ES2-context-version.patch rename to package/mesa3d/0043-egl-query-the-supported-ES2-context-version.patch diff --git a/package/mesa3d/0045-meson-allow-libGL-to-be-built-without-GLX.patch b/package/mesa3d/0044-meson-allow-libGL-to-be-built-without-GLX.patch similarity index 100% rename from package/mesa3d/0045-meson-allow-libGL-to-be-built-without-GLX.patch rename to package/mesa3d/0044-meson-allow-libGL-to-be-built-without-GLX.patch diff --git a/package/mesa3d/0046-egl-wayland-process-non-resized-window-movement.patch b/package/mesa3d/0045-egl-wayland-process-non-resized-window-movement.patch similarity index 100% rename from package/mesa3d/0046-egl-wayland-process-non-resized-window-movement.patch rename to package/mesa3d/0045-egl-wayland-process-non-resized-window-movement.patch diff --git a/package/mesa3d/0047-Separate-EXT_framebuffer_object-from-ARB-version.patch b/package/mesa3d/0046-Separate-EXT_framebuffer_object-from-ARB-version.patch similarity index 100% rename from package/mesa3d/0047-Separate-EXT_framebuffer_object-from-ARB-version.patch rename to package/mesa3d/0046-Separate-EXT_framebuffer_object-from-ARB-version.patch diff --git a/package/mesa3d/0048-egl-null-add-support-for-async-flip-with-front-buffe.patch b/package/mesa3d/0047-egl-null-add-support-for-async-flip-with-front-buffe.patch similarity index 100% rename from package/mesa3d/0048-egl-null-add-support-for-async-flip-with-front-buffe.patch rename to package/mesa3d/0047-egl-null-add-support-for-async-flip-with-front-buffe.patch diff --git a/package/mesa3d/0049-gbm-add-pbuffer-support.patch b/package/mesa3d/0048-gbm-add-pbuffer-support.patch similarity index 100% rename from package/mesa3d/0049-gbm-add-pbuffer-support.patch rename to package/mesa3d/0048-gbm-add-pbuffer-support.patch diff --git a/package/mesa3d/0050-egl-null-expose-EXT_yuv_surface-support.patch b/package/mesa3d/0049-egl-null-expose-EXT_yuv_surface-support.patch similarity index 100% rename from package/mesa3d/0050-egl-null-expose-EXT_yuv_surface-support.patch rename to package/mesa3d/0049-egl-null-expose-EXT_yuv_surface-support.patch diff --git a/package/mesa3d/0007-egl_dri2-set-pbuffer-config-attribs-to-0-for-non-pbu.patch b/package/mesa3d/0067-egl_dri2-set-pbuffer-config-attribs-to-0-for-non-pbu.patch similarity index 100% rename from package/mesa3d/0007-egl_dri2-set-pbuffer-config-attribs-to-0-for-non-pbu.patch rename to package/mesa3d/0067-egl_dri2-set-pbuffer-config-attribs-to-0-for-non-pbu.patch