blender
/
blender
134
425
Fork 606
Code Issues 6.3k Pull Requests 772 Projects 19 Wiki Activity

Vulkan: Clearing Framebuffer + Scissors #106044

Merged
Jeroen Bakker merged 49 commits from Jeroen-Bakker/blender:vulkan-framebuffer-clear into main 2023-03-28 11:51:45 +02:00
Conversation 0 Commits 49 Files Changed 12 -14
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4d0707ab66 - Show all commits

11
source/blender/gpu/opengl/gl_debug.cc
View File

@ -383,16 +383,6 @@ void GLContext::debug_group_end()
bool GLContext::debug_capture_begin() bool GLContext::debug_capture_begin()
{ {
<<<<<<< HEAD
GLBackend::get()->debug_capture_begin();
return true;
}
void GLBackend::debug_capture_begin()
{
#ifdef WITH_RENDERDOC
renderdoc_.start_frame_capture(nullptr, nullptr);
=======
return GLBackend::get()->debug_capture_begin(); return GLBackend::get()->debug_capture_begin();
} }
@ -402,7 +392,6 @@ bool GLBackend::debug_capture_begin()
return renderdoc_.start_frame_capture(nullptr, nullptr); return renderdoc_.start_frame_capture(nullptr, nullptr);
#else #else
return false; return false;
>>>>>>> main
#endif #endif
} }

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

@ -128,7 +128,6 @@ void VKContext::memory_statistics_get(int * /*total_mem*/, int * /*free_mem*/)
{ {
} }
<<<<<<< HEAD
void VKContext::activate_framebuffer(VKFrameBuffer &framebuffer) void VKContext::activate_framebuffer(VKFrameBuffer &framebuffer)
{ {
if (has_active_framebuffer()) { if (has_active_framebuffer()) {
@ -153,6 +152,4 @@ void VKContext::deactivate_framebuffer()
active_fb = nullptr; active_fb = nullptr;
} }
=======
>>>>>>> main
} // namespace blender::gpu } // namespace blender::gpu