griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.5-release'

Browse Source
This commit is contained in:
Clément Foucault
2025-06-16 11:02:55 +02:00
parent 5096632b83 7da81b5f39
commit 0b5b1932a0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/gpu/intern/gpu_shader.cc
View File

@@ -819,7 +819,7 @@ Shader *ShaderCompiler::compile(const shader::ShaderCreateInfo &info, bool is_ba
GPU_debug_group_begin(GPU_DEBUG_SHADER_COMPILATION_GROUP);
GPU_debug_group_begin(info.name_.c_str());
}
else {
else if (G.profile_gpu) {
start_time = Clock::now();
}
@@ -975,7 +975,7 @@ Shader *ShaderCompiler::compile(const shader::ShaderCreateInfo &info, bool is_ba
GPU_debug_group_end();
GPU_debug_group_end();
}
else {
else if (G.profile_gpu) {
TimePoint end_time = Clock::now();
/* Note: Used by the vulkan backend. Use the same time_since_epoch as process_frame_timings. */
ProfileReport::get().add_group_cpu(GPU_DEBUG_SHADER_COMPILATION_GROUP,