Skip to content
This repository was archived by the owner on Nov 8, 2019. It is now read-only.

Commit 6aef4ab

Browse files
cyisraelcyisrael
committed
GVR Android SDK v1.101.0
1 parent 2b8db5b commit 6aef4ab

37 files changed

+93
-59
lines changed

Diff for: ‎apks/controller_emulator.apk

5.25 KB
Binary file not shown.

Diff for: ‎build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ task clean(type: Delete) {
3333
// The dependencies for NDK builds live inside the .aar files so they need to
3434
// be extracted before NDK targets can build.
3535
task extractAudioSo(type: Copy) {
36-
from zipTree("${project.rootDir}/libraries/sdk-audio-1.100.0.aar")
36+
from zipTree("${project.rootDir}/libraries/sdk-audio-1.101.0.aar")
3737
into "${project.rootDir}/libraries/"
3838
include "jni/**/libgvr_audio.so"
3939
}
4040

4141
task extractGvrSo(type: Copy) {
42-
from zipTree("${project.rootDir}/libraries/sdk-base-1.100.0.aar")
42+
from zipTree("${project.rootDir}/libraries/sdk-base-1.101.0.aar")
4343
into "${project.rootDir}/libraries/"
4444
include "jni/**/libgvr.so"
4545
}

Diff for: ‎libraries/headers/vr/gvr/capi/include/gvr.h

+23-1
Original file line numberDiff line numberDiff line change
@@ -775,6 +775,23 @@ gvr_sizei gvr_frame_get_buffer_size(const gvr_frame* frame, int32_t index);
775775
/// submitted.
776776
int32_t gvr_frame_get_framebuffer_object(const gvr_frame* frame, int32_t index);
777777

778+
/// Gets the hardware buffer backing the specified frame buffer.
779+
///
780+
/// Hardware buffers (Android NDK type AHardwareBuffer) are used to back frames
781+
/// if asynchronous reprojection is enabled and GVR_FEATURE_HARDWARE_BUFFERS is
782+
/// supported (currently on Android O and later Android versions). See the
783+
/// documentation for the feature enum value for further information.
784+
///
785+
/// There is no need to acquire or release the AHardwareBuffer. The swap chain
786+
/// maintains a reference to it while the frame is acquired.
787+
///
788+
/// @param frame The gvr_frame from which to obtain the buffer.
789+
/// @param index Index of the pixel buffer.
790+
/// @return Pointer to AHardwareBuffer backing the frame's pixel buffer where
791+
/// available, or NULL otherwise.
792+
AHardwareBuffer* gvr_frame_get_hardware_buffer(const gvr_frame* frame,
793+
int32_t index);
794+
778795
/// Submits the frame for distortion and display on the screen. The passed
779796
/// pointer is nulled to prevent reuse.
780797
///
@@ -1273,10 +1290,15 @@ class Frame : public WrapperBase<gvr_frame> {
12731290
}
12741291

12751292
/// For more information, see gvr_frame_get_framebuffer_object().
1276-
int32_t GetFramebufferObject(int32_t index) {
1293+
int32_t GetFramebufferObject(int32_t index) const {
12771294
return gvr_frame_get_framebuffer_object(cobj(), index);
12781295
}
12791296

1297+
/// For more information, see gvr_frame_get_hardware_buffer().
1298+
void* GetHardwareBuffer(int32_t index) const {
1299+
return gvr_frame_get_hardware_buffer(cobj(), index);
1300+
}
1301+
12801302
/// For more information, see gvr_frame_submit().
12811303
void Submit(const BufferViewportList& viewport_list,
12821304
const Mat4f& head_space_from_start_space) {

Diff for: ‎libraries/headers/vr/gvr/capi/include/gvr_types.h

+12
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,15 @@ typedef enum {
7272
/// Support for providing head poses with 6 degrees-of-freedom (orientation
7373
/// and position).
7474
GVR_FEATURE_HEAD_POSE_6DOF = 3,
75+
/// Indicates that buffers which are part of a frame are backed by Android
76+
/// AHardwareBuffer objects. When this feature is available, the function
77+
/// gvr_frame_get_hardware_buffer can be called to get the AHardwareBuffer
78+
/// pointer.
79+
/// Hardware buffers are only supported on Android O and later, on a
80+
/// best-effort basis. Future versions of GVR and/or Android may also cease to
81+
/// support hardware buffers if the underlying implementation no longer
82+
/// supports this rendering path.
83+
GVR_FEATURE_HARDWARE_BUFFERS = 4,
7584
} gvr_feature;
7685

7786
/// @}
@@ -682,6 +691,9 @@ typedef enum {
682691

683692
/// @}
684693

694+
// Forward declaration of Android AHardwareBuffer.
695+
typedef struct AHardwareBuffer AHardwareBuffer;
696+
685697
#ifdef __cplusplus
686698
} // extern "C"
687699
#endif

Diff for: ‎libraries/sdk-audio-1.100.0.aar renamed to ‎libraries/sdk-audio-1.101.0.aar

831 KB
Binary file not shown.

Diff for: ‎libraries/sdk-audio-1.100.0.pom renamed to ‎libraries/sdk-audio-1.101.0.pom

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.google.vr</groupId>
66
<artifactId>sdk-audio</artifactId>
7-
<version>1.100.0</version>
7+
<version>1.101.0</version>
88
<packaging>aar</packaging>
99

1010
<name>Google VR SDK-Audio</name>
@@ -19,7 +19,7 @@
1919
<groupId>com.google.vr</groupId>
2020
<artifactId>sdk-base</artifactId>
2121
<type>aar</type>
22-
<version>1.100.0</version>
22+
<version>1.101.0</version>
2323
</dependency>
2424
</dependencies>
2525
</project>

Diff for: ‎libraries/sdk-base-1.100.0.aar

-2.51 MB
Binary file not shown.

Diff for: ‎libraries/sdk-base-1.101.0.aar

2.51 MB
Binary file not shown.

Diff for: ‎libraries/sdk-base-1.100.0.pom renamed to ‎libraries/sdk-base-1.101.0.pom

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.google.vr</groupId>
66
<artifactId>sdk-base</artifactId>
7-
<version>1.100.0</version>
7+
<version>1.101.0</version>
88
<packaging>aar</packaging>
99

1010
<name>Google VR SDK-Base</name>
@@ -19,7 +19,7 @@
1919
<groupId>com.google.vr</groupId>
2020
<artifactId>sdk-common</artifactId>
2121
<type>aar</type>
22-
<version>1.100.0</version>
22+
<version>1.101.0</version>
2323
</dependency>
2424
</dependencies>
2525
</project>

Diff for: ‎libraries/sdk-common-1.100.0.aar

-695 KB
Binary file not shown.

Diff for: ‎libraries/sdk-common-1.101.0.aar

696 KB
Binary file not shown.

Diff for: ‎libraries/sdk-common-1.100.0.pom renamed to ‎libraries/sdk-common-1.101.0.pom

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.google.vr</groupId>
66
<artifactId>sdk-common</artifactId>
7-
<version>1.100.0</version>
7+
<version>1.101.0</version>
88
<packaging>aar</packaging>
99

1010
<name>Google VR SDK-Common</name>

Diff for: ‎libraries/sdk-commonwidget-1.100.0.aar

-31.2 KB
Binary file not shown.

Diff for: ‎libraries/sdk-commonwidget-1.101.0.aar

31.2 KB
Binary file not shown.

Diff for: ‎libraries/sdk-commonwidget-1.100.0.pom renamed to ‎libraries/sdk-commonwidget-1.101.0.pom

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.google.vr</groupId>
66
<artifactId>sdk-commonwidget</artifactId>
7-
<version>1.100.0</version>
7+
<version>1.101.0</version>
88
<packaging>aar</packaging>
99

1010
<name>Google VR SDK-CommonWidget</name>
@@ -19,7 +19,7 @@
1919
<groupId>com.google.vr</groupId>
2020
<artifactId>sdk-common</artifactId>
2121
<type>aar</type>
22-
<version>1.100.0</version>
22+
<version>1.101.0</version>
2323
</dependency>
2424
</dependencies>
2525
</project>

Diff for: ‎libraries/sdk-controller-1.100.0.aar renamed to ‎libraries/sdk-controller-1.101.0.aar

9.45 KB
Binary file not shown.

Diff for: ‎libraries/sdk-controller-1.100.0.pom renamed to ‎libraries/sdk-controller-1.101.0.pom

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.google.vr</groupId>
66
<artifactId>sdk-controller</artifactId>
7-
<version>1.100.0</version>
7+
<version>1.101.0</version>
88
<packaging>aar</packaging>
99

1010
<name>Google VR SDK-Controller</name>
@@ -19,7 +19,7 @@
1919
<groupId>com.google.vr</groupId>
2020
<artifactId>sdk-base</artifactId>
2121
<type>aar</type>
22-
<version>1.100.0</version>
22+
<version>1.101.0</version>
2323
</dependency>
2424
</dependencies>
2525
</project>

Diff for: ‎libraries/sdk-panowidget-1.100.0.aar

-3.04 MB
Binary file not shown.

Diff for: ‎libraries/sdk-panowidget-1.101.0.aar

3.04 MB
Binary file not shown.

Diff for: ‎libraries/sdk-panowidget-1.100.0.pom renamed to ‎libraries/sdk-panowidget-1.101.0.pom

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.google.vr</groupId>
66
<artifactId>sdk-panowidget</artifactId>
7-
<version>1.100.0</version>
7+
<version>1.101.0</version>
88
<packaging>aar</packaging>
99

1010
<name>Google VR SDK-CommonWidget</name>
@@ -19,7 +19,7 @@
1919
<groupId>com.google.vr</groupId>
2020
<artifactId>sdk-commonwidget</artifactId>
2121
<type>aar</type>
22-
<version>1.100.0</version>
22+
<version>1.101.0</version>
2323
</dependency>
2424
</dependencies>
2525
</project>

Diff for: ‎libraries/sdk-videowidget-1.100.0.aar

-3.43 MB
Binary file not shown.

Diff for: ‎libraries/sdk-videowidget-1.101.0.aar

3.44 MB
Binary file not shown.

Diff for: ‎libraries/sdk-videowidget-1.100.0.pom renamed to ‎libraries/sdk-videowidget-1.101.0.pom

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.google.vr</groupId>
66
<artifactId>sdk-videowidget</artifactId>
7-
<version>1.100.0</version>
7+
<version>1.101.0</version>
88
<packaging>aar</packaging>
99

1010
<name>Google VR SDK-CommonWidget</name>
@@ -32,7 +32,7 @@
3232
<groupId>com.google.vr</groupId>
3333
<artifactId>sdk-commonwidget</artifactId>
3434
<type>aar</type>
35-
<version>1.100.0</version>
35+
<version>1.101.0</version>
3636
</dependency>
3737
</dependencies>
3838
</project>

Diff for: ‎samples/ndk-controllerpaint/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apply plugin: 'com.android.model.application'
22

33
model {
44
android {
5-
compileSdkVersion = 25
6-
buildToolsVersion = "25.0.0"
5+
compileSdkVersion = 26
6+
buildToolsVersion = "26.0.0"
77

88
defaultConfig.with {
99
applicationId = "com.google.vr.ndk.samples.controllerpaint"
@@ -15,8 +15,8 @@ model {
1515
}
1616
android.buildTypes {
1717
release {
18-
minifyEnabled = false
19-
proguardFiles.add(file('proguard-android.txt'))
18+
minifyEnabled = true
19+
proguardFiles.add(file('../../proguard-gvr.txt'))
2020
}
2121
}
2222
android.ndk {
@@ -53,7 +53,7 @@ model {
5353
}
5454

5555
dependencies {
56-
compile 'com.google.vr:sdk-base:1.100.0'
56+
compile 'com.google.vr:sdk-base:1.101.0'
5757
}
5858

5959
build.dependsOn(':extractNdk')

Diff for: ‎samples/ndk-controllerpaint/src/main/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.google.vr.ndk.samples.controllerpaint"
4-
android:versionCode="170912063"
5-
android:versionName="1.100.0">
4+
android:versionCode="170912043"
5+
android:versionName="1.101.0">
66

77
<!-- The Daydream SDK requires API 24+ and OpenGL ES 3.2+. -->
88
<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="24" />

Diff for: ‎samples/ndk-treasurehunt/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apply plugin: 'com.android.model.application'
22

33
model {
44
android {
5-
compileSdkVersion = 25
6-
buildToolsVersion = "25.0.0"
5+
compileSdkVersion = 26
6+
buildToolsVersion = "26.0.0"
77

88
defaultConfig.with {
99
applicationId = "com.google.vr.ndk.samples.treasurehunt"
@@ -15,8 +15,8 @@ model {
1515
}
1616
android.buildTypes {
1717
release {
18-
minifyEnabled = false
19-
proguardFiles.add(file('proguard-android.txt'))
18+
minifyEnabled = true
19+
proguardFiles.add(file('../../proguard-gvr.txt'))
2020
}
2121
}
2222
android.ndk {
@@ -54,8 +54,8 @@ model {
5454
}
5555

5656
dependencies {
57-
compile 'com.google.vr:sdk-audio:1.100.0'
58-
compile 'com.google.vr:sdk-base:1.100.0'
57+
compile 'com.google.vr:sdk-audio:1.101.0'
58+
compile 'com.google.vr:sdk-base:1.101.0'
5959
}
6060

6161
build.dependsOn(':extractNdk')

Diff for: ‎samples/ndk-treasurehunt/src/main/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.google.vr.ndk.samples.treasurehunt"
4-
android:versionCode="170912063"
5-
android:versionName="1.100.0">
4+
android:versionCode="170912043"
5+
android:versionName="1.101.0">
66

77
<!-- The GVR SDK requires API 19+ and OpenGL ES 2+. -->
88
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="24" />

Diff for: ‎samples/sdk-controllerclient/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ apply plugin: 'com.android.model.application'
1717

1818
model {
1919
android {
20-
compileSdkVersion 25
21-
buildToolsVersion "25.0.0"
20+
compileSdkVersion 26
21+
buildToolsVersion "26.0.0"
2222

2323
defaultConfig {
2424
minSdkVersion.apiLevel 24
@@ -37,6 +37,6 @@ model {
3737
}
3838

3939
dependencies {
40-
compile 'com.google.vr:sdk-base:1.100.0'
41-
compile 'com.google.vr:sdk-controller:1.100.0'
40+
compile 'com.google.vr:sdk-base:1.101.0'
41+
compile 'com.google.vr:sdk-controller:1.101.0'
4242
}

Diff for: ‎samples/sdk-controllerclient/src/main/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.google.vr.sdk.samples.controllerclient"
4-
android:versionCode="170912063"
5-
android:versionName="1.100.0">
4+
android:versionCode="170912043"
5+
android:versionName="1.101.0">
66
<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="24" />
77
<uses-feature android:glEsVersion="0x00030002" android:required="true" />
88

Diff for: ‎samples/sdk-simplepanowidget/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ apply plugin: 'com.android.model.application'
1717

1818
model {
1919
android {
20-
compileSdkVersion 25
21-
buildToolsVersion "25.0.0"
20+
compileSdkVersion 26
21+
buildToolsVersion "26.0.0"
2222

2323
defaultConfig {
2424
minSdkVersion.apiLevel 19
@@ -37,5 +37,5 @@ model {
3737
}
3838

3939
dependencies {
40-
compile 'com.google.vr:sdk-panowidget:1.100.0'
40+
compile 'com.google.vr:sdk-panowidget:1.101.0'
4141
}

Diff for: ‎samples/sdk-simplepanowidget/src/main/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.google.vr.sdk.samples.simplepanowidget"
4-
android:versionCode="170912063"
5-
android:versionName="1.100.0">
4+
android:versionCode="170912043"
5+
android:versionName="1.101.0">
66
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="22" />
77
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
88

Diff for: ‎samples/sdk-simplevideowidget/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ apply plugin: 'com.android.model.application'
1717

1818
model {
1919
android {
20-
compileSdkVersion 25
21-
buildToolsVersion "25.0.0"
20+
compileSdkVersion 26
21+
buildToolsVersion "26.0.0"
2222

2323
defaultConfig {
2424
minSdkVersion.apiLevel 19
@@ -37,5 +37,5 @@ model {
3737
}
3838

3939
dependencies {
40-
compile 'com.google.vr:sdk-videowidget:1.100.0'
40+
compile 'com.google.vr:sdk-videowidget:1.101.0'
4141
}

Diff for: ‎samples/sdk-simplevideowidget/src/main/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.google.vr.sdk.samples.simplevideowidget"
4-
android:versionCode="170912063"
5-
android:versionName="1.100.0">
4+
android:versionCode="170912043"
5+
android:versionName="1.101.0">
66

77
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="22" />
88
<uses-feature android:glEsVersion="0x00020000" android:required="true" />

Diff for: ‎samples/sdk-treasurehunt/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ apply plugin: 'com.android.model.application'
1717

1818
model {
1919
android {
20-
compileSdkVersion 25
21-
buildToolsVersion "25.0.0"
20+
compileSdkVersion 26
21+
buildToolsVersion "26.0.0"
2222

2323
defaultConfig {
2424
minSdkVersion.apiLevel 19
@@ -37,6 +37,6 @@ model {
3737
}
3838

3939
dependencies {
40-
compile 'com.google.vr:sdk-audio:1.100.0'
41-
compile 'com.google.vr:sdk-base:1.100.0'
40+
compile 'com.google.vr:sdk-audio:1.101.0'
41+
compile 'com.google.vr:sdk-base:1.101.0'
4242
}

0 commit comments

Comments
 (0)