Merge pull request #4 from Container-On-Android/upstream

Sync upstream changes

Author: DreamConnected

.gitlab-ci.yml

@@ -17,7 +17,7 @@ variables:
   #
   # Pick a pipeline on https://gitlab.freedesktop.org/mesa/mesa/-/pipelines/
   #
-  MESA_PIPELINE_ID: 1594204
+  MESA_PIPELINE_ID: 1610924
 
   MESA_PROJECT_PATH: mesa/mesa
   S3_JWT_FILE: /s3_jwt
@@ -59,7 +59,7 @@ include:
     # IMPORTANT: Use a recent Mesa Git revision
     # The commit ref must be in sync with the pipeline picked above
     # It can be found on the pipeline page below the commit message
-    ref: 042348895560dea1109617facb61bdd618967284
+    ref: 2fa85edd75a4dac145ca9fee78dbe56207aa6870
     file:
       - '/.gitlab-ci/image-tags.yml'
 
@@ -229,6 +229,36 @@ debian/x86_64_build_panfrost:
       when: manual
     - when: never
 
+debian/x86_64_build_i915:
+  stage: build
+  extends:
+    - .use-build-image
+  variables:
+    MINIO_ARTIFACT_NAME: virgl-amd64
+    EXTRA_OPTION: >
+      -D drm-renderers=i915-experimental
+  script:
+    - .gitlab-ci/meson/build.sh
+  artifacts:
+    name: "virgl_${CI_JOB_NAME}"
+    when: always
+    paths:
+      - install/
+      - results/
+  rules:
+    - changes:
+      - src/drm/**/*
+      when: on_success
+    - if: *is-scheduled-pipeline
+      when: on_success
+    - if: *is-post-merge
+      when: never
+    - if: *is-forked-branch-or-pre-merge-not-for-marge
+      when: manual
+    - if: *is-pre-merge-for-marge
+      when: on_success
+    - when: never
+
 debian/x86_64_build_msm:
   stage: build
   extends:

config.h.meson

@@ -43,6 +43,7 @@
 #mesondefine ENABLE_DRM_AMDGPU
 #mesondefine ENABLE_DRM_ASAHI
 #mesondefine ENABLE_DRM_PANFROST
+#mesondefine ENABLE_DRM_I915
 #mesondefine ENABLE_LIBDRM
 #mesondefine ENABLE_RENDER_SERVER
 #mesondefine ENABLE_RENDER_SERVER_WORKER_PROCESS

meson.build

@@ -23,7 +23,7 @@
 
 project(
    'virglrenderer', 'c',
-   version: '1.2.0',
+   version: '1.3.0',
    license : 'MIT',
    meson_version : '>= 0.55',
    default_options : ['buildtype=release', 'b_ndebug=if-release',
@@ -39,7 +39,7 @@ project(
 #    and set "revision" and "interface_age" to zero
 
 binary_age    = 1
-interface_age = 10
+interface_age = 11
 revision      = 0
 
 virgl_version = meson.project_version()
@@ -79,11 +79,20 @@ add_project_arguments(cc.get_supported_arguments(flags), language : 'c')
 
 prog_python = import('python').find_installation('python3')
 
+with_host_windows = host_machine.system() == 'windows'
+with_host_darwin = host_machine.system() == 'darwin'
+
 not_found = dependency('', required: false)
 gbm_dep = not_found
 thread_dep = dependency('threads')
 epoxy_dep = dependency('epoxy', version: '>= 1.5.4')
 m_dep = cc.find_library('m', required : false)
+dl_dep = not_found
+if not with_host_windows and not with_host_darwin
+  if not cc.has_function('dlopen')
+    dl_dep = cc.find_library('dl', required : true)
+  endif
+endif
 
 conf_data = configuration_data()
 conf_data.set('VERSION', meson.project_version())
@@ -119,6 +128,11 @@ if with_drm_panfrost
   conf_data.set('ENABLE_DRM_PANFROST', 1)
 endif
 
+with_drm_i915 = drm_renderers.contains('i915-experimental')
+if with_drm_i915
+  conf_data.set('ENABLE_DRM_I915', 1)
+endif
+
 with_drm_renderers = drm_renderers.length() > 0
 
 if with_drm_renderers
@@ -452,6 +466,7 @@ summary({'c_args': (' ').join(get_option('c_args')),
         'venus': with_venus,
         'drm-amdgpu': with_drm_amdgpu,
         'drm-asahi': with_drm_asahi,
+        'drm-i915': with_drm_i915,
         'drm-panfrost': with_drm_panfrost,
         'drm-msm': with_drm_msm,
         'render server worker': with_render_server ? with_render_server_worker : 'none',

meson_options.txt

@@ -80,6 +80,7 @@ option(
     'panfrost-experimental',
     'asahi',
     'msm',
+    'i915-experimental',
   ],
   description : 'List of drm native-context renderers to build'
 )