From 107189a00db508e57127598a6357325e6caa4cee Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Sun, 25 Aug 2024 15:43:44 +0900 Subject: [PATCH] internal/shader: use strings.TrimPrefix --- internal/shader/shader_test.go | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/internal/shader/shader_test.go b/internal/shader/shader_test.go index 954ba099d..cb53d74d5 100644 --- a/internal/shader/shader_test.go +++ b/internal/shader/shader_test.go @@ -31,32 +31,24 @@ import ( func glslVertexNormalize(str string) string { p := glsl.VertexPrelude(glsl.GLSLVersionDefault) - if strings.HasPrefix(str, p) { - str = str[len(p):] - } + str = strings.TrimPrefix(str, p) return strings.TrimSpace(str) } func glslFragmentNormalize(str string) string { p := glsl.FragmentPrelude(glsl.GLSLVersionDefault) - if strings.HasPrefix(str, p) { - str = str[len(p):] - } + str = strings.TrimPrefix(str, p) return strings.TrimSpace(str) } func hlslNormalize(str string) string { - if strings.HasPrefix(str, hlsl.Prelude) { - str = str[len(hlsl.Prelude):] - } + str = strings.TrimPrefix(str, hlsl.Prelude) return strings.TrimSpace(str) } func metalNormalize(str string) string { prelude := msl.Prelude(shaderir.Texels) - if strings.HasPrefix(str, prelude) { - str = str[len(prelude):] - } + str = strings.TrimPrefix(str, prelude) return strings.TrimSpace(str) }