mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-28 02:26:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

comp: Use U_TYPED_CALLOC/U_TYPED_ARRAY_CALLOC

Browse source
This commit is contained in:
Ryan Pavlik 2019-03-21 15:36:16 -05:00
parent f7d990c7e3
commit 5b4c3a2f94
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/xrt/compositor/common/comp_vk.c
View file

@ -12,7 +12,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "util/u_misc.h"
#include "util/u_debug.h" #include "util/u_debug.h"
#include "common/comp_vk.h" #include "common/comp_vk.h"
@ -847,8 +849,7 @@ vk_find_graphics_queue(struct vk_bundle *vk, uint32_t *out_graphics_queue)
&num_queues, NULL); &num_queues, NULL);
VkQueueFamilyProperties *queue_family_props = VkQueueFamilyProperties *queue_family_props =
(VkQueueFamilyProperties *)malloc(sizeof(VkQueueFamilyProperties) * U_TYPED_ARRAY_CALLOC(VkQueueFamilyProperties, num_queues);
num_queues);
vk->vkGetPhysicalDeviceQueueFamilyProperties( vk->vkGetPhysicalDeviceQueueFamilyProperties(
vk->physical_device, &num_queues, queue_family_props); vk->physical_device, &num_queues, queue_family_props);

15
src/xrt/compositor/common/comp_vk_swapchain.c
View file

@ -14,6 +14,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "util/u_misc.h"
#include "comp_vk_swapchain.h" #include "comp_vk_swapchain.h"
@ -241,8 +243,7 @@ _find_surface_format(struct vk_swapchain *sc,
sc->vk->physical_device, surface, &num_formats, NULL); sc->vk->physical_device, surface, &num_formats, NULL);
if (num_formats != 0) { if (num_formats != 0) {
formats = (VkSurfaceFormatKHR *)malloc( formats = U_TYPED_ARRAY_CALLOC(VkSurfaceFormatKHR, num_formats);
sizeof(VkSurfaceFormatKHR) * num_formats);
sc->vk->vkGetPhysicalDeviceSurfaceFormatsKHR( sc->vk->vkGetPhysicalDeviceSurfaceFormatsKHR(
sc->vk->physical_device, surface, &num_formats, formats); sc->vk->physical_device, surface, &num_formats, formats);
} else { } else {
@ -276,8 +277,8 @@ _check_surface_present_mode(struct vk_bundle *vk,
vk->physical_device, surface, &num_present_modes, NULL); vk->physical_device, surface, &num_present_modes, NULL);
if (num_present_modes != 0) { if (num_present_modes != 0) {
present_modes = (VkPresentModeKHR *)malloc( present_modes =
sizeof(VkPresentModeKHR) * num_present_modes); U_TYPED_ARRAY_CALLOC(VkPresentModeKHR, num_present_modes);
vk->vkGetPhysicalDeviceSurfacePresentModesKHR( vk->vkGetPhysicalDeviceSurfacePresentModesKHR(
vk->physical_device, surface, &num_present_modes, vk->physical_device, surface, &num_present_modes,
present_modes); present_modes);
@ -306,7 +307,7 @@ vk_swapchain_create_image_views(struct vk_swapchain *sc)
assert(sc->image_count > 0); assert(sc->image_count > 0);
VK_DEBUG(sc->vk, "Creating %d image views.", sc->image_count); VK_DEBUG(sc->vk, "Creating %d image views.", sc->image_count);
VkImage *images = (VkImage *)malloc(sizeof(VkImage) * sc->image_count); VkImage *images = U_TYPED_ARRAY_CALLOC(VkImage, sc->image_count);
sc->vk->vkGetSwapchainImagesKHR(sc->vk->device, sc->swap_chain, sc->vk->vkGetSwapchainImagesKHR(sc->vk->device, sc->swap_chain,
&sc->image_count, images); &sc->image_count, images);
@ -314,8 +315,8 @@ vk_swapchain_create_image_views(struct vk_swapchain *sc)
free(sc->buffers); free(sc->buffers);
} }
sc->buffers = (struct vk_swapchain_buffer *)malloc( sc->buffers =
sizeof(struct vk_swapchain_buffer) * sc->image_count); U_TYPED_ARRAY_CALLOC(struct vk_swapchain_buffer, sc->image_count);
for (uint32_t i = 0; i < sc->image_count; i++) { for (uint32_t i = 0; i < sc->image_count; i++) {
sc->buffers[i].image = images[i]; sc->buffers[i].image = images[i];

8
src/xrt/compositor/main/comp_renderer.c
View file

@ -13,6 +13,8 @@
#include <stdio.h> #include <stdio.h>
#include <assert.h> #include <assert.h>
#include "util/u_misc.h"
#include "xrt/xrt_compositor.h" #include "xrt/xrt_compositor.h"
#include "main/comp_distortion.h" #include "main/comp_distortion.h"
@ -144,7 +146,7 @@ renderer_destroy(struct comp_renderer *r);
struct comp_renderer * struct comp_renderer *
comp_renderer_create(struct comp_compositor *c) comp_renderer_create(struct comp_compositor *c)
{ {
struct comp_renderer *r = malloc(sizeof(struct comp_renderer)); struct comp_renderer *r = U_TYPED_CALLOC(struct comp_renderer);
renderer_create(r, c); renderer_create(r, c);
renderer_init(r); renderer_init(r);
@ -690,7 +692,7 @@ renderer_allocate_command_buffers(struct comp_renderer *r, uint32_t count)
r->num_cmd_buffers = count; r->num_cmd_buffers = count;
r->cmd_buffers = malloc(sizeof(VkCommandBuffer) * count); r->cmd_buffers = U_TYPED_ARRAY_CALLOC(VkCommandBuffer, count);
VkCommandBufferAllocateInfo cmd_buffer_info = { VkCommandBufferAllocateInfo cmd_buffer_info = {
.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO,
@ -797,7 +799,7 @@ renderer_create_frame_buffers(struct comp_renderer *r, uint32_t count)
if (r->frame_buffers != NULL) if (r->frame_buffers != NULL)
free(r->frame_buffers); free(r->frame_buffers);
r->frame_buffers = malloc(sizeof(VkFramebuffer) * count); r->frame_buffers = U_TYPED_ARRAY_CALLOC(VkFramebuffer, count);
for (uint32_t i = 0; i < count; i++) { for (uint32_t i = 0; i < count; i++) {
VkImageView attachments[1] = { VkImageView attachments[1] = {