[Bf-blender-cvs] [70c0f652de5] tmp-vulkan: Cleanup: Vulkan: Unused header and avoid duplicated code

[Clément Foucault]

Commit: 70c0f652de5dce5da7a422a71d95860d4cf19d45
Author: Clément Foucault
Date:   Sun Sep 13 01:53:43 2020 +0200
Branches: tmp-vulkan
https://developer.blender.org/rB70c0f652de5dce5da7a422a71d95860d4cf19d45

Cleanup: Vulkan: Unused header and avoid duplicated code

===================================================================

M	intern/ghost/CMakeLists.txt
M	source/blender/gpu/vulkan/vk_backend.cc

===================================================================

diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index b08bb51de2b..1bf19737800 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -88,6 +88,18 @@ set(LIB
   ${GLEW_LIBRARY}
 )
 
+if(WITH_VULKAN)
+  list(APPEND SRC
+    intern/GHOST_ContextVK.cpp
+
+    intern/GHOST_ContextVK.h
+  )
+
+  list(APPEND INC_SYS
+    ${Vulkan_INCLUDE_DIRS}
+  )
+endif()
+
 if(WITH_GHOST_DEBUG)
   list(APPEND SRC
     intern/GHOST_EventPrinter.cpp
@@ -169,18 +181,6 @@ elseif(APPLE AND NOT WITH_GHOST_X11)
     )
   endif()
 
-  if(WITH_VULKAN)
-    list(APPEND SRC
-      intern/GHOST_ContextVK.cpp
-
-      intern/GHOST_ContextVK.h
-    )
-
-    list(APPEND INC_SYS
-      ${Vulkan_INCLUDE_DIRS}
-    )
-  endif()
-
   if(WITH_INPUT_NDOF)
     list(APPEND SRC
       intern/GHOST_NDOFManagerCocoa.mm
@@ -216,18 +216,6 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND)
       )
     endif()
 
-    if(WITH_VULKAN)
-      list(APPEND SRC
-        intern/GHOST_ContextVK.cpp
-
-        intern/GHOST_ContextVK.h
-      )
-
-      list(APPEND INC_SYS
-        ${Vulkan_INCLUDE_DIR}
-      )
-    endif()
-
     if(WITH_GHOST_XDND)
       add_definitions(-DWITH_XDND)
 
diff --git a/source/blender/gpu/vulkan/vk_backend.cc b/source/blender/gpu/vulkan/vk_backend.cc
index bf8dabfd41c..a025768c845 100644
--- a/source/blender/gpu/vulkan/vk_backend.cc
+++ b/source/blender/gpu/vulkan/vk_backend.cc
@@ -27,7 +27,6 @@
 #include "gpu_platform_private.hh"
 
 #include "vk_backend.hh"
-#include "vk_framebuffer.hh"
 
 namespace blender::gpu {