Cardboard SDK v1.19.0

googlevr · Dec 6, 2022 · e17632c · e17632c
1 parent 2c317e5
commit e17632c
Show file tree

Hide file tree

Showing 9 changed files with 274 additions and 236 deletions.
diff --git a/hellocardboard-android/build.gradle b/hellocardboard-android/build.gradle
@@ -18,7 +18,7 @@ android {
         minSdkVersion 24
         targetSdkVersion 31
         versionCode 1
-        versionName "1.18.0"
+        versionName "1.19.0"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         ndk {
             abiFilters 'armeabi-v7a', 'arm64-v8a'

diff --git a/hellocardboard-ios/HelloCardboard-Info.plist b/hellocardboard-ios/HelloCardboard-Info.plist
@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.18.0</string>
+	<string>1.19.0</string>
 	<key>CFBundleVersion</key>
-	<string>1.18.0</string>
+	<string>1.19.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSCameraUsageDescription</key>

diff --git a/sdk/build.gradle b/sdk/build.gradle
@@ -18,7 +18,7 @@ android {
         minSdkVersion 24
         targetSdkVersion 31
         versionCode 1
-        versionName "1.18.0"
+        versionName "1.19.0"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         ndk {
             abiFilters 'armeabi-v7a', 'arm64-v8a'

diff --git a/sdk/rendering/android/shaders/distortion.vert b/sdk/rendering/android/shaders/distortion.vert
@@ -18,23 +18,23 @@
 #extension GL_ARB_shading_language_420pack : enable
 precision mediump float;
 
-layout (binding = 1) uniform UniformBufferObject
-{
-    float left_u;
-    float right_u;
-    float top_v;
-    float bottom_v;
-} ubo;
-
 layout (location = 0) in vec2 a_Position;
 layout (location = 1) in vec2 a_TexCoords;
 layout (location = 0) out vec2 v_TexCoords;
 layout (location = 1) out vec2 u_Start;
 layout (location = 2) out vec2 u_End;
 
+layout( push_constant ) uniform constants
+{
+    float left_u;
+    float right_u;
+    float top_v;
+    float bottom_v;
+} push_constants;
+
 void main() {
    gl_Position = vec4(a_Position, 0, 1);
    v_TexCoords = a_TexCoords;
-   u_Start = vec2(ubo.left_u, ubo.bottom_v);
-   u_End = vec2(ubo.right_u, ubo.top_v);
+   u_Start = vec2(push_constants.left_u, push_constants.bottom_v);
+   u_End = vec2(push_constants.right_u, push_constants.top_v);
 }
diff --git a/sdk/rendering/android/shaders/distortion_vert.spv.h b/sdk/rendering/android/shaders/distortion_vert.spv.h
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-   // 1011.5.0
-	 #pragma once
+// 1011.5.0
+#pragma once
 const uint32_t distortion_vert[] = {
-    0x07230203, 0x00010000, 0x0008000a, 0x00000032, 0x00000000, 0x00020011,
+    0x07230203, 0x00010000, 0x0008000a, 0x00000035, 0x00000000, 0x00020011,
     0x00000001, 0x0006000b, 0x00000001, 0x4c534c47, 0x6474732e, 0x3035342e,
     0x00000000, 0x0003000e, 0x00000000, 0x00000001, 0x000b000f, 0x00000000,
     0x00000004, 0x6e69616d, 0x00000000, 0x0000000d, 0x00000012, 0x0000001c,
@@ -32,67 +32,81 @@ const uint32_t distortion_vert[] = {
     0x00030005, 0x0000000d, 0x00000000, 0x00050005, 0x00000012, 0x6f505f61,
     0x69746973, 0x00006e6f, 0x00050005, 0x0000001c, 0x65545f76, 0x6f6f4378,
     0x00736472, 0x00050005, 0x0000001d, 0x65545f61, 0x6f6f4378, 0x00736472,
-    0x00040005, 0x0000001f, 0x74535f75, 0x00747261, 0x00070005, 0x00000020,
+    0x00040005, 0x0000001f, 0x74535f75, 0x00747261, 0x00050005, 0x00000020,
+    0x736e6f63, 0x746e6174, 0x00000073, 0x00050006, 0x00000020, 0x00000000,
+    0x7466656c, 0x0000755f, 0x00050006, 0x00000020, 0x00000001, 0x68676972,
+    0x00755f74, 0x00050006, 0x00000020, 0x00000002, 0x5f706f74, 0x00000076,
+    0x00060006, 0x00000020, 0x00000003, 0x74746f62, 0x765f6d6f, 0x00000000,
+    0x00060005, 0x00000022, 0x68737550, 0x736e6f43, 0x746e6174, 0x00000073,
+    0x00040005, 0x0000002a, 0x6e455f75, 0x00000064, 0x00070005, 0x00000032,
     0x66696e55, 0x426d726f, 0x65666675, 0x6a624f72, 0x00746365, 0x00050006,
-    0x00000020, 0x00000000, 0x7466656c, 0x0000755f, 0x00050006, 0x00000020,
-    0x00000001, 0x68676972, 0x00755f74, 0x00050006, 0x00000020, 0x00000002,
-    0x5f706f74, 0x00000076, 0x00060006, 0x00000020, 0x00000003, 0x74746f62,
-    0x765f6d6f, 0x00000000, 0x00030005, 0x00000022, 0x006f6275, 0x00040005,
-    0x0000002a, 0x6e455f75, 0x00000064, 0x00050048, 0x0000000b, 0x00000000,
-    0x0000000b, 0x00000000, 0x00050048, 0x0000000b, 0x00000001, 0x0000000b,
-    0x00000001, 0x00050048, 0x0000000b, 0x00000002, 0x0000000b, 0x00000003,
-    0x00030047, 0x0000000b, 0x00000002, 0x00030047, 0x00000012, 0x00000000,
-    0x00040047, 0x00000012, 0x0000001e, 0x00000000, 0x00030047, 0x00000013,
-    0x00000000, 0x00030047, 0x0000001c, 0x00000000, 0x00040047, 0x0000001c,
-    0x0000001e, 0x00000000, 0x00030047, 0x0000001d, 0x00000000, 0x00040047,
-    0x0000001d, 0x0000001e, 0x00000001, 0x00030047, 0x0000001e, 0x00000000,
-    0x00030047, 0x0000001f, 0x00000000, 0x00040047, 0x0000001f, 0x0000001e,
-    0x00000001, 0x00040048, 0x00000020, 0x00000000, 0x00000000, 0x00050048,
-    0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00040048, 0x00000020,
-    0x00000001, 0x00000000, 0x00050048, 0x00000020, 0x00000001, 0x00000023,
-    0x00000004, 0x00040048, 0x00000020, 0x00000002, 0x00000000, 0x00050048,
-    0x00000020, 0x00000002, 0x00000023, 0x00000008, 0x00040048, 0x00000020,
-    0x00000003, 0x00000000, 0x00050048, 0x00000020, 0x00000003, 0x00000023,
-    0x0000000c, 0x00030047, 0x00000020, 0x00000002, 0x00040047, 0x00000022,
-    0x00000022, 0x00000000, 0x00040047, 0x00000022, 0x00000021, 0x00000001,
+    0x00000032, 0x00000000, 0x7466656c, 0x0000755f, 0x00050006, 0x00000032,
+    0x00000001, 0x68676972, 0x00755f74, 0x00050006, 0x00000032, 0x00000002,
+    0x5f706f74, 0x00000076, 0x00060006, 0x00000032, 0x00000003, 0x74746f62,
+    0x765f6d6f, 0x00000000, 0x00030005, 0x00000034, 0x006f6275, 0x00050048,
+    0x0000000b, 0x00000000, 0x0000000b, 0x00000000, 0x00050048, 0x0000000b,
+    0x00000001, 0x0000000b, 0x00000001, 0x00050048, 0x0000000b, 0x00000002,
+    0x0000000b, 0x00000003, 0x00030047, 0x0000000b, 0x00000002, 0x00030047,
+    0x00000012, 0x00000000, 0x00040047, 0x00000012, 0x0000001e, 0x00000000,
+    0x00030047, 0x00000013, 0x00000000, 0x00030047, 0x0000001c, 0x00000000,
+    0x00040047, 0x0000001c, 0x0000001e, 0x00000000, 0x00030047, 0x0000001d,
+    0x00000000, 0x00040047, 0x0000001d, 0x0000001e, 0x00000001, 0x00030047,
+    0x0000001e, 0x00000000, 0x00030047, 0x0000001f, 0x00000000, 0x00040047,
+    0x0000001f, 0x0000001e, 0x00000001, 0x00040048, 0x00000020, 0x00000000,
+    0x00000000, 0x00050048, 0x00000020, 0x00000000, 0x00000023, 0x00000000,
+    0x00040048, 0x00000020, 0x00000001, 0x00000000, 0x00050048, 0x00000020,
+    0x00000001, 0x00000023, 0x00000004, 0x00040048, 0x00000020, 0x00000002,
+    0x00000000, 0x00050048, 0x00000020, 0x00000002, 0x00000023, 0x00000008,
+    0x00040048, 0x00000020, 0x00000003, 0x00000000, 0x00050048, 0x00000020,
+    0x00000003, 0x00000023, 0x0000000c, 0x00030047, 0x00000020, 0x00000002,
     0x00030047, 0x00000025, 0x00000000, 0x00030047, 0x00000028, 0x00000000,
     0x00030047, 0x00000029, 0x00000000, 0x00030047, 0x0000002a, 0x00000000,
     0x00040047, 0x0000002a, 0x0000001e, 0x00000002, 0x00030047, 0x0000002d,
     0x00000000, 0x00030047, 0x00000030, 0x00000000, 0x00030047, 0x00000031,
-    0x00000000, 0x00020013, 0x00000002, 0x00030021, 0x00000003, 0x00000002,
-    0x00030016, 0x00000006, 0x00000020, 0x00040017, 0x00000007, 0x00000006,
-    0x00000004, 0x00040015, 0x00000008, 0x00000020, 0x00000000, 0x0004002b,
-    0x00000008, 0x00000009, 0x00000001, 0x0004001c, 0x0000000a, 0x00000006,
-    0x00000009, 0x0005001e, 0x0000000b, 0x00000007, 0x00000006, 0x0000000a,
-    0x00040020, 0x0000000c, 0x00000003, 0x0000000b, 0x0004003b, 0x0000000c,
-    0x0000000d, 0x00000003, 0x00040015, 0x0000000e, 0x00000020, 0x00000001,
-    0x0004002b, 0x0000000e, 0x0000000f, 0x00000000, 0x00040017, 0x00000010,
-    0x00000006, 0x00000002, 0x00040020, 0x00000011, 0x00000001, 0x00000010,
-    0x0004003b, 0x00000011, 0x00000012, 0x00000001, 0x0004002b, 0x00000006,
-    0x00000014, 0x00000000, 0x0004002b, 0x00000006, 0x00000015, 0x3f800000,
-    0x00040020, 0x00000019, 0x00000003, 0x00000007, 0x00040020, 0x0000001b,
-    0x00000003, 0x00000010, 0x0004003b, 0x0000001b, 0x0000001c, 0x00000003,
-    0x0004003b, 0x00000011, 0x0000001d, 0x00000001, 0x0004003b, 0x0000001b,
-    0x0000001f, 0x00000003, 0x0006001e, 0x00000020, 0x00000006, 0x00000006,
-    0x00000006, 0x00000006, 0x00040020, 0x00000021, 0x00000002, 0x00000020,
-    0x0004003b, 0x00000021, 0x00000022, 0x00000002, 0x00040020, 0x00000023,
-    0x00000002, 0x00000006, 0x0004002b, 0x0000000e, 0x00000026, 0x00000003,
-    0x0004003b, 0x0000001b, 0x0000002a, 0x00000003, 0x0004002b, 0x0000000e,
-    0x0000002b, 0x00000001, 0x0004002b, 0x0000000e, 0x0000002e, 0x00000002,
-    0x00050036, 0x00000002, 0x00000004, 0x00000000, 0x00000003, 0x000200f8,
-    0x00000005, 0x0004003d, 0x00000010, 0x00000013, 0x00000012, 0x00050051,
-    0x00000006, 0x00000016, 0x00000013, 0x00000000, 0x00050051, 0x00000006,
-    0x00000017, 0x00000013, 0x00000001, 0x00070050, 0x00000007, 0x00000018,
-    0x00000016, 0x00000017, 0x00000014, 0x00000015, 0x00050041, 0x00000019,
-    0x0000001a, 0x0000000d, 0x0000000f, 0x0003003e, 0x0000001a, 0x00000018,
-    0x0004003d, 0x00000010, 0x0000001e, 0x0000001d, 0x0003003e, 0x0000001c,
-    0x0000001e, 0x00050041, 0x00000023, 0x00000024, 0x00000022, 0x0000000f,
-    0x0004003d, 0x00000006, 0x00000025, 0x00000024, 0x00050041, 0x00000023,
-    0x00000027, 0x00000022, 0x00000026, 0x0004003d, 0x00000006, 0x00000028,
-    0x00000027, 0x00050050, 0x00000010, 0x00000029, 0x00000025, 0x00000028,
-    0x0003003e, 0x0000001f, 0x00000029, 0x00050041, 0x00000023, 0x0000002c,
-    0x00000022, 0x0000002b, 0x0004003d, 0x00000006, 0x0000002d, 0x0000002c,
-    0x00050041, 0x00000023, 0x0000002f, 0x00000022, 0x0000002e, 0x0004003d,
-    0x00000006, 0x00000030, 0x0000002f, 0x00050050, 0x00000010, 0x00000031,
-    0x0000002d, 0x00000030, 0x0003003e, 0x0000002a, 0x00000031, 0x000100fd,
-    0x00010038};
+    0x00000000, 0x00040048, 0x00000032, 0x00000000, 0x00000000, 0x00050048,
+    0x00000032, 0x00000000, 0x00000023, 0x00000000, 0x00040048, 0x00000032,
+    0x00000001, 0x00000000, 0x00050048, 0x00000032, 0x00000001, 0x00000023,
+    0x00000004, 0x00040048, 0x00000032, 0x00000002, 0x00000000, 0x00050048,
+    0x00000032, 0x00000002, 0x00000023, 0x00000008, 0x00040048, 0x00000032,
+    0x00000003, 0x00000000, 0x00050048, 0x00000032, 0x00000003, 0x00000023,
+    0x0000000c, 0x00030047, 0x00000032, 0x00000002, 0x00040047, 0x00000034,
+    0x00000022, 0x00000000, 0x00040047, 0x00000034, 0x00000021, 0x00000001,
+    0x00020013, 0x00000002, 0x00030021, 0x00000003, 0x00000002, 0x00030016,
+    0x00000006, 0x00000020, 0x00040017, 0x00000007, 0x00000006, 0x00000004,
+    0x00040015, 0x00000008, 0x00000020, 0x00000000, 0x0004002b, 0x00000008,
+    0x00000009, 0x00000001, 0x0004001c, 0x0000000a, 0x00000006, 0x00000009,
+    0x0005001e, 0x0000000b, 0x00000007, 0x00000006, 0x0000000a, 0x00040020,
+    0x0000000c, 0x00000003, 0x0000000b, 0x0004003b, 0x0000000c, 0x0000000d,
+    0x00000003, 0x00040015, 0x0000000e, 0x00000020, 0x00000001, 0x0004002b,
+    0x0000000e, 0x0000000f, 0x00000000, 0x00040017, 0x00000010, 0x00000006,
+    0x00000002, 0x00040020, 0x00000011, 0x00000001, 0x00000010, 0x0004003b,
+    0x00000011, 0x00000012, 0x00000001, 0x0004002b, 0x00000006, 0x00000014,
+    0x00000000, 0x0004002b, 0x00000006, 0x00000015, 0x3f800000, 0x00040020,
+    0x00000019, 0x00000003, 0x00000007, 0x00040020, 0x0000001b, 0x00000003,
+    0x00000010, 0x0004003b, 0x0000001b, 0x0000001c, 0x00000003, 0x0004003b,
+    0x00000011, 0x0000001d, 0x00000001, 0x0004003b, 0x0000001b, 0x0000001f,
+    0x00000003, 0x0006001e, 0x00000020, 0x00000006, 0x00000006, 0x00000006,
+    0x00000006, 0x00040020, 0x00000021, 0x00000009, 0x00000020, 0x0004003b,
+    0x00000021, 0x00000022, 0x00000009, 0x00040020, 0x00000023, 0x00000009,
+    0x00000006, 0x0004002b, 0x0000000e, 0x00000026, 0x00000003, 0x0004003b,
+    0x0000001b, 0x0000002a, 0x00000003, 0x0004002b, 0x0000000e, 0x0000002b,
+    0x00000001, 0x0004002b, 0x0000000e, 0x0000002e, 0x00000002, 0x0006001e,
+    0x00000032, 0x00000006, 0x00000006, 0x00000006, 0x00000006, 0x00040020,
+    0x00000033, 0x00000002, 0x00000032, 0x0004003b, 0x00000033, 0x00000034,
+    0x00000002, 0x00050036, 0x00000002, 0x00000004, 0x00000000, 0x00000003,
+    0x000200f8, 0x00000005, 0x0004003d, 0x00000010, 0x00000013, 0x00000012,
+    0x00050051, 0x00000006, 0x00000016, 0x00000013, 0x00000000, 0x00050051,
+    0x00000006, 0x00000017, 0x00000013, 0x00000001, 0x00070050, 0x00000007,
+    0x00000018, 0x00000016, 0x00000017, 0x00000014, 0x00000015, 0x00050041,
+    0x00000019, 0x0000001a, 0x0000000d, 0x0000000f, 0x0003003e, 0x0000001a,
+    0x00000018, 0x0004003d, 0x00000010, 0x0000001e, 0x0000001d, 0x0003003e,
+    0x0000001c, 0x0000001e, 0x00050041, 0x00000023, 0x00000024, 0x00000022,
+    0x0000000f, 0x0004003d, 0x00000006, 0x00000025, 0x00000024, 0x00050041,
+    0x00000023, 0x00000027, 0x00000022, 0x00000026, 0x0004003d, 0x00000006,
+    0x00000028, 0x00000027, 0x00050050, 0x00000010, 0x00000029, 0x00000025,
+    0x00000028, 0x0003003e, 0x0000001f, 0x00000029, 0x00050041, 0x00000023,
+    0x0000002c, 0x00000022, 0x0000002b, 0x0004003d, 0x00000006, 0x0000002d,
+    0x0000002c, 0x00050041, 0x00000023, 0x0000002f, 0x00000022, 0x0000002e,
+    0x0004003d, 0x00000006, 0x00000030, 0x0000002f, 0x00050050, 0x00000010,
+    0x00000031, 0x0000002d, 0x00000030, 0x0003003e, 0x0000002a, 0x00000031,
+    0x000100fd, 0x00010038};