Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +6 -6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5e0cc9d277 - Show all commits

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

@ -389,17 +389,17 @@ void GLContext::debug_capture_end()
{
}
void *GLContext::debug_capture_scope_create(const char *name)
void *GLContext::debug_capture_scope_create(const char * /*name*/)
{
return nullptr;
}
bool GLContext::debug_capture_scope_begin(void *scope)
bool GLContext::debug_capture_scope_begin(void * /*scope*/)
{
return false;
}
void GLContext::debug_capture_scope_end(void *scope)
void GLContext::debug_capture_scope_end(void * /*scope*/)
{
}

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

@ -137,17 +137,17 @@ void VKContext::debug_capture_end()
{
}
void *VKContext::debug_capture_scope_create(const char *name)
void *VKContext::debug_capture_scope_create(const char * /*name*/)
{
return nullptr;
}
bool VKContext::debug_capture_scope_begin(void *scope)
bool VKContext::debug_capture_scope_begin(void * /*scope*/)
{
return false;
}
void VKContext::debug_capture_scope_end(void *scope)
void VKContext::debug_capture_scope_end(void * /*scope*/)
{
}