Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(933)

Side by Side Diff: tools/gpu/vk/VkTestContext.cpp

Issue 1974913003: Implement vulkan fence syncs for nanobench (Closed) Base URL: https://chromium.googlesource.com/skia.git@master
Patch Set: -Address comments and fix compilation of non-vulkan build Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « tools/gpu/gl/egl/CreatePlatformGLTestContext_egl.cpp ('k') | tools/kilobench/kilobench.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2016 Google Inc. 2 * Copyright 2016 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "VkTestContext.h" 8 #include "VkTestContext.h"
9 9
10 #ifdef SK_VULKAN 10 #ifdef SK_VULKAN
11 11
12 #include "vk/GrVkInterface.h"
13 #include "vk/GrVkUtil.h"
14 #include <vulkan/vulkan.h>
15
12 namespace { 16 namespace {
13 // TODO: Implement fence syncs, swap buffers, submit, and flush 17 /**
18 * Implements SkGpuFenceSync for Vulkan. It creates a single command buffer with
19 * USAGE_SIMULTANEOUS with no content . On every insertFence request it submits
20 * the command buffer with a new fence.
21 */
22 class VkFenceSync : public SkGpuFenceSync {
23 public:
24 VkFenceSync(sk_sp<const GrVkInterface> vk, VkDevice device, VkQueue queue,
25 uint32_t queueFamilyIndex)
26 : fVk(std::move(vk))
27 , fDevice(device)
28 , fQueue(queue) {
29 SkDEBUGCODE(fUnfinishedSyncs = 0;)
30 VkCommandPoolCreateInfo createInfo;
31 createInfo.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO;
32 createInfo.pNext = nullptr;
33 createInfo.flags = 0;
34 createInfo.queueFamilyIndex = queueFamilyIndex;
35 GR_VK_CALL_ERRCHECK(fVk, CreateCommandPool(fDevice, &createInfo, nullptr , &fCommandPool));
36
37 VkCommandBufferAllocateInfo allocateInfo;
38 allocateInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
39 allocateInfo.pNext = nullptr;
40 allocateInfo.commandBufferCount = 1;
41 allocateInfo.commandPool = fCommandPool;
42 allocateInfo.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
43 GR_VK_CALL_ERRCHECK(fVk, AllocateCommandBuffers(fDevice, &allocateInfo, &fCommandBuffer));
44
45 VkCommandBufferBeginInfo beginInfo;
46 beginInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
47 beginInfo.pNext = nullptr;
48 beginInfo.flags = VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT;
49 beginInfo.pInheritanceInfo = nullptr;
50 GR_VK_CALL_ERRCHECK(fVk, BeginCommandBuffer(fCommandBuffer, &beginInfo)) ;
51 GR_VK_CALL_ERRCHECK(fVk, EndCommandBuffer(fCommandBuffer));
52 }
53
54 ~VkFenceSync() override {
55 SkASSERT(!fUnfinishedSyncs);
56 // If the above assertion is true then the command buffer should not be in flight.
57 GR_VK_CALL(fVk, FreeCommandBuffers(fDevice, fCommandPool, 1, &fCommandBu ffer));
58 GR_VK_CALL(fVk, DestroyCommandPool(fDevice, fCommandPool, nullptr));
59 }
60
61 SkPlatformGpuFence SK_WARN_UNUSED_RESULT insertFence() const override {
62 VkFence fence;
63 VkFenceCreateInfo info;
64 info.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO;
65 info.pNext = nullptr;
66 info.flags = 0;
67 GR_VK_CALL_ERRCHECK(fVk, CreateFence(fDevice, &info, nullptr, &fence));
68 VkSubmitInfo submitInfo;
69 submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
70 submitInfo.pNext = nullptr;
71 submitInfo.waitSemaphoreCount = 0;
72 submitInfo.pWaitSemaphores = nullptr;
73 submitInfo.pWaitDstStageMask = nullptr;
74 submitInfo.commandBufferCount = 1;
75 submitInfo.pCommandBuffers = &fCommandBuffer;
76 submitInfo.signalSemaphoreCount = 0;
77 submitInfo.pSignalSemaphores = nullptr;
78 GR_VK_CALL_ERRCHECK(fVk, QueueSubmit(fQueue, 1, &submitInfo, fence));
79 SkDEBUGCODE(++fUnfinishedSyncs;)
80 return reinterpret_cast<SkPlatformGpuFence>(fence);
81 }
82
83 bool waitFence(SkPlatformGpuFence opaqueFence) const override {
84 VkFence fence = reinterpret_cast<VkFence>(opaqueFence);
85 static constexpr uint64_t kForever = ~((uint64_t)0);
86 auto result = GR_VK_CALL(fVk, WaitForFences(fDevice, 1, &fence, true, kF orever));
87 return result != VK_TIMEOUT;
88 }
89
90 void deleteFence(SkPlatformGpuFence opaqueFence) const override {
91 VkFence fence = reinterpret_cast<VkFence>(opaqueFence);
92 GR_VK_CALL(fVk, DestroyFence(fDevice, fence, nullptr));
93 SkDEBUGCODE(--fUnfinishedSyncs;)
94 }
95
96 private:
97 sk_sp<const GrVkInterface> fVk;
98 VkDevice fDevice;
99 VkQueue fQueue;
100 VkCommandPool fCommandPool;
101 VkCommandBuffer fCommandBuffer;
102 SkDEBUGCODE(mutable int fUnfinishedSyncs;)
103 typedef SkGpuFenceSync INHERITED;
104 };
105
106 // TODO: Implement swap buffers and finish
14 class VkTestContextImpl : public sk_gpu_test::VkTestContext { 107 class VkTestContextImpl : public sk_gpu_test::VkTestContext {
15 public: 108 public:
16 VkTestContextImpl() 109 static VkTestContext* Create() {
17 : VkTestContext(sk_sp<const GrVkBackendContext>(GrVkBackendContext::Crea te())) {} 110 sk_sp<const GrVkBackendContext> backendContext(GrVkBackendContext::Creat e());
111 if (!backendContext) {
112 return nullptr;
113 }
114 return new VkTestContextImpl(std::move(backendContext));
115 }
18 116
19 ~VkTestContextImpl() override { this->teardown(); } 117 ~VkTestContextImpl() override { this->teardown(); }
20 118
21 void testAbandon() override {} 119 void testAbandon() override {}
22 120
121 // There is really nothing to here since we don't own any unqueued command b uffers here.
23 void submit() override {} 122 void submit() override {}
123
24 void finish() override {} 124 void finish() override {}
25 125
26 protected: 126 protected:
27 void teardown() override { fVk.reset(nullptr); } 127 void teardown() override {
128 INHERITED::teardown();
129 fVk.reset(nullptr);
130 }
28 131
29 private: 132 private:
133 VkTestContextImpl(sk_sp<const GrVkBackendContext> backendContext)
134 : VkTestContext(std::move(backendContext)) {
135 fFenceSync = new VkFenceSync(sk_ref_sp(fVk->fInterface.get()), fVk->fDev ice, fVk->fQueue,
136 fVk->fGraphicsQueueIndex);
137 }
138
30 void onPlatformMakeCurrent() const override {} 139 void onPlatformMakeCurrent() const override {}
31 void onPlatformSwapBuffers() const override {} 140 void onPlatformSwapBuffers() const override {}
32 141
33 typedef sk_gpu_test::VkTestContext INHERITED; 142 typedef sk_gpu_test::VkTestContext INHERITED;
34 }; 143 };
35 } 144 }
36 145
37 namespace sk_gpu_test { 146 namespace sk_gpu_test {
38 VkTestContext* CreatePlatformVkTestContext() { 147 VkTestContext* CreatePlatformVkTestContext() { return VkTestContextImpl::Create( ); }
39 return new VkTestContextImpl;
40 }
41 } // namespace sk_gpu_test 148 } // namespace sk_gpu_test
42 149
43 #endif 150 #endif
OLDNEW
« no previous file with comments | « tools/gpu/gl/egl/CreatePlatformGLTestContext_egl.cpp ('k') | tools/kilobench/kilobench.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698