projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'mesa-public/master' into vulkan
[mesa.git]
/
src
/
vulkan
/
anv_dump.c
diff --git
a/src/vulkan/anv_dump.c
b/src/vulkan/anv_dump.c
index b2d0b385d0a3db0caf02c6047f14973e71da907b..3a1430d49a0653d4333d28e6a00e75e76f6ced9e 100644
(file)
--- a/
src/vulkan/anv_dump.c
+++ b/
src/vulkan/anv_dump.c
@@
-49,24
+49,24
@@
anv_dump_image_to_ppm(struct anv_device *device,
.format = VK_FORMAT_R8G8B8A8_UNORM,
.extent = (VkExtent3D) { extent.width, extent.height, 1 },
.mipLevels = 1,
.format = VK_FORMAT_R8G8B8A8_UNORM,
.extent = (VkExtent3D) { extent.width, extent.height, 1 },
.mipLevels = 1,
- .array
Size
= 1,
+ .array
Layers
= 1,
.samples = 1,
.tiling = VK_IMAGE_TILING_LINEAR,
.usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT,
.flags = 0,
.samples = 1,
.tiling = VK_IMAGE_TILING_LINEAR,
.usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT,
.flags = 0,
- }, ©_image);
+ },
NULL,
©_image);
assert(result == VK_SUCCESS);
VkMemoryRequirements reqs;
anv_GetImageMemoryRequirements(vk_device, copy_image, &reqs);
VkDeviceMemory memory;
assert(result == VK_SUCCESS);
VkMemoryRequirements reqs;
anv_GetImageMemoryRequirements(vk_device, copy_image, &reqs);
VkDeviceMemory memory;
- result = anv_AllocMemory(vk_device,
- &(VkMemoryAllocInfo) {
- .sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO,
+ result = anv_Alloc
ate
Memory(vk_device,
+ &(VkMemoryAlloc
ate
Info) {
+ .sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC
ATE
_INFO,
.allocationSize = reqs.size,
.memoryTypeIndex = 0,
.allocationSize = reqs.size,
.memoryTypeIndex = 0,
- }, &memory);
+ },
NULL,
&memory);
assert(result == VK_SUCCESS);
result = anv_BindImageMemory(vk_device, copy_image, memory, 0);
assert(result == VK_SUCCESS);
result = anv_BindImageMemory(vk_device, copy_image, memory, 0);
@@
-78,16
+78,16
@@
anv_dump_image_to_ppm(struct anv_device *device,
.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO,
.queueFamilyIndex = 0,
.flags = 0,
.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO,
.queueFamilyIndex = 0,
.flags = 0,
- }, &commandPool);
+ },
NULL,
&commandPool);
assert(result == VK_SUCCESS);
VkCommandBuffer cmd;
assert(result == VK_SUCCESS);
VkCommandBuffer cmd;
- result = anv_
CreateCommandBuffer
(vk_device,
- &(VkCommandBuffer
Cre
ateInfo) {
- .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_
CRE
ATE_INFO,
+ result = anv_
AllocateCommandBuffers
(vk_device,
+ &(VkCommandBuffer
Alloc
ateInfo) {
+ .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_
ALLOC
ATE_INFO,
.commandPool = commandPool,
.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY,
.commandPool = commandPool,
.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY,
- .
flags = 0
,
+ .
bufferCount = 1
,
}, &cmd);
assert(result == VK_SUCCESS);
}, &cmd);
assert(result == VK_SUCCESS);
@@
-134,19
+134,19
@@
anv_dump_image_to_ppm(struct anv_device *device,
true, 1,
(const void * []) { &(VkImageMemoryBarrier) {
.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
true, 1,
(const void * []) { &(VkImageMemoryBarrier) {
.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
- .
outputMask = VK_MEMORY_OUTPUT_TRANSFER
_BIT,
- .
inputMask = VK_MEMORY_INPUT_HOST_READ
_BIT,
+ .
srcAccessMask = VK_ACCESS_HOST_READ
_BIT,
+ .
dstAccessMask = VK_ACCESS_TRANSFER_WRITE
_BIT,
.oldLayout = VK_IMAGE_LAYOUT_GENERAL,
.newLayout = VK_IMAGE_LAYOUT_GENERAL,
.srcQueueFamilyIndex = 0,
.oldLayout = VK_IMAGE_LAYOUT_GENERAL,
.newLayout = VK_IMAGE_LAYOUT_GENERAL,
.srcQueueFamilyIndex = 0,
- .d
e
stQueueFamilyIndex = 0,
+ .dstQueueFamilyIndex = 0,
.image = copy_image,
.subresourceRange = (VkImageSubresourceRange) {
.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
.baseMipLevel = 0,
.image = copy_image,
.subresourceRange = (VkImageSubresourceRange) {
.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
.baseMipLevel = 0,
- .
mipLevels
= 1,
+ .
levelCount
= 1,
.baseArrayLayer = 0,
.baseArrayLayer = 0,
- .
arraySize
= 1,
+ .
layerCount
= 1,
},
}});
},
}});
@@
-158,18
+158,22
@@
anv_dump_image_to_ppm(struct anv_device *device,
&(VkFenceCreateInfo) {
.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO,
.flags = 0,
&(VkFenceCreateInfo) {
.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO,
.flags = 0,
- }, &fence);
+ },
NULL,
&fence);
assert(result == VK_SUCCESS);
assert(result == VK_SUCCESS);
- result = anv_QueueSubmit(anv_queue_to_handle(&device->queue),
- 1, &cmd, fence);
+ result = anv_QueueSubmit(anv_queue_to_handle(&device->queue), 1,
+ &(VkSubmitInfo) {
+ .sType = VK_STRUCTURE_TYPE_SUBMIT_INFO,
+ .commandBufferCount = 1,
+ .pCommandBuffers = &cmd,
+ }, fence);
assert(result == VK_SUCCESS);
result = anv_WaitForFences(vk_device, 1, &fence, true, UINT64_MAX);
assert(result == VK_SUCCESS);
assert(result == VK_SUCCESS);
result = anv_WaitForFences(vk_device, 1, &fence, true, UINT64_MAX);
assert(result == VK_SUCCESS);
- anv_DestroyFence(vk_device, fence);
- anv_DestroyCommandPool(vk_device, commandPool);
+ anv_DestroyFence(vk_device, fence
, NULL
);
+ anv_DestroyCommandPool(vk_device, commandPool
, NULL
);
uint8_t *map;
result = anv_MapMemory(vk_device, memory, 0, reqs.size, 0, (void **)&map);
uint8_t *map;
result = anv_MapMemory(vk_device, memory, 0, reqs.size, 0, (void **)&map);
@@
-178,7
+182,7
@@
anv_dump_image_to_ppm(struct anv_device *device,
VkSubresourceLayout layout;
anv_GetImageSubresourceLayout(vk_device, copy_image,
&(VkImageSubresource) {
VkSubresourceLayout layout;
anv_GetImageSubresourceLayout(vk_device, copy_image,
&(VkImageSubresource) {
- .aspect
= VK_IMAGE_ASPECT_COLOR
,
+ .aspect
Mask = VK_IMAGE_ASPECT_COLOR_BIT
,
.mipLevel = 0,
.arrayLayer = 0,
}, &layout);
.mipLevel = 0,
.arrayLayer = 0,
}, &layout);
@@
-204,6
+208,6
@@
anv_dump_image_to_ppm(struct anv_device *device,
fclose(file);
anv_UnmapMemory(vk_device, memory);
fclose(file);
anv_UnmapMemory(vk_device, memory);
- anv_DestroyImage(vk_device, copy_image);
- anv_FreeMemory(vk_device, memory);
+ anv_DestroyImage(vk_device, copy_image
, NULL
);
+ anv_FreeMemory(vk_device, memory
, NULL
);
}
}