[Bf-blender-cvs] [36127e042b9] temp-vulkan-shader: Improve shader log to add correct filenames.

[Jeroen Bakker]

Commit: 36127e042b97616c51987250881f774de12e27e8
Author: Jeroen Bakker
Date:   Fri Nov 25 14:15:42 2022 +0100
Branches: temp-vulkan-shader
https://developer.blender.org/rB36127e042b97616c51987250881f774de12e27e8

Improve shader log to add correct filenames.

===================================================================

M	source/blender/gpu/vulkan/vk_shader_log.cc
M	source/blender/gpu/vulkan/vk_shader_log.hh

===================================================================

diff --git a/source/blender/gpu/vulkan/vk_shader_log.cc b/source/blender/gpu/vulkan/vk_shader_log.cc
index 7549f983d9c..4a7d1771c53 100644
--- a/source/blender/gpu/vulkan/vk_shader_log.cc
+++ b/source/blender/gpu/vulkan/vk_shader_log.cc
@@ -13,7 +13,7 @@ namespace blender::gpu {
 
 char *VKLogParser::parse_line(char *log_line, GPULogItem &log_item)
 {
-  log_line = skip_name_and_stage(log_line);
+  log_line = skip_name(log_line);
   log_line = skip_separators(log_line, ":");
 
   /* Parse error line & char numbers. */
@@ -31,14 +31,9 @@ char *VKLogParser::parse_line(char *log_line, GPULogItem &log_item)
   return log_line;
 }
 
-char *VKLogParser::skip_name_and_stage(char *log_line)
+char *VKLogParser::skip_name(char *log_line)
 {
-  char *name_skip = skip_until(log_line, '.');
-  if (name_skip == log_line) {
-    return log_line;
-  }
-
-  return skip_until(name_skip, ':');
+  return skip_until(log_line, ':');
 }
 
 char *VKLogParser::skip_severity_keyword(char *log_line, GPULogItem &log_item)
diff --git a/source/blender/gpu/vulkan/vk_shader_log.hh b/source/blender/gpu/vulkan/vk_shader_log.hh
index cd5bd49e4fb..fb12b7a5039 100644
--- a/source/blender/gpu/vulkan/vk_shader_log.hh
+++ b/source/blender/gpu/vulkan/vk_shader_log.hh
@@ -10,7 +10,7 @@ class VKLogParser : public GPULogParser {
   char *parse_line(char *log_line, GPULogItem &log_item) override;
 
  protected:
-  char *skip_name_and_stage(char *log_line);
+  char *skip_name(char *log_line);
   char *skip_severity_keyword(char *log_line, GPULogItem &log_item);
 };
 }  // namespace blender::gpu
\ No newline at end of file