From 20dd451cd06b8b6c0bc4846c9195bf93e6a5ef8c Mon Sep 17 00:00:00 2001 From: Green Sky Date: Sun, 6 Nov 2022 15:31:38 +0100 Subject: [PATCH] fix linker warning and add lto example as comment --- CMakeLists.txt | 13 ++++++++++--- .../opengl_primitives/src/mm/opengl/fbo_builder.cpp | 7 ++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 37edfe6..6896d27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,9 +20,16 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") # add this to your projects cmake to enable ipo -#include(CheckIPOSupported) -#check_ipo_supported() -#set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON) +#if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") + #include(CheckIPOSupported) + #check_ipo_supported(RESULT HAVE_LTO) + #if(HAVE_LTO) + #set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON) + #message(STATUS "Enabled LTO") + #else() + #message(STATUS "LTO not supported") + #endif() +#endif() # enable test if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) diff --git a/framework/opengl_primitives/src/mm/opengl/fbo_builder.cpp b/framework/opengl_primitives/src/mm/opengl/fbo_builder.cpp index 2a37043..f45d20d 100644 --- a/framework/opengl_primitives/src/mm/opengl/fbo_builder.cpp +++ b/framework/opengl_primitives/src/mm/opengl/fbo_builder.cpp @@ -55,15 +55,16 @@ FBOBuilder& FBOBuilder::setTarget(FrameBufferObject::Target target) { FBOBuilder& FBOBuilder::attachTexture(std::shared_ptr tex, GLuint attachment_type) { GLenum target; switch (_currTarget) { - case FrameBufferObject::Target::RW: - target = GL_FRAMEBUFFER; - break; case FrameBufferObject::Target::R: target = GL_READ_FRAMEBUFFER; break; case FrameBufferObject::Target::W: target = GL_DRAW_FRAMEBUFFER; break; + //case FrameBufferObject::Target::RW: + default: + target = GL_FRAMEBUFFER; + break; } if (tex->samples == 0u) {