commit a43d8e380939941bd4b6ff81ac0af02aed564125
author android-build-prod (mdb) <android-build-team-robot@google.com> Thu Oct 01 21:19:32 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 01 21:19:32 2020 +0000
tree 69d1f7884d034e4350ef9fd1e3682791307845be
parent 1791b2ff1137d432678eafaf313191fe3befdf6a
parent d09b07181e60f477dfaee4a2c4a2698b461573bb

Merge "Snap for 6877830 from f7740307c8866eb71bbc5f15f23dc0eac2a3c020 to sdk-release" into sdk-release

src/gbm/Android.mk

diff --git a/src/gbm/Android.mk b/src/gbm/Android.mk
index 1fe5652..1e983ec 100644
--- a/src/gbm/Android.mk
+++ b/src/gbm/Android.mk
@@ -36,7 +36,7 @@
 	libmesa_util \
 	libmesa_loader
 
-LOCAL_MODULE := libgbm
+LOCAL_MODULE := libgbm_mesa
 
 LOCAL_SRC_FILES := \
 	$(gbm_core_FILES) \

src/util/altxmlconfig.c

diff --git a/src/util/altxmlconfig.c b/src/util/altxmlconfig.c
index bbbc68a..dc6ed034 100644
--- a/src/util/altxmlconfig.c
+++ b/src/util/altxmlconfig.c
@@ -90,6 +90,7 @@
 		{"allow_glsl_builtin_const_expression", DRI_BOOL, NULL, 0},
 		{"allow_glsl_relaxed_es", DRI_BOOL, NULL, 0},
 		{"force_compat_profile", DRI_BOOL, NULL, 0},
+		{"force_gl_vendor", DRI_STRING, NULL, 0 },
 		{"glx_disable_sgi_video_sync", DRI_BOOL, NULL, 0} //,
 };
 
@@ -124,6 +125,7 @@
 		{false}, // allow_glsl_builtin_const_expression
 		{false}, // allow_glsl_relaxed_es
 		{false}, // force_compat_profile
+		{._string = ""}, // force_gl_vendor
 		{false}, // glx_disable_sgi_video_sync
 };
 
@@ -218,7 +220,7 @@
 {
     uint32_t i = findOption (name);
    /* If not found, return default */
-    if (i < ALT_XML_MAX_OPTIONS)
+    if (i == ALT_XML_MAX_OPTIONS)
 	return false;
 
     assert (_cache.info[i].type == DRI_BOOL);
@@ -230,7 +232,7 @@
 {
     uint32_t i = findOption (name);
    /* If not found, return default */
-    if (i < ALT_XML_MAX_OPTIONS)
+    if (i == ALT_XML_MAX_OPTIONS)
 	return 0;
 
     assert (_cache.info[i].type == DRI_ENUM || _cache.info[i].type == DRI_INT);
@@ -242,7 +244,7 @@
 {
     uint32_t i = findOption (name);
     /* If not found, return default */
-    if (i < ALT_XML_MAX_OPTIONS)
+    if (i == ALT_XML_MAX_OPTIONS)
 	return 0.0;
 
     assert (_cache.info[i].type == DRI_FLOAT);
@@ -254,7 +256,7 @@
 {
     uint32_t i = findOption (name);
     /* If not found, return default */
-    if (i < ALT_XML_MAX_OPTIONS)
+    if (i == ALT_XML_MAX_OPTIONS)
 	return NULL;
 
     assert (_cache.info[i].type == DRI_STRING);