From 2c7aba9e7c8fd50567dd847910d24b4ae1b63ce3 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Fri, 5 Mar 2021 16:06:57 +0100 Subject: [PATCH] gpu/internal/convertshaders: move internal/cmd/convertshaders The convert program is only used by the shaders from package gpu, and we're about to make the backend package imported by the program internal to package gpu. Move the converter below package gpu. Signed-off-by: Elias Naur --- gpu/gen.go | 2 +- gpu/headless/gen.go | 2 +- {internal/cmd => gpu/internal}/convertshaders/glslcc.go | 0 {internal/cmd => gpu/internal}/convertshaders/glslvalidate.go | 0 {internal/cmd => gpu/internal}/convertshaders/hlsl.go | 0 {internal/cmd => gpu/internal}/convertshaders/main.go | 0 {internal/cmd => gpu/internal}/convertshaders/spirvcross.go | 0 {internal/cmd => gpu/internal}/convertshaders/workdir.go | 0 8 files changed, 2 insertions(+), 2 deletions(-) rename {internal/cmd => gpu/internal}/convertshaders/glslcc.go (100%) rename {internal/cmd => gpu/internal}/convertshaders/glslvalidate.go (100%) rename {internal/cmd => gpu/internal}/convertshaders/hlsl.go (100%) rename {internal/cmd => gpu/internal}/convertshaders/main.go (100%) rename {internal/cmd => gpu/internal}/convertshaders/spirvcross.go (100%) rename {internal/cmd => gpu/internal}/convertshaders/workdir.go (100%) diff --git a/gpu/gen.go b/gpu/gen.go index 709d0a78..238f002e 100644 --- a/gpu/gen.go +++ b/gpu/gen.go @@ -2,4 +2,4 @@ package gpu -//go:generate go run ../internal/cmd/convertshaders -package gpu +//go:generate go run ./internal/convertshaders -package gpu diff --git a/gpu/headless/gen.go b/gpu/headless/gen.go index dc89e1f7..b9e1fed6 100644 --- a/gpu/headless/gen.go +++ b/gpu/headless/gen.go @@ -2,4 +2,4 @@ package headless -//go:generate go run ../../internal/cmd/convertshaders -package headless +//go:generate go run ../internal/convertshaders -package headless diff --git a/internal/cmd/convertshaders/glslcc.go b/gpu/internal/convertshaders/glslcc.go similarity index 100% rename from internal/cmd/convertshaders/glslcc.go rename to gpu/internal/convertshaders/glslcc.go diff --git a/internal/cmd/convertshaders/glslvalidate.go b/gpu/internal/convertshaders/glslvalidate.go similarity index 100% rename from internal/cmd/convertshaders/glslvalidate.go rename to gpu/internal/convertshaders/glslvalidate.go diff --git a/internal/cmd/convertshaders/hlsl.go b/gpu/internal/convertshaders/hlsl.go similarity index 100% rename from internal/cmd/convertshaders/hlsl.go rename to gpu/internal/convertshaders/hlsl.go diff --git a/internal/cmd/convertshaders/main.go b/gpu/internal/convertshaders/main.go similarity index 100% rename from internal/cmd/convertshaders/main.go rename to gpu/internal/convertshaders/main.go diff --git a/internal/cmd/convertshaders/spirvcross.go b/gpu/internal/convertshaders/spirvcross.go similarity index 100% rename from internal/cmd/convertshaders/spirvcross.go rename to gpu/internal/convertshaders/spirvcross.go diff --git a/internal/cmd/convertshaders/workdir.go b/gpu/internal/convertshaders/workdir.go similarity index 100% rename from internal/cmd/convertshaders/workdir.go rename to gpu/internal/convertshaders/workdir.go