Import Mesa 19.2.8

3 files changed, 42 insertions, 1 deletions

diff --git a/lib/mesa/src/gallium/winsys/freedreno/drm/.editorconfig b/lib/mesa/src/gallium/winsys/freedreno/drm/.editorconfig
new file mode 100644
index 000000000..cc8e11ffd
--- /dev/null
+++ b/lib/mesa/src/gallium/winsys/freedreno/drm/.editorconfig
@@ -0,0 +1,2 @@
+[*.{c,h}]
+indent_style = tab
diff --git a/lib/mesa/src/gallium/winsys/freedreno/drm/Android.mk b/lib/mesa/src/gallium/winsys/freedreno/drm/Android.mk
new file mode 100644
index 000000000..09edab391
--- /dev/null
+++ b/lib/mesa/src/gallium/winsys/freedreno/drm/Android.mk
@@ -0,0 +1,36 @@
+# Copyright (C) 2014 Emil Velikov <emil.l.velikov@gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+LOCAL_PATH := $(call my-dir)
+
+# get C_SOURCES
+include $(LOCAL_PATH)/Makefile.sources
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(C_SOURCES)
+
+LOCAL_SHARED_LIBRARIES := libdrm_freedreno
+LOCAL_STATIC_LIBRARIES := libfreedreno_registers
+
+LOCAL_MODULE := libmesa_winsys_freedreno
+
+include $(GALLIUM_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/lib/mesa/src/gallium/winsys/freedreno/drm/meson.build b/lib/mesa/src/gallium/winsys/freedreno/drm/meson.build
index 4a8473294..765ac887d 100644
--- a/lib/mesa/src/gallium/winsys/freedreno/drm/meson.build
+++ b/lib/mesa/src/gallium/winsys/freedreno/drm/meson.build
@@ -20,7 +20,10 @@
 
 libfreedrenowinsys = static_library(
   'freedrenowinsys',
-  files('freedreno_drm_public.h', 'freedreno_drm_winsys.c'),
+  [
+    files('freedreno_drm_public.h', 'freedreno_drm_winsys.c'),
+    freedreno_xml_header_files,
+  ],
   include_directories : [
     inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_gallium_drivers,
     inc_freedreno,