Index: gpu/vulkan/tests/vulkan_test.cc |
diff --git a/gpu/vulkan/tests/vulkan_test.cc b/gpu/vulkan/tests/vulkan_test.cc |
index 96c445ae5e9823e4417239ae3467cbd7ebd82801..e5eeacd2f4dbb9f412312c809ef3eb9c2ec71ce6 100644 |
--- a/gpu/vulkan/tests/vulkan_test.cc |
+++ b/gpu/vulkan/tests/vulkan_test.cc |
@@ -4,43 +4,16 @@ |
#include <memory> |
-#include "gpu/vulkan/tests/native_window.h" |
+#include "gpu/vulkan/tests/basic_vulkan_test.h" |
#include "gpu/vulkan/vulkan_command_buffer.h" |
-#include "gpu/vulkan/vulkan_device_queue.h" |
#include "gpu/vulkan/vulkan_render_pass.h" |
#include "gpu/vulkan/vulkan_surface.h" |
#include "gpu/vulkan/vulkan_swap_chain.h" |
-#include "testing/gtest/include/gtest/gtest.h" |
-#include "ui/gfx/geometry/rect.h" |
// This file tests basic vulkan initialization steps. |
namespace gpu { |
-class BasicVulkanTest : public testing::Test { |
- public: |
- void SetUp() override { |
- const gfx::Rect kDefaultBounds(10, 10, 100, 100); |
- window_ = CreateNativeWindow(kDefaultBounds); |
- device_queue_.Initialize( |
- VulkanDeviceQueue::GRAPHICS_QUEUE_FLAG | |
- VulkanDeviceQueue::PRESENTATION_SUPPORT_QUEUE_FLAG); |
- } |
- |
- void TearDown() override { |
- DestroyNativeWindow(window_); |
- window_ = gfx::kNullAcceleratedWidget; |
- device_queue_.Destroy(); |
- } |
- |
- gfx::AcceleratedWidget window() const { return window_; } |
- VulkanDeviceQueue* GetDeviceQueue() { return &device_queue_; } |
- |
- private: |
- VulkanDeviceQueue device_queue_; |
- gfx::AcceleratedWidget window_ = gfx::kNullAcceleratedWidget; |
-}; |
- |
TEST_F(BasicVulkanTest, BasicVulkanSurface) { |
std::unique_ptr<VulkanSurface> surface = |
VulkanSurface::CreateViewSurface(window()); |