OLD | NEW |
---|---|
1 // Copyright (c) 2016 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "gpu/vulkan/vulkan_implementation.h" | 5 #include "gpu/vulkan/vulkan_implementation.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 #include <vulkan/vulkan.h> | 9 #include <vulkan/vulkan.h> |
10 | 10 |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
12 #include "gpu/vulkan/vulkan_command_buffer.h" | |
12 | 13 |
13 #if defined(VK_USE_PLATFORM_XLIB_KHR) | 14 #if defined(VK_USE_PLATFORM_XLIB_KHR) |
14 #include "ui/gfx/x/x11_types.h" | 15 #include "ui/gfx/x/x11_types.h" |
15 #endif // defined(VK_USE_PLATFORM_XLIB_KHR) | 16 #endif // defined(VK_USE_PLATFORM_XLIB_KHR) |
16 | 17 |
17 namespace gfx { | 18 namespace gfx { |
18 | 19 |
19 struct VulkanInstance { | 20 struct VulkanInstance { |
20 VulkanInstance() : valid(false) {} | 21 VulkanInstance() {} |
21 | 22 |
22 void Initialize() { | 23 void Initialize() { |
23 valid = InitializeVulkanInstance() && InitializeVulkanDevice(); | 24 valid = InitializeVulkanInstance() && InitializeVulkanDevice() && |
25 CreateCommandPool(); | |
24 } | 26 } |
25 | 27 |
26 bool InitializeVulkanInstance() { | 28 bool InitializeVulkanInstance() { |
27 VkResult status = VK_SUCCESS; | 29 VkResult status = VK_SUCCESS; |
28 | 30 |
29 VkApplicationInfo app_info = {}; | 31 VkApplicationInfo app_info = {}; |
30 app_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; | 32 app_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; |
31 app_info.pApplicationName = "Chromium"; | 33 app_info.pApplicationName = "Chromium"; |
32 app_info.apiVersion = VK_MAKE_VERSION(1, 0, 2); | 34 app_info.apiVersion = VK_MAKE_VERSION(1, 0, 2); |
33 | 35 |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
110 if (-1 != queue_index) { | 112 if (-1 != queue_index) { |
111 device_index = static_cast<int>(i); | 113 device_index = static_cast<int>(i); |
112 break; | 114 break; |
113 } | 115 } |
114 } | 116 } |
115 } | 117 } |
116 | 118 |
117 if (queue_index == -1) | 119 if (queue_index == -1) |
118 return false; | 120 return false; |
119 | 121 |
122 vk_physical_device = devices[device_index]; | |
123 vk_queue_index = queue_index; | |
124 | |
120 float queue_priority = 0.0f; | 125 float queue_priority = 0.0f; |
121 VkDeviceQueueCreateInfo queue_create_info = {}; | 126 VkDeviceQueueCreateInfo queue_create_info = {}; |
122 queue_create_info.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; | 127 queue_create_info.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; |
123 queue_create_info.queueFamilyIndex = queue_index; | 128 queue_create_info.queueFamilyIndex = queue_index; |
124 queue_create_info.queueCount = 1; | 129 queue_create_info.queueCount = 1; |
125 queue_create_info.pQueuePriorities = &queue_priority; | 130 queue_create_info.pQueuePriorities = &queue_priority; |
126 | 131 |
127 const char* device_extensions[] = {VK_KHR_SWAPCHAIN_EXTENSION_NAME}; | 132 const char* device_extensions[] = {VK_KHR_SWAPCHAIN_EXTENSION_NAME}; |
128 | 133 |
129 VkDeviceCreateInfo device_create_info = {}; | 134 VkDeviceCreateInfo device_create_info = {}; |
130 device_create_info.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO; | 135 device_create_info.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO; |
131 device_create_info.queueCreateInfoCount = 1; | 136 device_create_info.queueCreateInfoCount = 1; |
132 device_create_info.pQueueCreateInfos = &queue_create_info; | 137 device_create_info.pQueueCreateInfos = &queue_create_info; |
133 device_create_info.enabledExtensionCount = arraysize(device_extensions); | 138 device_create_info.enabledExtensionCount = arraysize(device_extensions); |
134 device_create_info.ppEnabledExtensionNames = device_extensions; | 139 device_create_info.ppEnabledExtensionNames = device_extensions; |
135 | 140 |
136 status = vkCreateDevice(devices[device_index], &device_create_info, nullptr, | 141 status = vkCreateDevice(vk_physical_device, &device_create_info, nullptr, |
137 &vk_device); | 142 &vk_device); |
138 if (VK_SUCCESS != status) | 143 if (VK_SUCCESS != status) |
139 return false; | 144 return false; |
140 | 145 |
141 vkGetDeviceQueue(vk_device, queue_index, 0, &vk_queue); | 146 vkGetDeviceQueue(vk_device, queue_index, 0, &vk_queue); |
142 | 147 |
143 return true; | 148 return true; |
144 } | 149 } |
145 | 150 |
146 bool valid; | 151 bool CreateCommandPool() { |
152 VkCommandPoolCreateInfo command_pool_create_info = {}; | |
153 command_pool_create_info.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; | |
154 command_pool_create_info.queueFamilyIndex = vk_queue_index; | |
piman
2016/03/09 01:25:34
If we reset command buffers individually, we need
David Yen
2016/03/10 01:39:48
Interesting, I missed this. Done.
| |
155 | |
156 VkResult result = vkCreateCommandPool(vk_device, &command_pool_create_info, | |
157 nullptr, &vk_command_pool); | |
158 if (VK_SUCCESS != result) { | |
159 LOG(ERROR) << "vkCreateCommandPool() failed: " << result; | |
piman
2016/03/09 01:25:33
nit: DLOG
David Yen
2016/03/10 01:39:48
Done.
| |
160 return false; | |
161 } | |
162 | |
163 return true; | |
164 } | |
165 | |
166 bool valid = false; | |
147 VkInstance vk_instance; | 167 VkInstance vk_instance; |
168 VkPhysicalDevice vk_physical_device; | |
148 VkDevice vk_device; | 169 VkDevice vk_device; |
149 VkQueue vk_queue; | 170 VkQueue vk_queue; |
171 uint32_t vk_queue_index = 0; | |
172 VkCommandPool vk_command_pool; | |
piman
2016/03/09 01:25:33
We'll definitely need more than one pool - typical
David Yen
2016/03/10 01:39:48
Done. Separated out into a separate class. I now h
| |
150 }; | 173 }; |
151 | 174 |
152 static VulkanInstance* vulkan_instance = nullptr; | 175 static VulkanInstance* vulkan_instance = nullptr; |
153 | 176 |
154 bool InitializeVulkan() { | 177 bool InitializeVulkan() { |
155 DCHECK(!vulkan_instance); | 178 DCHECK(!vulkan_instance); |
156 vulkan_instance = new VulkanInstance; | 179 vulkan_instance = new VulkanInstance; |
157 vulkan_instance->Initialize(); | 180 vulkan_instance->Initialize(); |
158 return vulkan_instance->valid; | 181 return vulkan_instance->valid; |
159 } | 182 } |
160 | 183 |
161 VkInstance GetVulkanInstance() { | 184 VkInstance GetVulkanInstance() { |
162 DCHECK(vulkan_instance); | 185 DCHECK(vulkan_instance); |
163 DCHECK(vulkan_instance->valid); | 186 DCHECK(vulkan_instance->valid); |
164 return vulkan_instance->vk_instance; | 187 return vulkan_instance->vk_instance; |
165 } | 188 } |
166 | 189 |
190 VkPhysicalDevice GetVulkanPhysicalDevice() { | |
191 DCHECK(vulkan_instance); | |
192 DCHECK(vulkan_instance->valid); | |
193 return vulkan_instance->vk_physical_device; | |
194 } | |
195 | |
167 VkDevice GetVulkanDevice() { | 196 VkDevice GetVulkanDevice() { |
168 DCHECK(vulkan_instance); | 197 DCHECK(vulkan_instance); |
169 DCHECK(vulkan_instance->valid); | 198 DCHECK(vulkan_instance->valid); |
170 return vulkan_instance->vk_device; | 199 return vulkan_instance->vk_device; |
171 } | 200 } |
172 | 201 |
173 VkQueue GetVulkanQueue() { | 202 VkQueue GetVulkanQueue() { |
174 DCHECK(vulkan_instance); | 203 DCHECK(vulkan_instance); |
175 DCHECK(vulkan_instance->valid); | 204 DCHECK(vulkan_instance->valid); |
176 return vulkan_instance->vk_queue; | 205 return vulkan_instance->vk_queue; |
177 } | 206 } |
178 | 207 |
208 scoped_ptr<VulkanCommandBuffer> CreatePrimaryCommandBuffer() { | |
209 DCHECK(vulkan_instance); | |
210 DCHECK(vulkan_instance->valid); | |
211 | |
212 scoped_ptr<VulkanCommandBuffer> command_buffer( | |
213 new VulkanCommandBuffer(vulkan_instance->vk_command_pool, true)); | |
214 command_buffer->Initialize(); | |
piman
2016/03/09 01:25:33
don't we need to handle the return value?
At a hi
David Yen
2016/03/10 01:39:48
I'll have this function return nullptr on errors.
| |
215 return command_buffer; | |
216 } | |
217 | |
218 scoped_ptr<VulkanCommandBuffer> CreateSecondaryCommandBuffer() { | |
219 DCHECK(vulkan_instance); | |
220 DCHECK(vulkan_instance->valid); | |
221 | |
222 scoped_ptr<VulkanCommandBuffer> command_buffer( | |
223 new VulkanCommandBuffer(vulkan_instance->vk_command_pool, false)); | |
224 command_buffer->Initialize(); | |
225 return command_buffer; | |
226 } | |
227 | |
179 } // namespace gfx | 228 } // namespace gfx |
OLD | NEW |