diff --git a/src/glview/GLView.cc b/src/glview/GLView.cc index 94cc245181a..b6cb0952e99 100644 --- a/src/glview/GLView.cc +++ b/src/glview/GLView.cc @@ -7,11 +7,6 @@ #include "degree_trig.h" #include #include -#ifdef _WIN32 -#include -#elif !defined(__APPLE__) -#include -#endif #ifdef ENABLE_OPENCSG #include @@ -202,33 +197,12 @@ void glCompileCheck(GLuint shader) { void GLView::enable_opencsg_shaders() { - const char *openscad_disable_gl20_env = getenv("OPENSCAD_DISABLE_GL20"); - if (openscad_disable_gl20_env && !strcmp(openscad_disable_gl20_env, "0")) { - openscad_disable_gl20_env = nullptr; - } - // All OpenGL 2 contexts are OpenCSG capable if (GLEW_VERSION_2_0) { - if (!openscad_disable_gl20_env) { - this->is_opencsg_capable = true; - this->has_shaders = true; - } + this->is_opencsg_capable = true; + this->has_shaders = true; } -#ifndef GLEW_EGL - // If OpenGL < 2, check for extensions - else if (GLEW_ARB_framebuffer_object || (GLEW_EXT_framebuffer_object && GLEW_EXT_packed_depth_stencil) -#ifdef _WIN32 - || (WGLEW_ARB_pbuffer && WGLEW_ARB_pixel_format) -#elif !defined(__APPLE__) - // not supported by GLEW when built with EGL - || (GLXEW_SGIX_pbuffer && GLXEW_SGIX_fbconfig) -#endif - ) { - this->is_opencsg_capable = true; - } -#endif // ifndef GLEW_EGL - - if (!GLEW_VERSION_2_0 || !this->is_opencsg_capable) { + else { display_opencsg_warning(); } }