From f91a3a29894c679b7719944b4f3a95106fd31663 Mon Sep 17 00:00:00 2001 From: jsr184 Date: Thu, 16 Nov 2017 17:14:11 +0000 Subject: [PATCH] Build fixes - graphics SUBDIR moved to the top-level Makefile.am due to not being called - linker-test brought back ( it should be compiling ) - small fixes in the vulkan backend due to version differences --- build/tizen/Makefile.am | 2 +- build/tizen/configure.ac | 2 + build/tizen/dali-core/Makefile.am | 95 ++++++++++++++++---------------- dali/graphics/vulkan/vulkan-graphics.cpp | 12 ++-- dali/graphics/vulkan/vulkan-graphics.h | 4 +- dali/graphics/vulkan/vulkan-types.h | 9 +-- 6 files changed, 63 insertions(+), 61 deletions(-) diff --git a/build/tizen/Makefile.am b/build/tizen/Makefile.am index a98e8b8..afa2119 100644 --- a/build/tizen/Makefile.am +++ b/build/tizen/Makefile.am @@ -13,7 +13,7 @@ # limitations under the License. -SUBDIRS = dali-core +SUBDIRS = dali-core/graphics dali-core pkgconfigdir = $(libdir)/pkgconfig diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac index 525c782..a71ef82 100644 --- a/build/tizen/configure.ac +++ b/build/tizen/configure.ac @@ -17,6 +17,8 @@ m4_define([dali_version],[0.1.1]) AC_INIT([dali], [dali_version]) AM_INIT_AUTOMAKE([-Wall foreign]) +AM_PROG_AR([ar]) + AC_PROG_CXX AC_PROG_LIBTOOL AC_PROG_MKDIR_P diff --git a/build/tizen/dali-core/Makefile.am b/build/tizen/dali-core/Makefile.am index 603320b..a1ac397 100644 --- a/build/tizen/dali-core/Makefile.am +++ b/build/tizen/dali-core/Makefile.am @@ -13,8 +13,6 @@ # limitations under the License. # -SUBDIRS = graphics - # Parse each file.list # These files define _src_files & _header_files, # where is the subdirectory from core_src_dir @@ -49,7 +47,7 @@ DALI_CORE_LA_CXXFLAGS = -DDALI_COMPILATION \ $(DALI_CFLAGS) -DALI_CORE_LA_LDFLAGS = $(DALI_LDFLAGS) -Wl,--whole-archive,graphics/libdali-graphics.a,--no-whole-archive +DALI_CORE_LA_LDFLAGS = $(DALI_LDFLAGS) DALI_CORE_LA_LIBADD = $(DALI_LDFLAGS) \ $(VULKAN_LIBS) \ @@ -64,7 +62,7 @@ lib_LTLIBRARIES = libdali-core.la libdali_core_la_SOURCES = $(DALI_CORE_LA_SOURCES) libdali_core_la_CXXFLAGS = $(DALI_CORE_LA_CXXFLAGS) -libdali_core_la_LIBADD = $(DALI_CORE_LA_LIBADD) +libdali_core_la_LIBADD = $(DALI_CORE_LA_LIBADD) graphics/libdali-graphics.a else @@ -72,7 +70,7 @@ lib_LTLIBRARIES = libdali-core-cxx11.la libdali_core_cxx11_la_SOURCES = $(DALI_CORE_LA_SOURCES) libdali_core_cxx11_la_CXXFLAGS = $(DALI_CORE_LA_CXXFLAGS) -libdali_core_cxx11_la_LIBADD = $(DALI_CORE_LA_LIBADD) +libdali_core_cxx11_la_LIBADD = $(DALI_CORE_LA_LIBADD) graphics/libdali-graphics.a endif @@ -146,48 +144,49 @@ packagedoxy_HEADERS = $(package_doxy_files) # linking test -#noinst_PROGRAMS = linker.test -# -#linker_test_SOURCES = linker-test.cpp \ -# ../../../automated-tests/src/dali/dali-test-suite-utils/test-application.cpp \ -# ../../../automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.cpp \ -# ../../../automated-tests/src/dali/dali-test-suite-utils/test-render-controller.cpp \ -# ../../../automated-tests/src/dali/dali-test-suite-utils/test-gl-abstraction.cpp \ -# ../../../automated-tests/src/dali/dali-test-suite-utils/test-gesture-manager.cpp \ -# ../../../automated-tests/src/dali/dali-test-suite-utils/test-gl-sync-abstraction.cpp \ -# ../../../automated-tests/src/dali/dali-test-suite-utils/test-trace-call-stack.cpp -# -#linker_test_CXXFLAGS = \ -# $(cxx_flags) \ -# -I../../../automated-tests/src/dali/dali-test-suite-utils \ -# $(dali_core_includes) -# -#if ENABLE_CXX03_ABI -# -#linker_test_DEPENDENCIES = libdali-core.la -#linker_test_LDADD = \ -# libdali-core.la -# -#if ENABLE_RENAME_SO +noinst_PROGRAMS = linker.test + +linker_test_SOURCES = linker-test.cpp \ + ../../../automated-tests/src/dali/dali-test-suite-utils/test-application.cpp \ + ../../../automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.cpp \ + ../../../automated-tests/src/dali/dali-test-suite-utils/test-render-controller.cpp \ + ../../../automated-tests/src/dali/dali-test-suite-utils/test-gl-abstraction.cpp \ + ../../../automated-tests/src/dali/dali-test-suite-utils/test-gesture-manager.cpp \ + ../../../automated-tests/src/dali/dali-test-suite-utils/test-gl-sync-abstraction.cpp \ + ../../../automated-tests/src/dali/dali-test-suite-utils/test-trace-call-stack.cpp + +linker_test_CXXFLAGS = \ + $(cxx_flags) \ + -I../../../automated-tests/src/dali/dali-test-suite-utils \ + $(dali_core_includes) + +if ENABLE_CXX03_ABI + +linker_test_DEPENDENCIES = libdali-core.la +linker_test_LDADD = \ + libdali-core.la + +if ENABLE_RENAME_SO #rename -#install: install-am -# rm -rf $(libdir)/libdali-core.so -# rm -rf $(libdir)/libdali-core-cxx03.so -# ln -s $(libdir)/libdali-core.so.0.0.* $(libdir)/libdali-core-cxx03.so -#endif -# -#else -# -#linker_test_DEPENDENCIES = libdali-core-cxx11.la -#linker_test_LDADD = \ -# libdali-core-cxx11.la -# -#if ENABLE_RENAME_SO +install: install-am + rm -rf $(libdir)/libdali-core.so + rm -rf $(libdir)/libdali-core-cxx03.so + ln -s $(libdir)/libdali-core.so.0.0.* $(libdir)/libdali-core-cxx03.so +endif + +else + +linker_test_DEPENDENCIES = libdali-core-cxx11.la +linker_test_LDADD = \ + libdali-core-cxx11.la + +if ENABLE_RENAME_SO #rename -#install: install-am -# rm -rf $(libdir)/libdali-core-cxx11.so -# rm -rf $(libdir)/libdali-core.so -# ln -s $(libdir)/libdali-core-cxx11.so.0.0.* $(libdir)/libdali-core.so -#endif -# -#endif +install: install-am + rm -rf $(libdir)/libdali-core-cxx11.so + rm -rf $(libdir)/libdali-core.so + ln -s $(libdir)/libdali-core-cxx11.so.0.0.* $(libdir)/libdali-core.so +endif + +endif + diff --git a/dali/graphics/vulkan/vulkan-graphics.cpp b/dali/graphics/vulkan/vulkan-graphics.cpp index e03a62d..1ad1ff2 100644 --- a/dali/graphics/vulkan/vulkan-graphics.cpp +++ b/dali/graphics/vulkan/vulkan-graphics.cpp @@ -75,14 +75,14 @@ void Graphics::CreateInstance() .setEnabledLayerCount(U32(validationLayers.size())) .setPpEnabledLayerNames(validationLayers.data()); - mInstance = VkAssert(vk::createInstance(info, mAllocator)); + mInstance = VkAssert(vk::createInstance(info, *mAllocator)); } void Graphics::DestroyInstance() { if(mInstance) { - mInstance.destroy(mAllocator); + mInstance.destroy(*mAllocator); mInstance = nullptr; } } @@ -151,7 +151,7 @@ FBID Graphics::CreateSurface(std::unique_ptr< SurfaceFactory > surfaceFactory) return FBID{0u}; } - auto surface = vkFactory->Create(mInstance, mAllocator, mPhysicalDevice); + auto surface = vkFactory->Create(mInstance, mAllocator.get(), mPhysicalDevice); // map surface to FBID auto fbid = ++mBaseFBID; @@ -271,7 +271,7 @@ void Graphics::CreateDevice() .setPQueueCreateInfos(queueInfos.data()) .setQueueCreateInfoCount(U32(queueInfos.size())); - mDevice = VkAssert(mPhysicalDevice.createDevice(info, mAllocator)); + mDevice = VkAssert(mPhysicalDevice.createDevice(info, *mAllocator)); } // create Queue objects @@ -320,9 +320,9 @@ vk::Instance Graphics::GetInstance() const return mInstance; } -vk::AllocationCallbacks* Graphics::GetAllocator() const +const vk::AllocationCallbacks& Graphics::GetAllocator() const { - return mAllocator; + return *mAllocator; } Queue& Graphics::GetGraphicsQueue(uint32_t index) const diff --git a/dali/graphics/vulkan/vulkan-graphics.h b/dali/graphics/vulkan/vulkan-graphics.h index 68abdb6..5e4c9e9 100644 --- a/dali/graphics/vulkan/vulkan-graphics.h +++ b/dali/graphics/vulkan/vulkan-graphics.h @@ -66,7 +66,7 @@ public: vk::Instance GetInstance() const; - vk::AllocationCallbacks* GetAllocator() const; + const vk::AllocationCallbacks& GetAllocator() const; DeviceMemoryManager& GetDeviceMemoryManager() const { @@ -97,7 +97,7 @@ private: std::unique_ptr mDeviceMemoryManager; vk::Instance mInstance; - vk::AllocationCallbacks* mAllocator{nullptr}; + std::unique_ptr mAllocator{nullptr}; // physical device vk::PhysicalDevice mPhysicalDevice; diff --git a/dali/graphics/vulkan/vulkan-types.h b/dali/graphics/vulkan/vulkan-types.h index b6ccdf3..fb6e5b4 100644 --- a/dali/graphics/vulkan/vulkan-types.h +++ b/dali/graphics/vulkan/vulkan-types.h @@ -21,6 +21,10 @@ // EXTERNAL INCLUDES // Vulkan +#ifndef VULKAN_HPP_NO_EXCEPTIONS +#define VULKAN_HPP_NO_EXCEPTIONS +#endif + #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wfloat-equal" #include @@ -29,10 +33,7 @@ // StdC++ #include #include - -#ifndef VULKAN_HPP_NO_EXCEPTIONS -#define VULKAN_HPP_NO_EXCEPTIONS -#endif +#include namespace Dali { -- 2.7.4