[Vulkan] Working build

[platform/core/uifw/dali-core.git] / dali / graphics / vulkan / vulkan-surface.cpp

diff --git a/dali/graphics/vulkan/vulkan-surface.cpp b/dali/graphics/vulkan/vulkan-surface.cpp
index c38377a..a0a9d7a 100644 (file)
--- a/dali/graphics/vulkan/vulkan-surface.cpp
+++ b/dali/graphics/vulkan/vulkan-surface.cpp
@@ -121,7 +121,7 @@ void Surface::BeginRenderPass()
     if(r > 1.0f)
       r -= 1.0f;
 
-    clearValues[0].color.setFloat32({0.0f, 1.0f, 0.0f, 1.0f});
+    clearValues[0].color.setFloat32({0.0f, 0.0f, 0.0f, 1.0f});
     clearValues[1].depthStencil.setDepth(1.0f).setStencil(0.0f);
 
     auto rpInfo = vk::RenderPassBeginInfo{};
@@ -295,7 +295,7 @@ void Surface::InitialiseSwapchain()
 void Surface::AddSwapchainImage(vk::Image image, std::vector< SwapchainImage >& swapchainImages)
 {
   auto swapImage  = std::move(SwapchainImage{});
-  swapImage.image = MakeRef<Image>( mGraphics, image );
+  swapImage.image = NewRef<Image>( mGraphics, vk::ImageCreateInfo{}, image );
 
   // create ImageView
   CreateImageView(swapImage);
@@ -318,7 +318,7 @@ void Surface::CreateImageView(SwapchainImage& swapImage)
   auto ivInfo = vk::ImageViewCreateInfo{};
   ivInfo.setFormat(mFormat)
       .setComponents(VK_COMPONENT_MAPPING_RGBA)
-      .setImage(swapImage.image->GetImage())
+      .setImage(swapImage.image->GetVkImage())
       .setSubresourceRange(vk::ImageSubresourceRange()
                                .setAspectMask(vk::ImageAspectFlagBits::eColor)
                                .setBaseArrayLayer(0)
@@ -327,14 +327,14 @@ void Surface::CreateImageView(SwapchainImage& swapImage)
                                .setLevelCount(1))
       .setViewType(vk::ImageViewType::e2D);
 
-  swapImage.imageView = swapImage.image->CreateView( ivInfo );
+  swapImage.imageView = ImageView::New( mGraphics, swapImage.image, ivInfo );
 }
 
 void Surface::CreateFramebuffer(SwapchainImage& swapImage)
 {
   vk::FramebufferCreateInfo fbInfo;
   fbInfo.setAttachmentCount(mHasDepthStencil ? 2 : 1)
-      .setPAttachments(&swapImage.imageView->GetImageView()) // todo: add depth/stencil attachment
+      .setPAttachments(&swapImage.imageView->GetVkImageView()) // todo: add depth/stencil attachment
       .setHeight(mExtent.height)
       .setWidth(mExtent.width)
       .setLayers(1)
@@ -430,7 +430,7 @@ void Surface::CreateCommandBuffers()
     // Record layout transition for each image, after transition command buffers will be re-recorded
     // and will take in account only present -> color layout transition
     swapImage.layoutToColorCmdBuf->Begin();
-    swapImage.layoutToColorCmdBuf->ImageLayoutTransition(swapImage.image->GetImage(),
+    swapImage.layoutToColorCmdBuf->ImageLayoutTransition(swapImage.image->GetVkImage(),
                                                          swapImage.layout,
                                                          vk::ImageLayout::eColorAttachmentOptimal,
                                                          vk::ImageAspectFlagBits::eColor);
@@ -453,7 +453,7 @@ void Surface::CreateCommandBuffers()
   {
     swapImage.layoutToColorCmdBuf->Reset();
     swapImage.layoutToColorCmdBuf->Begin();
-    swapImage.layoutToColorCmdBuf->ImageLayoutTransition(swapImage.image->GetImage(),
+    swapImage.layoutToColorCmdBuf->ImageLayoutTransition(swapImage.image->GetVkImage(),
                                                          vk::ImageLayout::ePresentSrcKHR,
                                                          vk::ImageLayout::eColorAttachmentOptimal,
                                                          vk::ImageAspectFlagBits::eColor);