Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Wave 64 bit support #1442

Merged
merged 1 commit into from
Jul 22, 2019
Merged

Add Wave 64 bit support #1442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ android {
}
}
wavevr {
minSdkVersion build_versions.min_sdk_wave
dimension "platform"
externalNativeBuild {
cmake {
Expand Down Expand Up @@ -235,6 +236,8 @@ android {
'svrArm64Release',
'wavevrArmDebug',
'wavevrArmRelease',
'wavevrArm64Debug',
'wavevrArm64Release',
'noapiArmDebug',
'noapiArmRelease',
'noapiArm64Debug',
Expand Down
3 changes: 2 additions & 1 deletion app/src/wavevr/cpp/DeviceDelegateWaveVR.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ struct DeviceDelegateWaveVR::State {
vrb::RenderContextPtr render = context.lock();
for (int ix = 0; ix < WVR_GetTextureQueueLength(aTextureQueue); ix++) {
vrb::FBOPtr fbo = vrb::FBO::Create(render);
fbo->SetTextureHandle((GLuint)WVR_GetTexture(aTextureQueue, ix).id, renderWidth, renderHeight, attributes);
uintptr_t handle = (uintptr_t)WVR_GetTexture(aTextureQueue, ix).id;
fbo->SetTextureHandle((GLuint)handle, renderWidth, renderHeight, attributes);
if (fbo->IsValid()) {
aFBOQueue.push_back(fbo);
} else {
Expand Down
2 changes: 1 addition & 1 deletion app/src/wavevr/cpp/native-lib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ int main(int argc, char *argv[]) {

// Must initialize render runtime before all OpenGL code.
WVR_RenderInitParams_t param;
param = { WVR_GraphicsApiType_OpenGL, WVR_RenderConfig_Timewarp_Asynchronous };
param = { WVR_GraphicsApiType_OpenGL, WVR_RenderConfig_Default };

WVR_RenderError pError = WVR_RenderInit(&param);
if (pError != WVR_RenderError_None) {
Expand Down
2 changes: 1 addition & 1 deletion tools/taskcluster/build_targets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
'oculusvr': ['arm', 'arm64'],
'oculusvrStore': ['arm', 'arm64'],
'oculusvr3dofStore': ['arm', 'arm64'],
'wavevr': ['arm'],
'wavevr': ['arm', 'arm64'],
'googlevr': ['arm', 'arm64'],
'noapi': ['arm', 'arm64', 'x86'],
'svr': ['arm', 'arm64'],
Expand Down
1 change: 1 addition & 0 deletions versions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ ext.deps = deps

def build_versions = [:]
build_versions.min_sdk = 24
build_versions.min_sdk_wave = 25
build_versions.target_sdk = 28
build_versions.build_tools = "28.0.3"
ext.build_versions = build_versions
Expand Down