diff options
author | Campbell Barton <campbellbarton> | 2022-07-26 16:08:40 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2022-07-26 16:08:40 +0300 |
commit | 6bd38ccbb5e876fa5fcc05fa830c8348c8ad716e (patch) | |
tree | bc03410c738e816710d577ff4875f4de6a0b04ed /intern/ghost/intern/GHOST_Xr_openxr_includes.h | |
parent | bf49e6040caac1e975982375731c348a1fcb11c1 (diff) |
replace GLEW with libepoxytemp-libepoxy
As discussed in https://developer.blender.org/D12034#412258, GLEW should be replaced by libepoxy to enable dynamic loading of OpenGL.
Build:
```sh
make lite debug ninja BUILD_CMAKE_ARGS="-DWITH_GHOST_X11=OFF -DWITH_GHOST_WAYLAND=ON -DWITH_GHOST_WAYLAND_LIBDECOR=ON -DPYTHON_VERSION=3.10" BUILD_DIR="../blender_build"
```
Verify that there are no X11 dependencies any more:
```sh
lddtree ./blender_build/bin/blender
```
and:
```sh
./blender_build/bin/blender
```
should then start a pure Wayland client.
This also works with GLX (`-DWITH_GHOST_X11=ON -DWITH_GHOST_WAYLAND=OFF`).
This has not been tested on other systems (Windows, macOS) as I do not have access to those systems and the build bot does not allow me to trigger experimental builds any more (I get "you need to have role 'any-control'").
Reviewed By: campbellbarton, brecht, jbakker
Differential Revision: https://developer.blender.org/D15291
Diffstat (limited to 'intern/ghost/intern/GHOST_Xr_openxr_includes.h')
-rw-r--r-- | intern/ghost/intern/GHOST_Xr_openxr_includes.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/intern/ghost/intern/GHOST_Xr_openxr_includes.h b/intern/ghost/intern/GHOST_Xr_openxr_includes.h index 9706f51c027..9f993ae45c2 100644 --- a/intern/ghost/intern/GHOST_Xr_openxr_includes.h +++ b/intern/ghost/intern/GHOST_Xr_openxr_includes.h @@ -29,11 +29,9 @@ #endif #ifdef WITH_GHOST_X11 # ifdef WITH_GL_EGL -/* TODO: Why do we have to create this typedef manually? */ -typedef void (*(*PFNEGLGETPROCADDRESSPROC)(const char *procname))(void); -# include <GL/eglew.h> +# include <epoxy/egl.h> # else -# include <GL/glxew.h> +# include <epoxy/glx.h> # endif #endif |