From bd8fa0d7bb3dae9351e292663ab589ff507038cf Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Wed, 1 Jul 2015 10:44:19 +1000 Subject: [PATCH] gl/glutil: move to exp/gl/glutil. Change-Id: I310c365300cb3fbf8a1abb630e26661fa7ef4844 Reviewed-on: https://go-review.googlesource.com/11824 Reviewed-by: Hyang-Ah Hana Kim --- example/basic/main.go | 2 +- exp/app/debug/fps.go | 2 +- {gl => exp/gl}/glutil/context_darwin_amd64.go | 0 {gl => exp/gl}/glutil/context_x11.go | 0 {gl => exp/gl}/glutil/glimage.go | 0 {gl => exp/gl}/glutil/glimage_test.go | 0 {gl => exp/gl}/glutil/glutil.go | 2 +- exp/sprite/glsprite/glsprite.go | 2 +- 8 files changed, 4 insertions(+), 4 deletions(-) rename {gl => exp/gl}/glutil/context_darwin_amd64.go (100%) rename {gl => exp/gl}/glutil/context_x11.go (100%) rename {gl => exp/gl}/glutil/glimage.go (100%) rename {gl => exp/gl}/glutil/glimage_test.go (100%) rename {gl => exp/gl}/glutil/glutil.go (97%) diff --git a/example/basic/main.go b/example/basic/main.go index b7493b4..ca4cfb2 100644 --- a/example/basic/main.go +++ b/example/basic/main.go @@ -33,10 +33,10 @@ import ( "golang.org/x/mobile/app" "golang.org/x/mobile/event" "golang.org/x/mobile/exp/app/debug" + "golang.org/x/mobile/exp/gl/glutil" "golang.org/x/mobile/f32" "golang.org/x/mobile/geom" "golang.org/x/mobile/gl" - "golang.org/x/mobile/gl/glutil" ) var ( diff --git a/exp/app/debug/fps.go b/exp/app/debug/fps.go index e6c211b..09fccb1 100644 --- a/exp/app/debug/fps.go +++ b/exp/app/debug/fps.go @@ -13,8 +13,8 @@ import ( "time" "golang.org/x/mobile/event" + "golang.org/x/mobile/exp/gl/glutil" "golang.org/x/mobile/geom" - "golang.org/x/mobile/gl/glutil" ) var lastDraw = time.Now() diff --git a/gl/glutil/context_darwin_amd64.go b/exp/gl/glutil/context_darwin_amd64.go similarity index 100% rename from gl/glutil/context_darwin_amd64.go rename to exp/gl/glutil/context_darwin_amd64.go diff --git a/gl/glutil/context_x11.go b/exp/gl/glutil/context_x11.go similarity index 100% rename from gl/glutil/context_x11.go rename to exp/gl/glutil/context_x11.go diff --git a/gl/glutil/glimage.go b/exp/gl/glutil/glimage.go similarity index 100% rename from gl/glutil/glimage.go rename to exp/gl/glutil/glimage.go diff --git a/gl/glutil/glimage_test.go b/exp/gl/glutil/glimage_test.go similarity index 100% rename from gl/glutil/glimage_test.go rename to exp/gl/glutil/glimage_test.go diff --git a/gl/glutil/glutil.go b/exp/gl/glutil/glutil.go similarity index 97% rename from gl/glutil/glutil.go rename to exp/gl/glutil/glutil.go index 75dd673..f97a8a9 100644 --- a/gl/glutil/glutil.go +++ b/exp/gl/glutil/glutil.go @@ -3,7 +3,7 @@ // license that can be found in the LICENSE file. // Package glutil implements OpenGL utility functions. -package glutil // import "golang.org/x/mobile/gl/glutil" +package glutil // import "golang.org/x/mobile/exp/gl/glutil" import ( "fmt" diff --git a/exp/sprite/glsprite/glsprite.go b/exp/sprite/glsprite/glsprite.go index c436145..52b29be 100644 --- a/exp/sprite/glsprite/glsprite.go +++ b/exp/sprite/glsprite/glsprite.go @@ -13,11 +13,11 @@ import ( "image/draw" "golang.org/x/mobile/event" + "golang.org/x/mobile/exp/gl/glutil" "golang.org/x/mobile/exp/sprite" "golang.org/x/mobile/exp/sprite/clock" "golang.org/x/mobile/f32" "golang.org/x/mobile/geom" - "golang.org/x/mobile/gl/glutil" ) type node struct {