Fixing Ubuntu 19.04 build

Author: jherico

base/gl.cpp

@@ -1,6 +1,6 @@
 #include "gl.hpp"
 
-#if !defined(__ANDROID__)
+#if defined(WIN32)
 #include <mutex>
 
 typedef PROC(APIENTRYP PFNWGLGETPROCADDRESS)(LPCSTR);

base/vks/filesystem.cpp

@@ -1,5 +1,6 @@
 #include "filesystem.hpp"
 
+#include <cstring>
 #include <fstream>
 #include <istream>
 #include <iterator>

base/vks/storage.cpp

@@ -8,6 +8,11 @@
 
 #include "storage.hpp"
 #include <string>
+#include <cstring>
+#include <istream>
+#include <fstream>
+#include <iterator>
+
 
 #if defined(WIN32)
 #include <Windows.h>
@@ -134,7 +139,7 @@ FileStorage::FileStorage(const std::string& filename) {
     _data.reserve(fileSize);
 
     // read the data:
-    _data.insert(vec.begin(), std::istream_iterator<uint8_t>(file), std::istream_iterator<uint8_t>());
+    _data.insert(_data.begin(), std::istream_iterator<uint8_t>(file), std::istream_iterator<uint8_t>());
     file.close();
 #endif
 }

cmake/macros/TargetGLFW3.cmake

@@ -11,7 +11,9 @@ macro(TARGET_GLFW3)
     elseif(NOT ANDROID)
         pkg_check_modules(GLFW3 REQUIRED glfw3>=3.2)
         link_directories(${GLFW3_LIBRARY_DIRS})
+        set(GLFW3_LIBRARY ${GLFW3_LIBRARIES})
     endif()
     target_include_directories(${TARGET_NAME} PUBLIC ${GLFW3_INCLUDE_DIR})
     target_link_libraries(${TARGET_NAME} ${GLFW3_LIBRARY})
+    message("GLFW3_LIBRARY ${GLFW3_LIBRARY} GLFW3_LIBRARIES ${GLFW3_LIBRARIES} ")
 endmacro()

examples/glinterop/glinterop.cpp

@@ -7,8 +7,8 @@
 #include <vulkanExampleBase.h>
 #include <vks/texture.hpp>
 
-#if !defined(__ANDROID__)
 // FIXME make work on non-Win32 platforms
+#if defined(WIN32)
 struct ShareHandles {
     HANDLE memory{ INVALID_HANDLE_VALUE };
     HANDLE glReady{ INVALID_HANDLE_VALUE };

examples/multiview/multiview.cpp

@@ -258,8 +258,8 @@ class VulkanExample : public vkx::ExampleBase {
         for (auto& blit : compositeBlits) {
             blit.dstSubresource.aspectMask = blit.srcSubresource.aspectMask = vk::ImageAspectFlagBits::eColor;
             blit.dstSubresource.layerCount = blit.srcSubresource.layerCount = 1;
-            blit.srcOffsets[1] = { (int32_t)offscreen.size.width, (int32_t)offscreen.size.height, 1 };
-            blit.dstOffsets[1] = { (int32_t)offscreen.size.width, (int32_t)offscreen.size.height, 1 };
+            blit.srcOffsets[1] = vk::Offset3D{ (int32_t)offscreen.size.width, (int32_t)offscreen.size.height, 1 };
+            blit.dstOffsets[1] = vk::Offset3D{ (int32_t)offscreen.size.width, (int32_t)offscreen.size.height, 1 };
         }
         compositeBlits[1].srcSubresource.baseArrayLayer = 1;
         compositeBlits[1].dstOffsets[0].x += offscreen.size.width;

examples/texturesparseresidency/texturesparseresidency.cpp

@@ -260,7 +260,7 @@ class VulkanExample : public vkx::ExampleBase {
         sparseImageCreateInfo.tiling = vk::ImageTiling::eOptimal;
         sparseImageCreateInfo.sharingMode = vk::SharingMode::eExclusive;
         sparseImageCreateInfo.initialLayout = vk::ImageLayout::eUndefined;
-        sparseImageCreateInfo.extent = { texture.width, texture.height, 1 };
+        sparseImageCreateInfo.extent = vk::Extent3D{ texture.width, texture.height, 1 };
         sparseImageCreateInfo.usage = vk::ImageUsageFlagBits::eTransferDst | vk::ImageUsageFlagBits::eSampled;
         sparseImageCreateInfo.flags = vk::ImageCreateFlagBits::eSparseBinding | vk::ImageCreateFlagBits::eSparseResidency;
         texture.image = device.createImage(sparseImageCreateInfo);
@@ -436,8 +436,8 @@ class VulkanExample : public vkx::ExampleBase {
                 blit.srcSubresource.baseArrayLayer = 0;
                 blit.srcSubresource.layerCount = 1;
                 blit.srcSubresource.mipLevel = 0;
-                blit.srcOffsets[0] = { 0, 0, 0 };
-                blit.srcOffsets[1] = { static_cast<int32_t>(textures.source.extent.width), static_cast<int32_t>(textures.source.extent.height), 1 };
+                blit.srcOffsets[0] = vk::Offset3D{ 0, 0, 0 };
+                blit.srcOffsets[1] = vk::Offset3D{ static_cast<int32_t>(textures.source.extent.width), static_cast<int32_t>(textures.source.extent.height), 1 };
                 // Dest
                 blit.dstSubresource.aspectMask = vk::ImageAspectFlagBits::eColor;
                 blit.dstSubresource.baseArrayLayer = 0;
@@ -657,8 +657,8 @@ class VulkanExample : public vkx::ExampleBase {
                         blit.srcSubresource.baseArrayLayer = 0;
                         blit.srcSubresource.layerCount = 1;
                         blit.srcSubresource.mipLevel = 0;
-                        blit.srcOffsets[0] = { 0, 0, 0 };
-                        blit.srcOffsets[1] = { static_cast<int32_t>(textures.source.extent.width), static_cast<int32_t>(textures.source.extent.height), 1 };
+                        blit.srcOffsets[0] = vk::Offset3D{ 0, 0, 0 };
+                        blit.srcOffsets[1] = vk::Offset3D{ static_cast<int32_t>(textures.source.extent.width), static_cast<int32_t>(textures.source.extent.height), 1 };
                         // Dest
                         blit.dstSubresource.aspectMask = vk::ImageAspectFlagBits::eColor;
                         blit.dstSubresource.baseArrayLayer = 0;