srcStageMask = vk::PipelineStageFlagBits::eBottomOfPipe;
srcAccessMask = vk::AccessFlagBits::eColorAttachmentWrite | vk::AccessFlagBits::eColorAttachmentRead;
}
+ break;
case vk::ImageLayout::eColorAttachmentOptimal:
{
srcStageMask = vk::PipelineStageFlagBits::eFragmentShader | vk::PipelineStageFlagBits::eColorAttachmentOutput;
case vk::ImageLayout::eTransferSrcOptimal:
case vk::ImageLayout::eTransferDstOptimal:
case vk::ImageLayout::ePreinitialized:
- default:
+ case vk::ImageLayout::eSharedPresentKHR:
{
}
}
case vk::ImageLayout::eTransferDstOptimal:
case vk::ImageLayout::ePreinitialized:
case vk::ImageLayout::eUndefined:
+ case vk::ImageLayout::eSharedPresentKHR:
default:
{
}
--- /dev/null
+#ifndef DALI_GRAPHICS_VULKAN_HPP_WRAPPER_H
+#define DALI_GRAPHICS_VULKAN_HPP_WRAPPER_H
+
+/*
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// Vulkan without exceptions
+#ifndef VULKAN_HPP_NO_EXCEPTIONS
+#define VULKAN_HPP_NO_EXCEPTIONS
+#endif
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#pragma GCC diagnostic ignored "-Wswitch-enum"
+#include <vulkan/vulkan.hpp>
+#pragma GCC diagnostic pop
+
+#endif // DALI_GRAPHICS_VULKAN_HPP_WRAPPER_H
#define VK_USE_PLATFORM_XCB_KHR
#endif
-#include <vulkan/vulkan.hpp>
+#include <dali/graphics/vulkan/vulkan-hpp-wrapper.h>
#include <dali/integration-api/graphics/vulkan/vk-surface-factory.h>
#include <dali/integration-api/graphics/graphics.h>
*/
// 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 <vulkan/vulkan.hpp>
-#pragma GCC diagnostic pop
-
-// StdC++
#include <atomic>
#include <unordered_map>
#include <memory>
+#include <dali/graphics/vulkan/vulkan-hpp-wrapper.h>
+
namespace Dali
{
namespace Graphics
*
*/
-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES
+#include <dali/graphics/vulkan/vulkan-hpp-wrapper.h>
+// INTERNAL INCLUDES
#include <dali/integration-api/graphics/surface-factory.h>
-// EXTERNAL INCLUDES
-// Vulkan
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wfloat-equal"
-#include <vulkan/vulkan.hpp>
-#pragma GCC diagnostic pop
namespace Dali
{