Merge pull request #38 from EngoEngine/texture-uniforms

Texture uniforms
EngoEngine · Mar 5, 2022 · d543425 · d543425
2 parents d0e7659 + 613f545
commit d543425
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 4 deletions.
diff --git a/gl_empty.go b/gl_empty.go
@@ -4,6 +4,7 @@
 // of whatever's supposed to be returned, except returns true for booleans in case
 // success checks are used.
 
+//go:build nogl
 // +build nogl
 
 package gl
@@ -450,6 +451,8 @@ func (c *Context) Uniform1f(location *UniformLocation, x float32) {}
 
 func (c *Context) Uniform1i(location *UniformLocation, x int) {}
 
+func (c *Context) Uniform1iTexture(location *UniformLocation, tex *Texture) {}
+
 func (c *Context) Uniform2f(location *UniformLocation, x, y float32) {}
 
 func (c *Context) Uniform3f(location *UniformLocation, x, y, z float32) {}

diff --git a/gl_gl2.go b/gl_gl2.go
@@ -910,6 +910,11 @@ func (c *Context) Uniform1i(location *UniformLocation, x int) {
 	gl.Uniform1i(location.int32, int32(x))
 }
 
+// Assigns a texture to a uniform variable for the current program object.
+func (c *Context) Uniform1iTexture(location *UniformLocation, tex *Texture) {
+	gl.Uniform1i(location.int32, int32(tex.uint32))
+}
+
 func (c *Context) Uniform2f(location *UniformLocation, x, y float32) {
 	gl.Uniform2f(location.int32, x, y)
 }

diff --git a/gl_mobile.go b/gl_mobile.go
@@ -1215,6 +1215,11 @@ func (c *Context) Uniform1i(location *UniformLocation, x int) {
 	c.ctx.Uniform1i(location.Uniform, x)
 }
 
+// Assigns a texture to a uniform variable for the current program object.
+func (c *Context) Uniform1iTexture(location *UniformLocation, tex *Texture) {
+	c.ctx.Uniform1i(location.Uniform, int(tex.Texture.Value))
+}
+
 // Assigns 2 floating point values to a uniform variable for the current program object.
 func (c *Context) Uniform2f(location *UniformLocation, x, y float32) {
 	c.ctx.Uniform2f(location.Uniform, x, y)

diff --git a/gl_webgl.go b/gl_webgl.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build js
-// +build !nogl
+//go:build js && !nogl
+// +build js,!nogl
 
 package gl
 
@@ -1357,6 +1357,11 @@ func (c *Context) Uniform1i(location *UniformLocation, x int) {
 	c.Call("uniform1i", location.Value, x)
 }
 
+// Assigns a texture to a uniform variable for the current program object.
+func (c *Context) Uniform1iTexture(location *UniformLocation, tex *Texture) {
+	c.Call("uniform1i", location.Value, tex.Value)
+}
+
 // Assigns 2 floating point values to a uniform variable for the current program object.
 func (c *Context) Uniform2f(location *UniformLocation, x, y float32) {
 	c.Call("uniform2f", location.Value, x, y)

diff --git a/go.mod b/go.mod
@@ -3,6 +3,6 @@ module github.com/EngoEngine/gl
 go 1.13
 
 require (
-	github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7
-	golang.org/x/mobile v0.0.0-20200212152714-2b26a4705d24
+	github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6
+	golang.org/x/mobile v0.0.0-20220224134551-8a0a1e50732f
 )
diff --git a/go.sum b/go.sum
@@ -1,6 +1,9 @@
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 h1:SCYMcCJ89LjRGwEa0tRluNRiMjZHalQZrVrvTbPh+qw=
 github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk=
+github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 h1:zDw5v7qm4yH7N8C8uWd+8Ii9rROdgWxQuGoJ9WDXxfk=
+github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw=
+github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -10,18 +13,31 @@ golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+o
 golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
 golang.org/x/mobile v0.0.0-20200212152714-2b26a4705d24 h1:vuOuHxlnNE2cEdI537Gb/9ygmbn1Ne7R9hAiLGLLk0g=
 golang.org/x/mobile v0.0.0-20200212152714-2b26a4705d24/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4=
+golang.org/x/mobile v0.0.0-20220224134551-8a0a1e50732f h1:G/wQ/Mbs60nXhRM80J4DOzy7FEIZjNprzOneArSgOl0=
+golang.org/x/mobile v0.0.0-20220224134551-8a0a1e50732f/go.mod h1:pe2sM7Uk+2Su1y7u/6Z8KJ24D7lepUjFZbhFOrmDfuQ=
 golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.1.8-0.20211022200916-316ba0b74098/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=