mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-11-14 23:17:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/debug: better info for first callers

Browse Source
This commit is contained in:
Hajime Hoshi 2024-10-16 11:11:00 +09:00
parent 28f6d8841d
commit 71ae311355
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
internal/debug/caller.go
View File

@ -30,8 +30,16 @@ var (
ebitengineFileDirOnce sync.Once ebitengineFileDirOnce sync.Once
) )
type CallerType int
const (
CallerTypeNone CallerType = iota
CallerTypeRegular
CallerTypeInternal
)
// FirstCaller returns the file and line number of the first caller outside of Ebitengine. // FirstCaller returns the file and line number of the first caller outside of Ebitengine.
func FirstCaller() (file string, line int, ok bool) { func FirstCaller() (file string, line int, callerType CallerType) {
ebitengineFileDirOnce.Do(func() { ebitengineFileDirOnce.Do(func() {
cmd := exec.Command("go", "list", "-f", "{{.Dir}}", "github.com/hajimehoshi/ebiten/v2") cmd := exec.Command("go", "list", "-f", "{{.Dir}}", "github.com/hajimehoshi/ebiten/v2")
out, err := cmd.Output() out, err := cmd.Output()
@ -46,7 +54,7 @@ func FirstCaller() (file string, line int, ok bool) {
// Go command is not found. // Go command is not found.
if ebitengineFileDir == "" { if ebitengineFileDir == "" {
return "", 0, false return "", 0, CallerTypeNone
} }
// Relying on a caller stacktrace is very fragile, but this is fine as this is only for debugging. // Relying on a caller stacktrace is very fragile, but this is fine as this is only for debugging.
@ -66,11 +74,17 @@ func FirstCaller() (file string, line int, ok bool) {
continue continue
} }
if path.Dir(file) == ebitengineFileDir || path.Dir(file) == ebitengineFileDir+"/colorm" || path.Dir(file) == ebitengineFileDir+"/text" || path.Dir(file) == ebitengineFileDir+"/text/v2" { if path.Dir(file) == ebitengineFileDir {
continue continue
} }
return file, line, true if strings.HasPrefix(path.Dir(file), ebitengineFileDir+"/") && !strings.HasPrefix(path.Dir(file), ebitengineFileDir+"/examples/") {
if strings.HasPrefix(path.Dir(file), ebitengineFileDir+"/internal/") {
return file, line, CallerTypeInternal
}
continue
}
return file, line, CallerTypeRegular
} }
return "", 0, false return "", 0, CallerTypeNone
} }

7
internal/graphicscommand/commandqueue.go
View File

@ -163,9 +163,14 @@ func (q *commandQueue) EnqueueDrawTrianglesCommand(dst *Image, srcs [graphics.Sh
c.shader = shader c.shader = shader
c.uniforms = uniforms c.uniforms = uniforms
c.fillRule = fillRule c.fillRule = fillRule
c.firstCaller = ""
if debug.IsDebug { if debug.IsDebug {
if file, line, ok := debug.FirstCaller(); ok { file, line, typ := debug.FirstCaller()
switch typ {
case debug.CallerTypeRegular:
c.firstCaller = fmt.Sprintf("%s:%d", file, line) c.firstCaller = fmt.Sprintf("%s:%d", file, line)
case debug.CallerTypeInternal:
c.firstCaller = fmt.Sprintf("%s:%d (internal)", file, line)
} }
} }
q.commands = append(q.commands, c) q.commands = append(q.commands, c)