Roll SwiftShader from bbe6452b420c to 9aec4b969291 (10 revisions)
https://swiftshader.googlesource.com/SwiftShader.git/+log/bbe6452b420c..9aec4b969291
Please enable autosubmit on changes if possible when approving them.
If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/swiftshader-android
Please CC natsu@google.com,nicolascapens@google.com,swiftshader-eng@google.com on the revert to ensure that a human
is aware of the problem.
To file a bug in SwiftShader: https://bugs.chromium.org/p/swiftshader/issues/entry
To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Test: Presubmit checks will test this change.
Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.
Change-Id: I28bf3be8f9fdbb91f18d7c077f9a7571c3429243
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index cb86c5c..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,27 +0,0 @@
-[submodule "third_party/cppdap"]
- path = third_party/cppdap
- url = https://github.com/google/cppdap
-[submodule "third_party/googletest"]
- path = third_party/googletest
- url = https://github.com/google/googletest.git
-[submodule "third_party/json"]
- path = third_party/json
- url = https://github.com/nlohmann/json.git
-[submodule "third_party/libbacktrace/src"]
- path = third_party/libbacktrace/src
- url = https://github.com/ianlancetaylor/libbacktrace.git
-[submodule "third_party/PowerVR_Examples"]
- path = third_party/PowerVR_Examples
- url = https://github.com/powervr-graphics/Native_SDK.git
-[submodule "third_party/benchmark"]
- path = third_party/benchmark
- url = https://github.com/google/benchmark.git
-[submodule "third_party/glslang"]
- path = third_party/glslang
- url = https://github.com/KhronosGroup/glslang.git
-[submodule "third_party/git-hooks"]
- path = third_party/git-hooks
- url = https://swiftshader.googlesource.com/git-hooks
-[submodule "third_party/llvm-project"]
- path = third_party/llvm-project
- url = https://github.com/llvm/llvm-project.git
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d97975c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+ license_type: NOTICE
+}
diff --git a/README.google b/README.google
new file mode 100644
index 0000000..018cbb9
--- /dev/null
+++ b/README.google
@@ -0,0 +1,11 @@
+URL: https://swiftshader.googlesource.com/SwiftShader/+/cloud-android-current-release
+License: Apache License Version 2.0, January 2004
+License File: LICENSE.txt
+
+Description:
+SwiftShader is a high-performance CPU-based implementation of the OpenGL ES and
+Direct3D 9 graphics APIs12. Its goal is to provide hardware independence for
+advanced 3D graphics.
+
+Local Modifications:
+No Modifications
\ No newline at end of file
diff --git a/README.version b/README.version
new file mode 100644
index 0000000..8e9ab1c
--- /dev/null
+++ b/README.version
@@ -0,0 +1,3 @@
+URL: https://swiftshader.googlesource.com/SwiftShader
+BugComponent: 111604
+OWNERS: ghartman, nicolascapens, shannonwoods
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..e881d5d
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "imports": [
+ {
+ "path": "cts/tests/tests/uirendering"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/Android.bp b/src/Android.bp
index 51c8ca0..3d56a27 100644
--- a/src/Android.bp
+++ b/src/Android.bp
@@ -126,26 +126,14 @@
"hwvulkan_headers",
],
shared_libs: [
- "android.hardware.graphics.mapper@3.0",
- "android.hardware.graphics.mapper@4.0",
"libnativewindow",
"libhardware",
- "libhidlbase",
- "libcutils",
"libsync",
"liblog",
- "libutils",
],
static_libs: [
"libarect",
],
- cflags: [
- "-DHAVE_GRALLOC1",
- "-DHAVE_GRALLOC3",
- "-DHAVE_GRALLOC4",
- // FIXME: Use <android/api-level.h> instead?
- "-DANDROID_PLATFORM_SDK_VERSION=10000",
- ],
version_script: "Vulkan/android_vk_swiftshader.lds",
},
host: {
@@ -184,7 +172,7 @@
cflags: [
"-DLOG_TAG=\"swiftshader\"",
"-DSWIFTSHADER_ENABLE_ASTC", // TODO(b/150130101)
- //"-DSWIFTSHADER_DEVICE_MEMORY_REPORT",
+ "-DSWIFTSHADER_DEVICE_MEMORY_REPORT",
],
srcs: [
diff --git a/third_party/PowerVR_Examples b/third_party/PowerVR_Examples
deleted file mode 160000
index 409c9d5..0000000
--- a/third_party/PowerVR_Examples
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 409c9d54fdaffe68565283e38dcbbe6c58535925
diff --git a/third_party/SPIRV-Tools/.bazelversion b/third_party/SPIRV-Tools/.bazelversion
index 0062ac9..28cbf7c 100644
--- a/third_party/SPIRV-Tools/.bazelversion
+++ b/third_party/SPIRV-Tools/.bazelversion
@@ -1 +1 @@
-5.0.0
+5.0.0
\ No newline at end of file
diff --git a/third_party/benchmark b/third_party/benchmark
deleted file mode 160000
index dfc8a92..0000000
--- a/third_party/benchmark
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit dfc8a92abc88a9d630a9f8e01c678fedde4c3090
diff --git a/third_party/cppdap b/third_party/cppdap
deleted file mode 160000
index 1fd23dd..0000000
--- a/third_party/cppdap
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1fd23dda91e01550be1a421de307e6fedb2035a9
diff --git a/third_party/git-hooks b/third_party/git-hooks
deleted file mode 160000
index 6d91964..0000000
--- a/third_party/git-hooks
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6d91964d33adee28dda9c7faf9ffd6f4672c381c
diff --git a/third_party/glslang b/third_party/glslang
deleted file mode 160000
index 2b2523f..0000000
--- a/third_party/glslang
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2b2523fb951f63f072cfba514c26f2feea5f4329
diff --git a/third_party/googletest b/third_party/googletest
deleted file mode 160000
index e2239ee..0000000
--- a/third_party/googletest
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e2239ee6043f73722e7aa812a459f54a28552929
diff --git a/third_party/json b/third_party/json
deleted file mode 160000
index ed55414..0000000
--- a/third_party/json
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ed5541440a36bf7dc1a544f9a84fa3e5ae97b71f
diff --git a/third_party/libbacktrace/src b/third_party/libbacktrace/src
deleted file mode 160000
index 5a99ff7..0000000
--- a/third_party/libbacktrace/src
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5a99ff7fed66b8ea8f09c9805c138524a7035ece
diff --git a/third_party/llvm-project b/third_party/llvm-project
deleted file mode 160000
index fc3b34c..0000000
--- a/third_party/llvm-project
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fc3b34c50803274b8ba3b8a30df9177b7d29063c
diff --git a/third_party/marl/.gitmodules b/third_party/marl/.gitmodules
deleted file mode 100644
index 335eee4..0000000
--- a/third_party/marl/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule "third_party/googletest"]
- path = third_party/googletest
- url = https://github.com/google/googletest.git
-[submodule "third_party/benchmark"]
- path = third_party/benchmark
- url = https://github.com/google/benchmark.git
