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/opensubdiv/internal/device | |
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/opensubdiv/internal/device')
-rw-r--r-- | intern/opensubdiv/internal/device/device_context_glsl_compute.cc | 4 | ||||
-rw-r--r-- | intern/opensubdiv/internal/device/device_context_glsl_transform_feedback.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/intern/opensubdiv/internal/device/device_context_glsl_compute.cc b/intern/opensubdiv/internal/device/device_context_glsl_compute.cc index 7b416976099..5e627e290f5 100644 --- a/intern/opensubdiv/internal/device/device_context_glsl_compute.cc +++ b/intern/opensubdiv/internal/device/device_context_glsl_compute.cc @@ -18,14 +18,14 @@ #include "internal/device/device_context_glsl_compute.h" -#include <GL/glew.h> +#include <epoxy/gl.h> namespace blender { namespace opensubdiv { bool GLSLComputeDeviceContext::isSupported() { - return GLEW_VERSION_4_3 || GLEW_ARB_compute_shader; + return epoxy_gl_version() >= 43 || epoxy_has_gl_extension("GL_ARB_compute_shader"); } GLSLComputeDeviceContext::GLSLComputeDeviceContext() diff --git a/intern/opensubdiv/internal/device/device_context_glsl_transform_feedback.cc b/intern/opensubdiv/internal/device/device_context_glsl_transform_feedback.cc index ef897608b6e..1768da8e9d4 100644 --- a/intern/opensubdiv/internal/device/device_context_glsl_transform_feedback.cc +++ b/intern/opensubdiv/internal/device/device_context_glsl_transform_feedback.cc @@ -18,14 +18,14 @@ #include "internal/device/device_context_glsl_transform_feedback.h" -#include <GL/glew.h> +#include <epoxy/gl.h> namespace blender { namespace opensubdiv { bool GLSLTransformFeedbackDeviceContext::isSupported() { - return GLEW_VERSION_4_1; + return epoxy_gl_version() >= 41; } GLSLTransformFeedbackDeviceContext::GLSLTransformFeedbackDeviceContext() |