archive/CitraVR
1
0
Fork 0
mirror of https://github.com/amwatson/CitraVR.git synced 2024-09-20 03:11:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove tryCreateSwapchain from loop (just error if it doesn't succeed on first try -- shouldn't be lifecycle dependent in this variation), fix UILayer destructor

Browse source
This commit is contained in:
amwatson 2024-02-11 23:46:25 -06:00
parent feedbba5fe
commit 64319f6b44
3 changed files with 46 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/android/app/src/main/jni/vr/layers/UILayer.cpp
View file

@ -213,7 +213,7 @@ bool UILayer::GetRayIntersectionWithPanel(const XrVector3f& start,
scale, start, end, result2d, result3d);
}
// Next error code: -7
// Next error code: -8
int32_t UILayer::Init(const std::string& className, const jobject activityObject,
const XrVector3f& position, const XrSession& session) {
mVrUILayerClass = JniUtils::GetGlobalClassReference(mEnv, activityObject, className.c_str());
@ -236,38 +236,47 @@ int32_t UILayer::Init(const std::string& className, const jobject activityObject
mSendClickToUIMethodID = mEnv->GetMethodID(mVrUILayerClass, "sendClickToUI", "(FFI)I");
BAIL_ON_COND(mSendClickToUIMethodID == nullptr, "could not find sendClickToUI()", -6);
BAIL_ON_ERR(CreateSwapchain(), -7);
return 0;
}
void UILayer::Shutdown() {
xrDestroySwapchain(mSwapchain.mHandle);
mSwapchain.mHandle = XR_NULL_HANDLE;
mSwapchain.mWidth = 0;
mSwapchain.mHeight = 0;
mEnv->DeleteGlobalRef(mVrUILayerClass);
mVrUILayerClass = nullptr;
mEnv->DeleteGlobalRef(mVrUILayerObject);
mVrUILayerClass = nullptr;
}
void UILayer::TryCreateSwapchain() {
assert(!mIsSwapchainCreated);
int UILayer::CreateSwapchain() {
{
AndroidWindowBounds viewBounds;
{
if (mEnv->ExceptionCheck()) { mEnv->ExceptionClear(); }
const jint ret =
mEnv->CallIntMethod(mVrUILayerObject, mGetBoundsMethodID, BoundsHandle(&viewBounds).l);
// Check for exceptions (and log them).
if (mEnv->ExceptionCheck()) {
mEnv->ExceptionDescribe();
mEnv->ExceptionClear();
FAIL("Exception in getBoundsForView()");
}
if (ret < 0) {
ALOGE("{}() returned error {}", __FUNCTION__, ret);
return;
}
if (viewBounds.Width() == 0 || viewBounds.Height() == 0) {
ALOGE("{}() returned invalid bounds {} x {}", __FUNCTION__, viewBounds.Width(),
viewBounds.Height());
return;
}
if (mEnv->ExceptionCheck()) { mEnv->ExceptionClear(); }
const jint ret =
mEnv->CallIntMethod(mVrUILayerObject, mGetBoundsMethodID, BoundsHandle(&viewBounds).l);
// Check for exceptions (and log them).
if (mEnv->ExceptionCheck()) {
mEnv->ExceptionDescribe();
mEnv->ExceptionClear();
FAIL("Exception in getBoundsForView()");
}
if (ret < 0) {
ALOGE("{}() returned error {}", __FUNCTION__, ret);
return -1;
}
if (viewBounds.Width() == 0 || viewBounds.Height() == 0) {
ALOGE("{}() returned invalid bounds {} x {}", __FUNCTION__, viewBounds.Width(),
viewBounds.Height());
return -2;
}
mSwapchain.mWidth = viewBounds.Width();
mSwapchain.mHeight = viewBounds.Height();
}
// Initialize swapchain.
{
XrSwapchainCreateInfo swapchainCreateInfo;
@ -278,8 +287,8 @@ void UILayer::TryCreateSwapchain() {
XR_SWAPCHAIN_USAGE_SAMPLED_BIT | XR_SWAPCHAIN_USAGE_COLOR_ATTACHMENT_BIT;
swapchainCreateInfo.format = 0;
swapchainCreateInfo.sampleCount = 0;
swapchainCreateInfo.width = viewBounds.Width();
swapchainCreateInfo.height = viewBounds.Height();
swapchainCreateInfo.width = mSwapchain.mWidth;
swapchainCreateInfo.height = mSwapchain.mHeight;
swapchainCreateInfo.faceCount = 0;
swapchainCreateInfo.arraySize = 0;
swapchainCreateInfo.mipCount = 0;
@ -296,20 +305,18 @@ void UILayer::TryCreateSwapchain() {
OXR(pfnCreateSwapchainAndroidSurfaceKHR(mSession, &swapchainCreateInfo, &mSwapchain.mHandle,
&mSurface));
mSwapchain.mWidth = viewBounds.Width();
mSwapchain.mHeight = viewBounds.Height();
ALOGD("UILayer: created swapchain {}x{}", mSwapchain.mWidth, mSwapchain.mHeight);
mIsSwapchainCreated = true;
mEnv->CallIntMethod(mVrUILayerObject, mSetSurfaceMethodId, mSurface,
(int)viewBounds.Width(), (int)viewBounds.Height());
(int)mSwapchain.mWidth, (int)mSwapchain.mHeight);
if (mEnv->ExceptionCheck()) {
mEnv->ExceptionDescribe();
mEnv->ExceptionClear();
FAIL("Exception in setSurface()");
}
}
return 0;
}
void UILayer::SendClickToUI(const XrVector2f& pos2d, const int type) {

14
src/android/app/src/main/jni/vr/layers/UILayer.h
View file

@ -115,14 +115,6 @@ public:
XrVector2f& result2d,
XrPosef& result3d) const;
/** Returns whether the swapchain is created
*/
bool IsSwapchainCreated() const { return mIsSwapchainCreated; }
/** Creates the swapchain.
*/
void TryCreateSwapchain();
/** Forwards the click event to the corresponding position on the Android UI window.
* @param pos2d the 2D position of the click in the Android display coordinate
* system.
@ -136,7 +128,11 @@ private:
const XrSession& session);
void Shutdown();
bool mIsSwapchainCreated = false;
/** Creates the swapchain.
* @return 0 on success, error code less than 0 on failure.
*/
int CreateSwapchain();
const XrSession mSession;
Swapchain mSwapchain;

14
src/android/app/src/main/jni/vr/vr_main.cpp
View file

@ -417,9 +417,6 @@ private:
}
}
if (!mKeyboardLayer->IsSwapchainCreated()) { mKeyboardLayer->TryCreateSwapchain(); }
if (!mErrorMessageLayer->IsSwapchainCreated()) { mErrorMessageLayer->TryCreateSwapchain(); }
////////////////////////////////
// XrWaitFrame()
////////////////////////////////
@ -495,13 +492,10 @@ private:
mGameSurfaceLayer->Frame(gOpenXr->mLocalSpace, layers, layerCount);
if (mErrorMessageLayer->IsSwapchainCreated() && mShouldShowErrorMessage) {
if (mShouldShowErrorMessage) {
mErrorMessageLayer->Frame(gOpenXr->mLocalSpace, layers, layerCount);
}
if (mKeyboardLayer->IsSwapchainCreated() && mIsKeyboardActive) {
mKeyboardLayer->Frame(gOpenXr->mLocalSpace, layers, layerCount);
}
if (mIsKeyboardActive) { mKeyboardLayer->Frame(gOpenXr->mLocalSpace, layers, layerCount); }
{
{
@ -538,14 +532,14 @@ private:
// Hit-test panels in order of priority (and known depth)
if (mErrorMessageLayer->IsSwapchainCreated() && mShouldShowErrorMessage) {
if (mShouldShowErrorMessage) {
shouldRenderCursor = mErrorMessageLayer->GetRayIntersectionWithPanel(
start, end, cursorPos2d, cursorPose3d);
if (triggerState.changedSinceLastSync) {
mErrorMessageLayer->SendClickToUI(cursorPos2d,
triggerState.currentState);
}
} else if (mKeyboardLayer->IsSwapchainCreated() && mIsKeyboardActive) {
} else if (mIsKeyboardActive) {
shouldRenderCursor = mKeyboardLayer->GetRayIntersectionWithPanel(
start, end, cursorPos2d, cursorPose3d);
if (triggerState.changedSinceLastSync) {