blender/blender
150
482
Fork 710
Code Issues 6.7k Pull Requests 888 Projects 18 Wiki Activity

Vulkan: Rewrite GHOST_ContextVK #111473

Merged
Jeroen Bakker merged 21 commits from Jeroen-Bakker/blender:vulkan/swap-chain-callbacks into main 2023-08-29 15:05:16 +02:00
Conversation 2 Commits 21 Files Changed 25 +54 -10
7 changed files with 54 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d0b2ced1ca - Show all commits

20
source/blender/gpu/vulkan/vk_command_buffer.cc
View File

@ -78,6 +78,7 @@ void VKCommandBuffer::init(const VKDevice &device)
void VKCommandBuffer::begin_recording()
{
ensure_no_active_framebuffer();
std::cout << __func__ << "\n";
if (is_in_stage(Stage::Submitted)) {
vkWaitForFences(vk_device_, 1, &vk_fence_, VK_TRUE, FenceTimeout);
vkResetFences(vk_device_, 1, &vk_fence_);
@ -96,6 +97,7 @@ void VKCommandBuffer::begin_recording()
void VKCommandBuffer::end_recording()
{
std::cout << __func__ << "\n";
ensure_no_active_framebuffer();
vkEndCommandBuffer(vk_command_buffer_);
stage_transfer(Stage::Recording, Stage::BetweenRecordingAndSubmitting);
@ -144,14 +146,16 @@ void VKCommandBuffer::bind(const VKBufferWithOffset &index_buffer, VkIndexType i
vk_command_buffer_, index_buffer.buffer.vk_handle(), index_buffer.offset, index_type);
}
void VKCommandBuffer::begin_render_pass(const VKFrameBuffer &framebuffer)
void VKCommandBuffer::begin_render_pass(VKFrameBuffer &framebuffer)
{
std::cout << __func__ << "\n";
validate_framebuffer_not_exists();
state.framebuffer_ = &framebuffer;
}
void VKCommandBuffer::end_render_pass(const VKFrameBuffer &framebuffer)
{
std::cout << __func__ << "\n";
UNUSED_VARS_NDEBUG(framebuffer);
validate_framebuffer_exists();
BLI_assert(state.framebuffer_ == &framebuffer);
@ -197,6 +201,7 @@ void VKCommandBuffer::copy(VKTexture &dst_texture,
Span<VkBufferImageCopy> regions)
{
ensure_no_active_framebuffer();
std::cout << __func__ << "\n";
vkCmdCopyBufferToImage(vk_command_buffer_,
src_buffer.vk_handle(),
dst_texture.vk_image_handle(),
@ -210,6 +215,7 @@ void VKCommandBuffer::copy(VKTexture &dst_texture,
Span<VkImageCopy> regions)
{
ensure_no_active_framebuffer();
std::cout << __func__ << "\n";
vkCmdCopyImage(vk_command_buffer_,
src_texture.vk_image_handle(),
src_texture.current_layout_get(),
@ -236,6 +242,7 @@ void VKCommandBuffer::blit(VKTexture &dst_texture,
VkImageLayout src_layout,
Span<VkImageBlit> regions)
{
std::cout << __func__ << "\n";
ensure_no_active_framebuffer();
vkCmdBlitImage(vk_command_buffer_,
src_texture.vk_image_handle(),
@ -265,6 +272,7 @@ void VKCommandBuffer::clear(Span<VkClearAttachment> attachments, Span<VkClearRec
{
validate_framebuffer_exists();
ensure_active_framebuffer();
std::cout << __func__ << "\n";
vkCmdClearAttachments(
vk_command_buffer_, attachments.size(), attachments.data(), areas.size(), areas.data());
}
@ -273,6 +281,7 @@ void VKCommandBuffer::draw(int v_first, int v_count, int i_first, int i_count)
{
validate_framebuffer_exists();
ensure_active_framebuffer();
std::cout << __func__ << "\n";
vkCmdDraw(vk_command_buffer_, v_count, i_count, v_first, i_first);
state.draw_counts++;
}
@ -282,6 +291,7 @@ void VKCommandBuffer::draw_indexed(
{
validate_framebuffer_exists();
ensure_active_framebuffer();
std::cout << __func__ << "\n";
vkCmdDrawIndexed(
vk_command_buffer_, index_count, instance_count, first_index, vertex_offset, first_instance);
state.draw_counts++;
@ -294,6 +304,7 @@ void VKCommandBuffer::draw_indirect(const VKStorageBuffer &buffer,
{
validate_framebuffer_exists();
ensure_active_framebuffer();
std::cout << __func__ << "\n";
vkCmdDrawIndirect(vk_command_buffer_, buffer.vk_handle(), offset, draw_count, stride);
state.draw_counts++;
}
@ -306,6 +317,7 @@ void VKCommandBuffer::draw_indexed_indirect(const VKStorageBuffer &buffer,
{
validate_framebuffer_exists();
ensure_active_framebuffer();
std::cout << __func__ << "\n";
vkCmdDrawIndexedIndirect(vk_command_buffer_, buffer.vk_handle(), offset, draw_count, stride);
state.draw_counts++;
}
@ -316,6 +328,7 @@ void VKCommandBuffer::pipeline_barrier(VkPipelineStageFlags source_stages,
if (state.framebuffer_) {
ensure_active_framebuffer();
}
std::cout << __func__ << "\n";
vkCmdPipelineBarrier(vk_command_buffer_,
source_stages,
destination_stages,
@ -331,6 +344,7 @@ void VKCommandBuffer::pipeline_barrier(VkPipelineStageFlags source_stages,
void VKCommandBuffer::pipeline_barrier(Span<VkImageMemoryBarrier> image_memory_barriers)
{
ensure_no_active_framebuffer();
std::cout << __func__ << "\n";
vkCmdPipelineBarrier(vk_command_buffer_,
VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
@ -378,6 +392,7 @@ void VKCommandBuffer::submit_encoded_commands()
submit_info.commandBufferCount = 1;
submit_info.pCommandBuffers = &vk_command_buffer_;
std::cout << __func__ << "\n";
vkQueueSubmit(vk_queue_, 1, &submit_info, vk_fence_);
submission_id_.next();
stage_transfer(Stage::BetweenRecordingAndSubmitting, Stage::Submitted);
@ -402,6 +417,7 @@ void VKCommandBuffer::ensure_no_active_framebuffer()
{
state.checks_++;
if (state.framebuffer_ && state.framebuffer_active_) {
std::cout << __func__ << "\n";
vkCmdEndRenderPass(vk_command_buffer_);
state.framebuffer_active_ = false;
state.switches_++;
@ -415,6 +431,7 @@ void VKCommandBuffer::ensure_active_framebuffer()
if (!state.framebuffer_active_) {
VkRenderPassBeginInfo render_pass_begin_info = {};
render_pass_begin_info.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO;
state.framebuffer_->vk_render_pass_ensure();
render_pass_begin_info.renderPass = state.framebuffer_->vk_render_pass_get();
render_pass_begin_info.framebuffer = state.framebuffer_->vk_framebuffer_get();
render_pass_begin_info.renderArea = state.framebuffer_->vk_render_areas_get()[0];
@ -423,6 +440,7 @@ void VKCommandBuffer::ensure_active_framebuffer()
render_pass_begin_info.clearValueCount = 1;
render_pass_begin_info.pClearValues = &clear_value;
std::cout << __func__ << "\n";
vkCmdBeginRenderPass(vk_command_buffer_, &render_pass_begin_info, VK_SUBPASS_CONTENTS_INLINE);
state.framebuffer_active_ = true;
state.switches_++;

4
source/blender/gpu/vulkan/vk_command_buffer.hh
View File

@ -78,7 +78,7 @@ class VKCommandBuffer : NonCopyable, NonMovable {
*/
struct {
/* Reference to the last_framebuffer where begin_render_pass was called for. */
const VKFrameBuffer *framebuffer_ = nullptr;
VKFrameBuffer *framebuffer_ = nullptr;
/* Is last_framebuffer_ currently bound. Each call should ensure the correct state. */
bool framebuffer_active_ = false;
/* Amount of times a check has been requested. */
@ -151,7 +151,7 @@ class VKCommandBuffer : NonCopyable, NonMovable {
/* Bind the given buffer as an index buffer. */
void bind(const VKBufferWithOffset &index_buffer, VkIndexType index_type);
void begin_render_pass(const VKFrameBuffer &framebuffer);
void begin_render_pass(VKFrameBuffer &framebuffer);
void end_render_pass(const VKFrameBuffer &framebuffer);
/**

6
source/blender/gpu/vulkan/vk_context.cc
View File

@ -172,9 +172,7 @@ void VKContext::deactivate_framebuffer()
{
VKFrameBuffer *framebuffer = active_framebuffer_get();
BLI_assert(framebuffer != nullptr);
if (framebuffer->is_valid()) {
command_buffer_.end_render_pass(*framebuffer);
}
command_buffer_.end_render_pass(*framebuffer);
active_fb = nullptr;
}
@ -233,6 +231,7 @@ void VKContext::swap_buffers_post_callback()
void VKContext::swap_buffers_pre_handler(const GHOST_VulkanSwapChainData &swap_chain_data)
{
std::cout << __func__ << "\n";
VKFrameBuffer &framebuffer = *unwrap(back_left);
VKTexture wrapper("display_texture");
@ -240,6 +239,7 @@ void VKContext::swap_buffers_pre_handler(const GHOST_VulkanSwapChainData &swap_c
VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
to_gpu_format(swap_chain_data.format));
wrapper.layout_ensure(*this, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
framebuffer.color_attachment_layout_ensure(*this, 0, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
VKTexture *color_attachment = unwrap(unwrap(framebuffer.color_tex(0)));
color_attachment->layout_ensure(*this, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);

1
source/blender/gpu/vulkan/vk_debug.cc
View File

@ -300,6 +300,7 @@ messenger_callback(VkDebugUtilsMessageSeverityFlagBitsEXT message_severity,
BLI_assert(callback_data->messageIdNumber != 0x7a4e4265);
// BLI_assert(callback_data->messageIdNumber != 0x4dae5635);
BLI_assert(severity != CLG_SEVERITY_ERROR);
return VK_FALSE;
};

23
source/blender/gpu/vulkan/vk_framebuffer.cc
View File

@ -42,8 +42,6 @@ void VKFrameBuffer::bind(bool /*enabled_srgb*/)
context.deactivate_framebuffer();
}
update_attachments();
context.activate_framebuffer(*this);
}
@ -191,6 +189,7 @@ void VKFrameBuffer::attachment_set_loadstore_op(GPUAttachmentType /*type*/,
eGPULoadOp /*load_action*/,
eGPUStoreOp /*store_action*/)
{
NOT_YET_IMPLEMENTED;
}
/** \} */
@ -297,12 +296,11 @@ void VKFrameBuffer::blit_to(eGPUFrameBufferBits planes,
/** \name Update attachments
* \{ */
void VKFrameBuffer::update_attachments()
void VKFrameBuffer::vk_render_pass_ensure()
{
if (!dirty_attachments_) {
return;
}
render_pass_free();
render_pass_create();
@ -458,6 +456,23 @@ void VKFrameBuffer::render_pass_free()
vk_framebuffer_ = VK_NULL_HANDLE;
}
void VKFrameBuffer::color_attachment_layout_ensure(VKContext &context,
int color_attachment,
VkImageLayout requested_layout)
{
VKTexture *color_texture = unwrap(unwrap(color_tex(color_attachment)));
if (color_texture == nullptr) {
return;
}
if (color_texture->current_layout_get() == requested_layout) {
return;
}
color_texture->layout_ensure(context, requested_layout);
dirty_attachments_ = true;
}
/** \} */
} // namespace blender::gpu

7
source/blender/gpu/vulkan/vk_framebuffer.hh
View File

@ -82,14 +82,21 @@ class VKFrameBuffer : public FrameBuffer {
return vk_framebuffer_;
}
void vk_render_pass_ensure();
VkRenderPass vk_render_pass_get() const
{
BLI_assert(vk_render_pass_ != VK_NULL_HANDLE);
BLI_assert(!dirty_attachments_);
return vk_render_pass_;
}
Array<VkViewport, 16> vk_viewports_get() const;
Array<VkRect2D, 16> vk_render_areas_get() const;
void color_attachment_layout_ensure(VKContext &context,
int color_attachment,
VkImageLayout requested_layout);
private:
void update_attachments();
void render_pass_free();

3
source/blender/gpu/vulkan/vk_texture.cc
View File

@ -514,6 +514,9 @@ void VKTexture::layout_ensure(VKContext &context,
const VkImageLayout current_layout,
const VkImageLayout requested_layout)
{
if (requested_layout == VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL) {
std::cout << __func__ << "(image:" << vk_image_ << " new_layout:" << requested_layout << ")\n";
}
VkImageMemoryBarrier barrier{};
barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
barrier.oldLayout = current_layout;