The open source OpenXR runtime
aux/android: Update wrappers
+91
-33
+9
-7
src/xrt/auxiliary/android/org.freedesktop.monado.auxiliary.cpp
+9
-7
src/xrt/auxiliary/android/org.freedesktop.monado.auxiliary.cpp
···
1
-
// Copyright 2020, Collabora, Ltd.
1
+
// Copyright 2020-2021, Collabora, Ltd.
2
2
// SPDX-License-Identifier: BSL-1.0
3
3
/*!
4
4
* @file
···
14
14
namespace org::freedesktop::monado::auxiliary {
15
15
MonadoView::Meta::Meta(jni::jclass clazz)
16
16
: MetaBase(MonadoView::getTypeName(), clazz),
17
-
attachToActivity(classRef().getStaticMethod("attachToActivity",
18
-
"(Landroid/app/Activity;J)Lorg/freedesktop/"
19
-
"monado/auxiliary/MonadoView;")),
20
-
waitGetSurfaceHolder(classRef().getMethod("waitGetSurfaceHolder", "(I)Landroid/view/SurfaceHolder;")),
21
-
markAsDiscardedByNative(classRef().getMethod("markAsDiscardedByNative", "()V")),
17
+
attachToActivity(classRef().getStaticMethod(
18
+
"attachToActivity", "(Landroid/app/Activity;J)Lorg/freedesktop/monado/auxiliary/MonadoView;")),
19
+
attachToActivity1(classRef().getStaticMethod(
20
+
"attachToActivity", "(Landroid/app/Activity;)Lorg/freedesktop/monado/auxiliary/MonadoView;")),
22
21
getDisplayMetrics(classRef().getStaticMethod("getDisplayMetrics",
23
-
"(Landroid/app/Activity;)Landroid/util/DisplayMetrics;"))
22
+
"(Landroid/app/Activity;)Landroid/util/DisplayMetrics;")),
23
+
getNativePointer(classRef().getMethod("getNativePointer", "()J")),
24
+
markAsDiscardedByNative(classRef().getMethod("markAsDiscardedByNative", "()V")),
25
+
waitGetSurfaceHolder(classRef().getMethod("waitGetSurfaceHolder", "(I)Landroid/view/SurfaceHolder;"))
24
26
{}
25
27
} // namespace org::freedesktop::monado::auxiliary
26
28
} // namespace wrap
+57
-17
src/xrt/auxiliary/android/org.freedesktop.monado.auxiliary.hpp
+57
-17
src/xrt/auxiliary/android/org.freedesktop.monado.auxiliary.hpp
···
1
-
// Copyright 2020, Collabora, Ltd.
1
+
// Copyright 2020-2021, Collabora, Ltd.
2
2
// SPDX-License-Identifier: BSL-1.0
3
3
/*!
4
4
* @file
···
27
27
28
28
} // namespace wrap
29
29
30
+
30
31
namespace wrap {
31
32
namespace org::freedesktop::monado::auxiliary {
32
33
/*!
···
42
43
return "org/freedesktop/monado/auxiliary/MonadoView";
43
44
}
44
45
46
+
static constexpr const char *
47
+
getFullyQualifiedTypeName() noexcept
48
+
{
49
+
return "org.freedesktop.monado.auxiliary.MonadoView";
50
+
}
51
+
45
52
/*!
46
53
* Wrapper for the attachToActivity static method
47
54
*
48
55
* Java prototype:
49
-
* `public static org.freedesktop.monado.auxiliary.MonadoView
50
-
* attachToActivity(android.app.Activity, long);`
56
+
* `public static org.freedesktop.monado.auxiliary.MonadoView attachToActivity(android.app.Activity,
57
+
* long);`
51
58
*
52
-
* JNI signature:
53
-
* (Landroid/app/Activity;J)Lorg/freedesktop/monado/auxiliary/MonadoView;
59
+
* JNI signature: (Landroid/app/Activity;J)Lorg/freedesktop/monado/auxiliary/MonadoView;
54
60
*
55
61
*/
56
62
static MonadoView
57
63
attachToActivity(android::app::Activity const &activity, void *nativePointer);
58
64
59
65
/*!
60
-
* Wrapper for the waitGetSurfaceHolder method
66
+
* Wrapper for the attachToActivity static method
61
67
*
62
68
* Java prototype:
63
-
* `public android.view.SurfaceHolder
64
-
* waitGetSurfaceHolder(int);`
69
+
* `public static org.freedesktop.monado.auxiliary.MonadoView attachToActivity(android.app.Activity);`
65
70
*
66
-
* JNI signature: (I)Landroid/view/SurfaceHolder;
71
+
* JNI signature: (Landroid/app/Activity;)Lorg/freedesktop/monado/auxiliary/MonadoView;
67
72
*
68
73
*/
69
-
android::view::SurfaceHolder
70
-
waitGetSurfaceHolder(int32_t wait_ms);
74
+
static MonadoView
75
+
attachToActivity(android::app::Activity const &activity);
76
+
77
+
/*!
78
+
* Wrapper for the getDisplayMetrics static method
79
+
*
80
+
* Java prototype:
81
+
* `public static android.util.DisplayMetrics getDisplayMetrics(android.app.Activity);`
82
+
*
83
+
* JNI signature: (Landroid/app/Activity;)Landroid/util/DisplayMetrics;
84
+
*
85
+
*/
86
+
static jni::Object
87
+
getDisplayMetrics(android::app::Activity const &activity);
88
+
89
+
/*!
90
+
* Wrapper for the getNativePointer method
91
+
*
92
+
* Java prototype:
93
+
* `public long getNativePointer();`
94
+
*
95
+
* JNI signature: ()J
96
+
*
97
+
*/
98
+
void *
99
+
getNativePointer();
71
100
72
101
/*!
73
102
* Wrapper for the markAsDiscardedByNative method
···
81
110
void
82
111
markAsDiscardedByNative();
83
112
84
-
85
-
static jni::Object
86
-
getDisplayMetrics(android::app::Activity const &activity);
113
+
/*!
114
+
* Wrapper for the waitGetSurfaceHolder method
115
+
*
116
+
* Java prototype:
117
+
* `public android.view.SurfaceHolder waitGetSurfaceHolder(int);`
118
+
*
119
+
* JNI signature: (I)Landroid/view/SurfaceHolder;
120
+
*
121
+
*/
122
+
android::view::SurfaceHolder
123
+
waitGetSurfaceHolder(int32_t wait_ms);
87
124
88
125
/*!
89
126
* Initialize the static metadata of this wrapper with a known
···
101
138
struct Meta : public MetaBase
102
139
{
103
140
jni::method_t attachToActivity;
104
-
jni::method_t waitGetSurfaceHolder;
105
-
jni::method_t markAsDiscardedByNative;
141
+
jni::method_t attachToActivity1;
106
142
jni::method_t getDisplayMetrics;
143
+
jni::method_t getNativePointer;
144
+
jni::method_t markAsDiscardedByNative;
145
+
jni::method_t waitGetSurfaceHolder;
107
146
108
147
/*!
109
148
* Singleton accessor
···
116
155
}
117
156
118
157
private:
119
-
Meta(jni::jclass clazz);
158
+
explicit Meta(jni::jclass clazz);
120
159
};
121
160
};
161
+
122
162
} // namespace org::freedesktop::monado::auxiliary
123
163
} // namespace wrap
124
164
#include "org.freedesktop.monado.auxiliary.impl.hpp"
+25
-9
src/xrt/auxiliary/android/org.freedesktop.monado.auxiliary.impl.hpp
+25
-9
src/xrt/auxiliary/android/org.freedesktop.monado.auxiliary.impl.hpp
···
1
-
// Copyright 2020, Collabora, Ltd.
1
+
// Copyright 2020-2021, Collabora, Ltd.
2
2
// SPDX-License-Identifier: BSL-1.0
3
3
/*!
4
4
* @file
···
13
13
#include "wrap/android.app.h"
14
14
#include "wrap/android.view.h"
15
15
16
+
16
17
namespace wrap {
17
18
namespace org::freedesktop::monado::auxiliary {
18
19
inline MonadoView
···
20
21
{
21
22
return MonadoView(Meta::data().clazz().call<jni::Object>(
22
23
Meta::data().attachToActivity, activity.object(),
23
-
static_cast<long long>(reinterpret_cast<intptr_t>(nativePointer))));
24
+
static_cast<long long>(reinterpret_cast<uintptr_t>(nativePointer))));
25
+
}
26
+
27
+
inline MonadoView
28
+
MonadoView::attachToActivity(android::app::Activity const &activity)
29
+
{
30
+
return MonadoView(
31
+
Meta::data().clazz().call<jni::Object>(Meta::data().attachToActivity1, activity.object()));
24
32
}
25
33
26
-
inline android::view::SurfaceHolder
27
-
MonadoView::waitGetSurfaceHolder(int32_t wait_ms)
34
+
inline jni::Object
35
+
MonadoView::getDisplayMetrics(android::app::Activity const &activity)
36
+
{
37
+
return Meta::data().clazz().call<jni::Object>(Meta::data().getDisplayMetrics, activity.object());
38
+
}
39
+
40
+
inline void *
41
+
MonadoView::getNativePointer()
28
42
{
29
43
assert(!isNull());
30
-
return android::view::SurfaceHolder(
31
-
object().call<jni::Object>(Meta::data().waitGetSurfaceHolder, wait_ms));
44
+
return reinterpret_cast<void *>(
45
+
static_cast<intptr_t>(object().call<long long>(Meta::data().getNativePointer)));
32
46
}
33
47
34
48
inline void
···
38
52
return object().call<void>(Meta::data().markAsDiscardedByNative);
39
53
}
40
54
41
-
inline jni::Object
42
-
MonadoView::getDisplayMetrics(android::app::Activity const &activity)
55
+
inline android::view::SurfaceHolder
56
+
MonadoView::waitGetSurfaceHolder(int32_t wait_ms)
43
57
{
44
-
return Meta::data().clazz().call<jni::Object>(Meta::data().getDisplayMetrics, activity.object());
58
+
assert(!isNull());
59
+
return android::view::SurfaceHolder(
60
+
object().call<jni::Object>(Meta::data().waitGetSurfaceHolder, wait_ms));
45
61
}
46
62
47
63
} // namespace org::freedesktop::monado::auxiliary