mac app updated to latest golang/mobile which redefined TexImage2D me…

…thod
goki · Sep 20, 2018 · 39399c7 · 39399c7
1 parent 343221d
commit 39399c7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/giv/filetree.go b/giv/filetree.go
@@ -42,6 +42,7 @@ var FileTreeProps = ki.Props{}
 // already stored about files.  Only paths listed in OpenDirs will be opened.
 func (ft *FileTree) OpenPath(path string) {
 	ft.FRoot = ft // we are our own root..
+	ft.Kind = "Folder"
 	ft.OpenDirs.ClearFlags()
 	ft.ReadDir(path)
 }

diff --git a/oswin/driver/macdriver/app.go b/oswin/driver/macdriver/app.go
@@ -110,7 +110,7 @@ func (app *appImpl) NewTexture(win oswin.Window, size image.Point) (oswin.Textur
 	}
 
 	glctx.BindTexture(gl.TEXTURE_2D, t.id)
-	glctx.TexImage2D(gl.TEXTURE_2D, 0, size.X, size.Y, gl.RGBA, gl.UNSIGNED_BYTE, nil)
+	glctx.TexImage2D(gl.TEXTURE_2D, 0, gl.RGBA, size.X, size.Y, gl.RGBA, gl.UNSIGNED_BYTE, nil)
 	glctx.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR)
 	glctx.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR)
 	glctx.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE)