Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Commit 89d07db

Browse files
MortimerGorobluemarvin
authored andcommitted
Add Wave 64 bit support (#1442)
1 parent c0ae7c5 commit 89d07db

5 files changed

Lines changed: 8 additions & 3 deletions

File tree

app/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ android {
170170
}
171171
}
172172
wavevr {
173+
minSdkVersion build_versions.min_sdk_wave
173174
dimension "platform"
174175
externalNativeBuild {
175176
cmake {
@@ -235,6 +236,8 @@ android {
235236
'svrArm64Release',
236237
'wavevrArmDebug',
237238
'wavevrArmRelease',
239+
'wavevrArm64Debug',
240+
'wavevrArm64Release',
238241
'noapiArmDebug',
239242
'noapiArmRelease',
240243
'noapiArm64Debug',

app/src/wavevr/cpp/DeviceDelegateWaveVR.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,8 @@ struct DeviceDelegateWaveVR::State {
135135
vrb::RenderContextPtr render = context.lock();
136136
for (int ix = 0; ix < WVR_GetTextureQueueLength(aTextureQueue); ix++) {
137137
vrb::FBOPtr fbo = vrb::FBO::Create(render);
138-
fbo->SetTextureHandle((GLuint)WVR_GetTexture(aTextureQueue, ix).id, renderWidth, renderHeight, attributes);
138+
uintptr_t handle = (uintptr_t)WVR_GetTexture(aTextureQueue, ix).id;
139+
fbo->SetTextureHandle((GLuint)handle, renderWidth, renderHeight, attributes);
139140
if (fbo->IsValid()) {
140141
aFBOQueue.push_back(fbo);
141142
} else {

app/src/wavevr/cpp/native-lib.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ int main(int argc, char *argv[]) {
6363

6464
// Must initialize render runtime before all OpenGL code.
6565
WVR_RenderInitParams_t param;
66-
param = { WVR_GraphicsApiType_OpenGL, WVR_RenderConfig_Timewarp_Asynchronous };
66+
param = { WVR_GraphicsApiType_OpenGL, WVR_RenderConfig_Default };
6767

6868
WVR_RenderError pError = WVR_RenderInit(&param);
6969
if (pError != WVR_RenderError_None) {

tools/taskcluster/build_targets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
'oculusvr': ['arm', 'arm64'],
3737
'oculusvrStore': ['arm', 'arm64'],
3838
'oculusvr3dofStore': ['arm', 'arm64'],
39-
'wavevr': ['arm'],
39+
'wavevr': ['arm', 'arm64'],
4040
'googlevr': ['arm', 'arm64'],
4141
'noapi': ['arm', 'arm64', 'x86'],
4242
'svr': ['arm', 'arm64'],

versions.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ ext.deps = deps
129129

130130
def build_versions = [:]
131131
build_versions.min_sdk = 24
132+
build_versions.min_sdk_wave = 25
132133
build_versions.target_sdk = 28
133134
build_versions.build_tools = "28.0.3"
134135
ext.build_versions = build_versions

0 commit comments

Comments
 (0)