diff options
Diffstat (limited to 'render/vulkan')
| -rw-r--r-- | render/vulkan/renderer.c | 38 | ||||
| -rw-r--r-- | render/vulkan/texture.c | 13 |
2 files changed, 47 insertions, 4 deletions
diff --git a/render/vulkan/renderer.c b/render/vulkan/renderer.c index 8bf01b1d..e620b42e 100644 --- a/render/vulkan/renderer.c +++ b/render/vulkan/renderer.c @@ -42,8 +42,12 @@ static bool default_debug = true; static const struct wlr_renderer_impl renderer_impl; +bool wlr_renderer_is_vk(struct wlr_renderer *wlr_renderer) { + return wlr_renderer->impl == &renderer_impl; +} + struct wlr_vk_renderer *vulkan_get_renderer(struct wlr_renderer *wlr_renderer) { - assert(wlr_renderer->impl == &renderer_impl); + assert(wlr_renderer_is_vk(wlr_renderer)); return (struct wlr_vk_renderer *)wlr_renderer; } @@ -1817,3 +1821,35 @@ struct wlr_renderer *wlr_vk_renderer_create_with_drm_fd(int drm_fd) { return vulkan_renderer_create_for_device(dev); } + +VkInstance wlr_vk_renderer_get_instance(struct wlr_renderer *renderer) +{ + struct wlr_vk_renderer *vk_renderer = vulkan_get_renderer(renderer); + return vk_renderer->dev->instance->instance; +} + +VkPhysicalDevice wlr_vk_renderer_get_physical_device(struct wlr_renderer *renderer) +{ + struct wlr_vk_renderer *vk_renderer = vulkan_get_renderer(renderer); + return vk_renderer->dev->phdev; +} + +VkDevice wlr_vk_renderer_get_device(struct wlr_renderer *renderer) +{ + struct wlr_vk_renderer *vk_renderer = vulkan_get_renderer(renderer); + return vk_renderer->dev->dev; +} + +uint32_t wlr_vk_renderer_get_queue_family(struct wlr_renderer *renderer) +{ + struct wlr_vk_renderer *vk_renderer = vulkan_get_renderer(renderer); + return vk_renderer->dev->queue_family; +} + +void wlr_vk_renderer_get_current_image_attribs(struct wlr_renderer *renderer, + struct wlr_vk_image_attribs *attribs) { + struct wlr_vk_renderer *vk_renderer = vulkan_get_renderer(renderer); + attribs->image = vk_renderer->current_render_buffer->image; + attribs->format = vk_renderer->current_render_buffer->render_setup->render_format; + attribs->layout = VK_IMAGE_LAYOUT_UNDEFINED; +} diff --git a/render/vulkan/texture.c b/render/vulkan/texture.c index 3eaab3ae..5776233c 100644 --- a/render/vulkan/texture.c +++ b/render/vulkan/texture.c @@ -283,8 +283,6 @@ static struct wlr_texture *vulkan_texture_from_pixels( .usage = VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT, }; - VkImageLayout layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; - res = vkCreateImage(dev, &img_info, NULL, &texture->image); if (res != VK_SUCCESS) { wlr_vk_error("vkCreateImage failed", res); @@ -362,7 +360,7 @@ static struct wlr_texture *vulkan_texture_from_pixels( VkDescriptorImageInfo ds_img_info = { .imageView = texture->image_view, - .imageLayout = layout, + .imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, }; VkWriteDescriptorSet ds_write = { @@ -771,3 +769,12 @@ struct wlr_texture *vulkan_texture_from_buffer(struct wlr_renderer *wlr_renderer return NULL; } } + +void wlr_vk_texture_get_image_attribs(struct wlr_texture *texture, + struct wlr_vk_image_attribs *attribs) { + struct wlr_vk_texture *vk_texture = vulkan_get_texture(texture); + attribs->image = vk_texture->image; + attribs->format = vk_texture->format->vk_format; + attribs->layout = vk_texture->transitioned ? + VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL : VK_IMAGE_LAYOUT_UNDEFINED; +} |