Merge remote-tracking branch 'aosp/upstream-swiftshader-master' into emu-master-dev
bug: 119520624
bug: 119571625
This updates our Swiftshader sources to
b16f9897a86817da090baa536dbcd4c9d488090e Initial implementation of RenderPass
of aosp/upstream-swiftshader-master
Change-Id: I2008cd2a8a568cbbfdfc61ea13547063628d5805
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 5a4e85a..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "third_party/googletest"]
- path = third_party/googletest
- url = https://github.com/google/googletest.git
diff --git a/OWNERS b/OWNERS
index c1fc9da..cd4f2af 100644
--- a/OWNERS
+++ b/OWNERS
@@ -7,10 +7,18 @@
# swiftshader.googlesource.com/SwiftShader has ownership and access control
# seperate from those controlled by this OWNERS file.
+ghartman@google.com
nicolascapens@google.com
-sugoi@google.com
+lfy@google.com
shannonwoods@google.com
chrisforbes@google.com
cwallez@google.com
+jansene@google.com
+yahan@google.com
+bohu@google.com
+zyy@google.com
+wdu@google.com
+joshuaduong@google.com
+huans@google.com
-# COMPONENT: Internals>GPU>SwiftShader
\ No newline at end of file
+# COMPONENT: Internals>GPU>SwiftShader
diff --git a/src/Android.mk b/src/Android.mk
index 5f94583..1c76c7b 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -128,6 +128,7 @@
-Wno-unused-value \
-Wno-unused-variable \
-Wno-implicit-exception-spec-mismatch \
+ -Wno-implicit-fallthrough \
-Wno-overloaded-virtual \
-Wno-non-virtual-dtor \
-Wno-attributes \
diff --git a/src/OpenGL/compiler/Android.mk b/src/OpenGL/compiler/Android.mk
index 07d9b6c..bc9d439 100644
--- a/src/OpenGL/compiler/Android.mk
+++ b/src/OpenGL/compiler/Android.mk
@@ -29,6 +29,7 @@
-Wno-unused-parameter \
-Wno-unused-variable \
-Wno-implicit-exception-spec-mismatch \
+ -Wno-implicit-fallthrough \
-Wno-overloaded-virtual \
-Wno-attributes \
-Wno-unknown-attributes \
diff --git a/src/OpenGL/libEGL/Android.mk b/src/OpenGL/libEGL/Android.mk
index f62cbdd..9d4c9217 100644
--- a/src/OpenGL/libEGL/Android.mk
+++ b/src/OpenGL/libEGL/Android.mk
@@ -13,6 +13,7 @@
-Wno-unused-function \
-Wno-unused-parameter \
-Wno-implicit-exception-spec-mismatch \
+ -Wno-implicit-fallthrough \
-Wno-overloaded-virtual \
-Wno-attributes \
-Wno-unknown-attributes \
diff --git a/src/OpenGL/libGLES_CM/Android.mk b/src/OpenGL/libGLES_CM/Android.mk
index 9b00f42..7ac8e16 100644
--- a/src/OpenGL/libGLES_CM/Android.mk
+++ b/src/OpenGL/libGLES_CM/Android.mk
@@ -20,6 +20,7 @@
-Wno-unused-parameter \
-Wno-unused-variable \
-Wno-implicit-exception-spec-mismatch \
+ -Wno-implicit-fallthrough \
-Wno-overloaded-virtual \
-Wno-attributes \
-Wno-unknown-attributes \
diff --git a/src/OpenGL/libGLESv2/Android.mk b/src/OpenGL/libGLESv2/Android.mk
index 747a6b0..c2f29e6 100644
--- a/src/OpenGL/libGLESv2/Android.mk
+++ b/src/OpenGL/libGLESv2/Android.mk
@@ -20,6 +20,7 @@
-Wno-unused-private-field \
-Wno-unused-variable \
-Wno-implicit-exception-spec-mismatch \
+ -Wno-implicit-fallthrough \
-Wno-overloaded-virtual \
-Wno-attributes \
-Wno-unknown-attributes \
diff --git a/src/Reactor/Android.mk b/src/Reactor/Android.mk
index e21d196..2fe0230 100644
--- a/src/Reactor/Android.mk
+++ b/src/Reactor/Android.mk
@@ -116,6 +116,7 @@
-Wno-unused-lambda-capture \
-Wno-unused-parameter \
-Wno-implicit-exception-spec-mismatch \
+ -Wno-implicit-fallthrough \
-Wno-overloaded-virtual \
-Wno-non-virtual-dtor \
-Wno-unknown-warning-option \
diff --git a/third_party/LLVM/Android.mk b/third_party/LLVM/Android.mk
index a07ca23..23f7d78 100644
--- a/third_party/LLVM/Android.mk
+++ b/third_party/LLVM/Android.mk
@@ -401,6 +401,7 @@
-Wall \
-Werror \
-Wno-implicit-exception-spec-mismatch \
+ -Wno-implicit-fallthrough \
-Wno-overloaded-virtual \
-Wno-undefined-var-template \
-Wno-unneeded-internal-declaration \
diff --git a/third_party/googletest b/third_party/googletest
deleted file mode 160000
index 02a8ca8..0000000
--- a/third_party/googletest
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 02a8ca87735601466d8c564344f9be493da84708
