ml
d2dc58391b
build / build (push) Successful in 2m26s
- xr_input.c/h: an OpenXR action set (aim pose, trigger/select click, a menu-toggle button) plus ray/quad hit-testing, and a visible laser-pointer line drawn from the controller toward the hit point. - xr_menu.c/h + MenuOverlay.java: a second composition-layer quad, toggled by a controller button, showing an off-screen, never-attached Android View tree (one "Keyboard" button so far) driven by synthetic touch events computed from the laser ray's hit UV. - Migrate gl4es from a prebuilt binary baked into the Docker build-image to a vendored source snapshot (android/gl4es-src/) compiled from source at APK build time via CMake add_subdirectory(), patched through a new android/gl4es-patches/ (mirrors the existing engine-patches/ pattern). This was needed to track down and fix a bug hit while building the menu: gl4es's fixed-pipeline emulation (fpe.c) was unconditionally substituting its own shader onto the menu's draw call (fpe_ReleventState() always sets alphafunc to a nonzero sentinel, so its fpe_IsEmpty() check could never see the state as empty), making the menu quad show the game's own rendering instead of its own content. Fixed by routing the menu's blit through a real glBlitFramebuffer() call instead of a shader-based draw, which gl4es's fpe.c has nothing to intercept - documented in README.md's new "Debugging notes" section. - Renumber android/engine-patches/ to close the gap left by removing an unrelated diagnostic-only patch, and strip investigation-journal comments and dead diagnostic code (temporary tracing, env-var probes) left over from finding the bug above. - Restructure README.md into numbered sections, document every engine/gl4es patch, add Android Studio dev/testing-cycle instructions, and generalize Quest-specific wording to any OpenXR headset. Update NOTICE.txt to match (gl4es is now vendored/patched source, not a prebuilt binary; add the OpenXR-SDK loader).
183 lines
6.0 KiB
C
183 lines
6.0 KiB
C
#ifndef __eglplatform_h_
|
|
#define __eglplatform_h_
|
|
|
|
/*
|
|
** Copyright (c) 2007-2016 The Khronos Group Inc.
|
|
**
|
|
** Permission is hereby granted, free of charge, to any person obtaining a
|
|
** copy of this software and/or associated documentation files (the
|
|
** "Materials"), to deal in the Materials without restriction, including
|
|
** without limitation the rights to use, copy, modify, merge, publish,
|
|
** distribute, sublicense, and/or sell copies of the Materials, and to
|
|
** permit persons to whom the Materials are furnished to do so, subject to
|
|
** the following conditions:
|
|
**
|
|
** The above copyright notice and this permission notice shall be included
|
|
** in all copies or substantial portions of the Materials.
|
|
**
|
|
** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
|
** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
|
|
*/
|
|
|
|
/* Platform-specific types and definitions for egl.h
|
|
* $Revision: 30994 $ on $Date: 2015-04-30 13:36:48 -0700 (Thu, 30 Apr 2015) $
|
|
*
|
|
* Adopters may modify khrplatform.h and this file to suit their platform.
|
|
* You are encouraged to submit all modifications to the Khronos group so that
|
|
* they can be included in future versions of this file. Please submit changes
|
|
* by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)
|
|
* by filing a bug against product "EGL" component "Registry".
|
|
*/
|
|
|
|
#include <KHR/khrplatform.h>
|
|
|
|
/* Macros used in EGL function prototype declarations.
|
|
*
|
|
* EGL functions should be prototyped as:
|
|
*
|
|
* EGLAPI return-type EGLAPIENTRY eglFunction(arguments);
|
|
* typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments);
|
|
*
|
|
* KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h
|
|
*/
|
|
|
|
#ifndef EGLAPI
|
|
#define EGLAPI KHRONOS_APICALL
|
|
#endif
|
|
|
|
#ifndef EGLAPIENTRY
|
|
#define EGLAPIENTRY KHRONOS_APIENTRY
|
|
#endif
|
|
#define EGLAPIENTRYP EGLAPIENTRY*
|
|
|
|
#if defined(MESA_EGL_NO_X11_HEADERS) && !defined(EGL_NO_X11)
|
|
#warning "`MESA_EGL_NO_X11_HEADERS` is deprecated, and doesn't work with the unmodified Khronos header"
|
|
#warning "Please use `EGL_NO_X11` instead, as `MESA_EGL_NO_X11_HEADERS` will be removed soon"
|
|
#define EGL_NO_X11
|
|
#endif
|
|
|
|
/* The types NativeDisplayType, NativeWindowType, and NativePixmapType
|
|
* are aliases of window-system-dependent types, such as X Display * or
|
|
* Windows Device Context. They must be defined in platform-specific
|
|
* code below. The EGL-prefixed versions of Native*Type are the same
|
|
* types, renamed in EGL 1.3 so all types in the API start with "EGL".
|
|
*
|
|
* Khronos STRONGLY RECOMMENDS that you use the default definitions
|
|
* provided below, since these changes affect both binary and source
|
|
* portability of applications using EGL running on different EGL
|
|
* implementations.
|
|
*/
|
|
|
|
#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */
|
|
#ifndef WIN32_LEAN_AND_MEAN
|
|
#define WIN32_LEAN_AND_MEAN 1
|
|
#endif
|
|
#include <windows.h>
|
|
|
|
typedef HDC EGLNativeDisplayType;
|
|
typedef HBITMAP EGLNativePixmapType;
|
|
typedef HWND EGLNativeWindowType;
|
|
|
|
#elif defined(__EMSCRIPTEN__)
|
|
|
|
typedef int EGLNativeDisplayType;
|
|
typedef int EGLNativePixmapType;
|
|
typedef int EGLNativeWindowType;
|
|
|
|
#elif defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */
|
|
|
|
typedef int EGLNativeDisplayType;
|
|
typedef void *EGLNativePixmapType;
|
|
typedef void *EGLNativeWindowType;
|
|
|
|
#elif defined(WL_EGL_PLATFORM)
|
|
|
|
typedef struct wl_display *EGLNativeDisplayType;
|
|
typedef struct wl_egl_pixmap *EGLNativePixmapType;
|
|
typedef struct wl_egl_window *EGLNativeWindowType;
|
|
|
|
#elif defined(__GBM__)
|
|
|
|
typedef struct gbm_device *EGLNativeDisplayType;
|
|
typedef struct gbm_bo *EGLNativePixmapType;
|
|
typedef void *EGLNativeWindowType;
|
|
|
|
#elif defined(__ANDROID__) || defined(ANDROID)
|
|
|
|
struct ANativeWindow;
|
|
struct egl_native_pixmap_t;
|
|
|
|
typedef void* EGLNativeDisplayType;
|
|
typedef struct egl_native_pixmap_t* EGLNativePixmapType;
|
|
typedef struct ANativeWindow* EGLNativeWindowType;
|
|
|
|
#elif defined(USE_OZONE)
|
|
|
|
typedef intptr_t EGLNativeDisplayType;
|
|
typedef intptr_t EGLNativePixmapType;
|
|
typedef intptr_t EGLNativeWindowType;
|
|
|
|
#elif defined(__unix__) && defined(EGL_NO_X11)
|
|
|
|
typedef void *EGLNativeDisplayType;
|
|
typedef khronos_uintptr_t EGLNativePixmapType;
|
|
typedef khronos_uintptr_t EGLNativeWindowType;
|
|
|
|
#elif defined(__unix__) || defined(USE_X11)
|
|
|
|
/* X11 (tentative) */
|
|
#include <X11/Xlib.h>
|
|
#include <X11/Xutil.h>
|
|
|
|
typedef Display *EGLNativeDisplayType;
|
|
typedef Pixmap EGLNativePixmapType;
|
|
typedef Window EGLNativeWindowType;
|
|
|
|
#elif defined(__APPLE__)
|
|
|
|
typedef int EGLNativeDisplayType;
|
|
typedef void *EGLNativePixmapType;
|
|
typedef void *EGLNativeWindowType;
|
|
|
|
#elif defined(__HAIKU__)
|
|
|
|
#include <kernel/image.h>
|
|
|
|
typedef void *EGLNativeDisplayType;
|
|
typedef khronos_uintptr_t EGLNativePixmapType;
|
|
typedef khronos_uintptr_t EGLNativeWindowType;
|
|
|
|
#else
|
|
#error "Platform not recognized"
|
|
#endif
|
|
|
|
/* EGL 1.2 types, renamed for consistency in EGL 1.3 */
|
|
typedef EGLNativeDisplayType NativeDisplayType;
|
|
typedef EGLNativePixmapType NativePixmapType;
|
|
typedef EGLNativeWindowType NativeWindowType;
|
|
|
|
|
|
/* Define EGLint. This must be a signed integral type large enough to contain
|
|
* all legal attribute names and values passed into and out of EGL, whether
|
|
* their type is boolean, bitmask, enumerant (symbolic constant), integer,
|
|
* handle, or other. While in general a 32-bit integer will suffice, if
|
|
* handles are 64 bit types, then EGLint should be defined as a signed 64-bit
|
|
* integer type.
|
|
*/
|
|
typedef khronos_int32_t EGLint;
|
|
|
|
|
|
/* C++ / C typecast macros for special EGL handle values */
|
|
#if defined(__cplusplus)
|
|
#define EGL_CAST(type, value) (static_cast<type>(value))
|
|
#else
|
|
#define EGL_CAST(type, value) ((type) (value))
|
|
#endif
|
|
|
|
#endif /* __eglplatform_h */
|