Update GLExtensions.cpp #26
Conversation
add GLES3
|
This PR is pretty huge and definitely breaks things. E.g. it totally swaps out loads of OpenThreads stuff for STL threading primitives, but those aren't even available in C++03, which is what OSG uses. That particular change might be better dealt with by adding STL stuff as yet another backend for OpenThreads, or just figuring out how to make one of the several existing backends work (and at least one of them will do). |
|
For openmw we use C++11 to get move constructor for Also this is blocked on the ability for CI to run on pull requests: #27 . |
| @@ -735,7 +735,7 @@ OPTION(BUILD_OSG_PLUGINS "Build OSG Plugins - Disable for compile testing exampl | |||
| mark_as_advanced(BUILD_OSG_PLUGINS) | |||
| ################################################################################ | |||
| # 3rd Party Dependency Stuff | |||
| OPTION(OSG_FIND_3RD_PARTY_DEPS "Enable to search for Android or Windows dependencies in ./3rdparty" ON) | |||
| OPTION(OSG_FIND_3RD_PARTY_DEPS "Enable to search for Android or Windows dependencies in ./3rdparty" OFF) | |||
There was a problem hiding this comment.
This likely will break all builds not setting this option explicitly. Set it in your cmake command not here.
There was a problem hiding this comment.
I did not mean to add that commit from a few days ago. Can it be rolled back?
| @@ -19,7 +19,7 @@ SET( COLLADA_ENV_VAR_AVAILABLE $ENV{COLLADA_DIR} ) | |||
| IF ( COLLADA_ENV_VAR_AVAILABLE ) | |||
| SET(COLLADA_DOM_ROOT "$ENV{COLLADA_DIR}/dom" CACHE PATH "Location of Collada DOM directory" FORCE) | |||
| ELSE () | |||
| SET(COLLADA_DOM_ROOT "${ACTUAL_3DPARTY_DIR}/include/1.4/dom" CACHE PATH "Location of Collada DOM directory" FORCE) | |||
| SET(COLLADA_DOM_ROOT "${ACTUAL_3DPARTY_DIR}/include/collada-dom2.5/1.4/dom" CACHE PATH "Location of Collada DOM directory" FORCE) | |||
There was a problem hiding this comment.
Collada 1.4 is unlikely located in the 2.5 unless something weird is done to setup packages. Please don't make this change.
| @@ -74,6 +74,7 @@ FIND_PATH(COLLADA_INCLUDE_DIR dae.h | |||
| /opt/include | |||
| /usr/freeware/include | |||
| ${ACTUAL_3DPARTY_DIR}/include | |||
| ${ACTUAL_3DPARTY_DIR}/include/collada-dom2.5/ | |||
There was a problem hiding this comment.
There is a path suffix collada-dom2.5 just below which should make it possible to find collada 2.5. No need to have this change.
There was a problem hiding this comment.
I'm pretty sure we're married to Collada DOM 2.4. 2.5 is really an alpha of the de-facto abandoned 3.x series, so has breaking changes.
| @@ -163,7 +163,7 @@ MACRO(ANDROID_3RD_PARTY) | |||
| ) | |||
| #set(ENV{AND_OSG_LIB_NAMES} "$ENV{AND_OSG_LIB_NAMES} libft2") | |||
| #set(ENV{AND_OSG_LIB_PATHS} "$ENV{AND_OSG_LIB_PATHS}include ${FREETYPE_DIR}/Android.mk \n") | |||
| set(FREETYPE_INCLUDE_DIRS ${FREETYPE_DIR}/include ${FREETYPE_DIR}/include/freetype/config) | |||
| set(FREETYPE_INCLUDE_DIRS ${FREETYPE_DIR}/include ${FREETYPE_DIR}/include/freetype2) | |||
There was a problem hiding this comment.
This likely will break builds with freetype. What kind of problem this solves?
| # XXX: remove the "lib" prefix e.g. "libosgdb_bmp.a" => "osgdb_bmp.a" | ||
| # for some reason this is only a problem on android | ||
| SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "") |
| #fix me | ||
| #IF(COLLADA_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE) | ||
| # ADD_PLUGIN_DIRECTORY(dae) | ||
| #ENDIF() |
|
Woa sorry, I had forgotten about this MR and added that patch for testing. I did not mean to include those in the MR at all |
add GLES3