Update bsp diff for mesa upgrade from 19.0.6 to 19.1.6

patches/common/vendor/intel/external/project-celadon/mesa/0001-mesa3d-intel-make-mesa-can-pass-build-in-ctnr-tree.patch

@@ -1,34 +1,22 @@
-From 154d77c342458cec8f992abeff39ba307dc7ed65 Mon Sep 17 00:00:00 2001
-From: "xue.yifei" <yifei.xue@intel.com>
-Date: Tue, 2 Jul 2019 15:24:24 +0800
+From 1bd8c601f29a36ea1d3b8776da8ed5f20cdd6269 Mon Sep 17 00:00:00 2001
+From: renchenglei <chenglei.ren@intel.com>
+Date: Thu, 2 Jan 2020 20:57:26 +0800
 Subject: [PATCH] mesa3d-intel : make mesa can pass build in ctnr tree
 
 Change-Id: I4d11a23bdddafe18d449581ff7480b42138bbc6c
 Signed-off-by: xue.yifei <[email protected]>
 Reviewed-on: 674552
 Reviewed-by: Shi, Zhongjie <[email protected]>
 ---
- Android.mk                               | 8 +++++---
+ Android.mk                               | 6 +++---
  src/mesa/drivers/dri/i965/intel_screen.c | 8 ++++----
- 2 files changed, 9 insertions(+), 7 deletions(-)
- mode change 100644 => 100755 Android.mk
- mode change 100644 => 100755 src/mesa/drivers/dri/i965/intel_screen.c
+ 2 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/Android.mk b/Android.mk
-old mode 100644
-new mode 100755
-index 914854c27d..0650766db2
+index 5fe028c6d19c..0d22a025d600 100644
 --- a/Android.mk
 +++ b/Android.mk
-@@ -29,6 +29,7 @@
- # The main target is libGLES_mesa.  For each classic driver enabled, a DRI
- # module will also be built.  DRI modules will be loaded by libGLES_mesa.
-
-+
- MESA_TOP := $(call my-dir)
-
- MESA_ANDROID_MAJOR_VERSION := $(word 1, $(subst ., , $(PLATFORM_VERSION)))
-@@ -77,7 +78,7 @@ MESA_BUILD_CLASSIC := $(strip $(foreach d, $(BOARD_GPU_DRIVERS), $(patsubst $(d)
+@@ -78,7 +78,7 @@ MESA_BUILD_CLASSIC := $(strip $(foreach d, $(BOARD_GPU_DRIVERS), $(patsubst $(d)
  MESA_BUILD_GALLIUM := $(strip $(foreach d, $(BOARD_GPU_DRIVERS), $(patsubst $(d).%,%, $(filter $(d).%, $(gallium_drivers)))))
  endif
  ifeq ($(filter x86%,$(TARGET_ARCH)),)
@@ -37,7 +25,7 @@ index 914854c27d..0650766db2
  endif
 
  $(foreach d, $(MESA_BUILD_CLASSIC) $(MESA_BUILD_GALLIUM), $(eval $(d) := true))
-@@ -116,12 +117,13 @@ SUBDIRS := \
+@@ -118,12 +118,12 @@ SUBDIRS := \
  	src/mesa \
  	src/util \
  	src/egl \
@@ -48,27 +36,24 @@ index 914854c27d..0650766db2
  	src/vulkan
 
  INC_DIRS := $(call all-named-subdir-makefiles,$(SUBDIRS))
-+
 +ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
  INC_DIRS += $(call all-named-subdir-makefiles,src/gallium)
 +endif
  include $(INC_DIRS)
 diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
-old mode 100644
-new mode 100755
-index 89110e60a8..7d66066942
+index 28a54f33e7c5..2e484cd05ac3 100644
 --- a/src/mesa/drivers/dri/i965/intel_screen.c
 +++ b/src/mesa/drivers/dri/i965/intel_screen.c
-@@ -88,7 +88,7 @@ DRI_CONF_BEGIN
-                             "selection heuristic allow.")
+@@ -62,7 +62,7 @@ DRI_CONF_BEGIN
+ 	    DRI_CONF_ENUM(1, "Enable reuse of all sizes of buffer objects")
+ 	 DRI_CONF_DESC_END
        DRI_CONF_OPT_END
-
 -      DRI_CONF_MESA_NO_ERROR("false")
 +      //DRI_CONF_MESA_NO_ERROR("false")
+       DRI_CONF_MESA_GLTHREAD("false")
     DRI_CONF_SECTION_END
 
-    DRI_CONF_SECTION_QUALITY
-@@ -110,10 +110,10 @@ DRI_CONF_BEGIN
+@@ -85,10 +85,10 @@ DRI_CONF_BEGIN
        DRI_CONF_DISABLE_BLEND_FUNC_EXTENDED("false")
        DRI_CONF_DUAL_COLOR_BLEND_BY_LOCATION("false")
        DRI_CONF_ALLOW_GLSL_EXTENSION_DIRECTIVE_MIDSHADER("false")
@@ -83,5 +68,5 @@ index 89110e60a8..7d66066942
        DRI_CONF_OPT_BEGIN_B(shader_precompile, "true")
  	 DRI_CONF_DESC(en, "Perform code generation at shader link time.")
 -- 
-2.21.0
+2.7.4