Merge pull request #806 from daleglass/use_legacy_opengl

Set OpenGL_GL_PREFERENCE to LEGACY
This commit is contained in:
kasenvr 2020-10-13 19:17:23 -04:00 committed by GitHub
commit 908774ae53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 9 additions and 9 deletions

2
debian/rules vendored
View file

@ -6,7 +6,7 @@
override_dh_auto_configure:
mkdir obj-$(DEB_TARGET_MULTIARCH)
(cd obj-$(DEB_TARGET_MULTIARCH) && cmake .. -DCMAKE_INSTALL_PREFIX=/opt/hifi -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON "-GUnix Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCLIENT_ONLY=ON -DDOWNLOAD_SERVERLESS_CONTENT=ON -DCMAKE_CXX_COMPILER=/usr/lib/llvm-7/bin/clang\+\+ -DOpenGL_GL_PREFERENCE=GLVND)
(cd obj-$(DEB_TARGET_MULTIARCH) && cmake .. -DCMAKE_INSTALL_PREFIX=/opt/hifi -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON "-GUnix Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCLIENT_ONLY=ON -DDOWNLOAD_SERVERLESS_CONTENT=ON -DCMAKE_CXX_COMPILER=/usr/lib/llvm-7/bin/clang\+\+ -DOpenGL_GL_PREFERENCE=LEGACY)
override_dh_auto_build:
(cd obj-$(DEB_TARGET_MULTIARCH) && make -j4)

View file

@ -239,7 +239,7 @@ target_openssl()
target_bullet()
set(OpenGL_GL_PREFERENCE "GLVND")
set(OpenGL_GL_PREFERENCE "LEGACY")
target_opengl()
add_crashpad()
target_breakpad()

View file

@ -13,7 +13,7 @@ include_hifi_library_headers(ktx)
include_hifi_library_headers(render)
include_hifi_library_headers(procedural)
set(OpenGL_GL_PREFERENCE "GLVND")
set(OpenGL_GL_PREFERENCE "LEGACY")
target_opengl()
GroupSources("src/display-plugins")

View file

@ -2,6 +2,6 @@ set(TARGET_NAME gl)
setup_hifi_library(Gui Widgets)
link_hifi_libraries(shared)
set(OpenGL_GL_PREFERENCE "GLVND")
set(OpenGL_GL_PREFERENCE "LEGACY")
target_opengl()

View file

@ -3,6 +3,6 @@ setup_hifi_library(Concurrent)
link_hifi_libraries(shared gl gpu shaders)
GroupSources("src")
set(OpenGL_GL_PREFERENCE "GLVND")
set(OpenGL_GL_PREFERENCE "LEGACY")
target_opengl()

View file

@ -6,6 +6,6 @@ if (UNIX)
endif(UNIX)
GroupSources("src")
set(OpenGL_GL_PREFERENCE "GLVND")
set(OpenGL_GL_PREFERENCE "LEGACY")
target_opengl()

View file

@ -3,5 +3,5 @@ setup_hifi_library(Multimedia Network Qml Quick WebChannel WebSockets ${PLATFORM
link_hifi_libraries(shared networking gl)
# Required for some low level GL interaction in the OffscreenQMLSurface
set(OpenGL_GL_PREFERENCE "GLVND")
set(OpenGL_GL_PREFERENCE "LEGACY")
target_opengl()

View file

@ -4,5 +4,5 @@ link_hifi_libraries(shared networking qml gl audio audio-client plugins pointers
include_hifi_library_headers(controllers)
# Required for some low level GL interaction in the OffscreenQMLSurface
set(OpenGL_GL_PREFERENCE "GLVND")
set(OpenGL_GL_PREFERENCE "LEGACY")
target_opengl()

View file

@ -22,7 +22,7 @@ link_hifi_libraries(
target_compile_definitions(${TARGET_NAME} PRIVATE USE_GL)
set(OpenGL_GL_PREFERENCE "GLVND")
set(OpenGL_GL_PREFERENCE "LEGACY")
target_opengl()
#target_vulkan()