mstar/canvas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed unused shader variables

Browse source
This commit is contained in:
Thomas Friedel 2019-02-22 15:49:53 +01:00
parent f962da34c4
commit 97dff96ca2
2 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
backend/gogl/gogl.go
View file

@ -328,18 +328,13 @@ func (b *GoGLBackend) useShader(style *backendbase.FillStyle) (vertexLoc uint32)
gl.UseProgram(b.rgr.ID) gl.UseProgram(b.rgr.ID)
from := mat(style.FillMatrix).mul(rg.from) from := mat(style.FillMatrix).mul(rg.from)
to := mat(style.FillMatrix).mul(rg.to) to := mat(style.FillMatrix).mul(rg.to)
dir := to.sub(from)
length := dir.len()
dir = dir.scale(1 / length)
gl.Uniform2f(b.rgr.CanvasSize, float32(b.fw), float32(b.fh)) gl.Uniform2f(b.rgr.CanvasSize, float32(b.fw), float32(b.fh))
inv := mat(style.FillMatrix).invert().f32() inv := mat(style.FillMatrix).invert().f32()
gl.UniformMatrix3fv(b.rgr.Invmat, 1, false, &inv[0]) gl.UniformMatrix3fv(b.rgr.Invmat, 1, false, &inv[0])
gl.Uniform2f(b.rgr.From, float32(from[0]), float32(from[1])) gl.Uniform2f(b.rgr.From, float32(from[0]), float32(from[1]))
gl.Uniform2f(b.rgr.To, float32(to[0]), float32(to[1])) gl.Uniform2f(b.rgr.To, float32(to[0]), float32(to[1]))
gl.Uniform2f(b.rgr.Dir, float32(dir[0]), float32(dir[1]))
gl.Uniform1f(b.rgr.RadFrom, float32(rg.radFrom)) gl.Uniform1f(b.rgr.RadFrom, float32(rg.radFrom))
gl.Uniform1f(b.rgr.RadTo, float32(rg.radTo)) gl.Uniform1f(b.rgr.RadTo, float32(rg.radTo))
gl.Uniform1f(b.rgr.Len, float32(length))
gl.Uniform1i(b.rgr.Gradient, 0) gl.Uniform1i(b.rgr.Gradient, 0)
gl.Uniform1f(b.rgr.GlobalAlpha, float32(style.Color.A)/255) gl.Uniform1f(b.rgr.GlobalAlpha, float32(style.Color.A)/255)
return b.rgr.Vertex return b.rgr.Vertex
@ -395,18 +390,13 @@ func (b *GoGLBackend) useAlphaShader(style *backendbase.FillStyle, alphaTexSlot
gl.UseProgram(b.rgar.ID) gl.UseProgram(b.rgar.ID)
from := mat(style.FillMatrix).mul(rg.from) from := mat(style.FillMatrix).mul(rg.from)
to := mat(style.FillMatrix).mul(rg.to) to := mat(style.FillMatrix).mul(rg.to)
dir := to.sub(from)
length := dir.len()
dir = dir.scale(1 / length)
gl.Uniform2f(b.rgar.CanvasSize, float32(b.fw), float32(b.fh)) gl.Uniform2f(b.rgar.CanvasSize, float32(b.fw), float32(b.fh))
inv := mat(style.FillMatrix).invert().f32() inv := mat(style.FillMatrix).invert().f32()
gl.UniformMatrix3fv(b.rgar.Invmat, 1, false, &inv[0]) gl.UniformMatrix3fv(b.rgar.Invmat, 1, false, &inv[0])
gl.Uniform2f(b.rgar.From, float32(from[0]), float32(from[1])) gl.Uniform2f(b.rgar.From, float32(from[0]), float32(from[1]))
gl.Uniform2f(b.rgar.To, float32(to[0]), float32(to[1])) gl.Uniform2f(b.rgar.To, float32(to[0]), float32(to[1]))
gl.Uniform2f(b.rgar.Dir, float32(dir[0]), float32(dir[1]))
gl.Uniform1f(b.rgar.RadFrom, float32(rg.radFrom)) gl.Uniform1f(b.rgar.RadFrom, float32(rg.radFrom))
gl.Uniform1f(b.rgar.RadTo, float32(rg.radTo)) gl.Uniform1f(b.rgar.RadTo, float32(rg.radTo))
gl.Uniform1f(b.rgar.Len, float32(length))
gl.Uniform1i(b.rgar.Gradient, 0) gl.Uniform1i(b.rgar.Gradient, 0)
gl.Uniform1i(b.rgar.AlphaTex, alphaTexSlot) gl.Uniform1i(b.rgar.AlphaTex, alphaTexSlot)
gl.Uniform1f(b.rgar.GlobalAlpha, float32(style.Color.A)/255) gl.Uniform1f(b.rgar.GlobalAlpha, float32(style.Color.A)/255)

10
backend/gogl/shaders.go
View file

@ -92,9 +92,8 @@ precision mediump float;
varying vec2 v_cp; varying vec2 v_cp;
uniform mat3 invmat; uniform mat3 invmat;
uniform sampler2D gradient; uniform sampler2D gradient;
uniform vec2 from, to, dir; uniform vec2 from, to;
uniform float radFrom, radTo; uniform float radFrom, radTo;
uniform float len;
uniform float globalAlpha; uniform float globalAlpha;
bool isNaN(float v) { bool isNaN(float v) {
return v < 0.0 || 0.0 < v || v == 0.0 ? false : true; return v < 0.0 || 0.0 < v || v == 0.0 ? false : true;
@ -222,9 +221,8 @@ varying vec2 v_cp;
varying vec2 v_atc; varying vec2 v_atc;
uniform mat3 invmat; uniform mat3 invmat;
uniform sampler2D gradient; uniform sampler2D gradient;
uniform vec2 from, to, dir; uniform vec2 from, to;
uniform float radFrom, radTo; uniform float radFrom, radTo;
uniform float len;
uniform sampler2D alphaTex; uniform sampler2D alphaTex;
uniform float globalAlpha; uniform float globalAlpha;
bool isNaN(float v) { bool isNaN(float v) {
@ -409,10 +407,8 @@ type radialGradientShader struct {
Gradient int32 Gradient int32
From int32 From int32
To int32 To int32
Dir int32
RadFrom int32 RadFrom int32
RadTo int32 RadTo int32
Len int32
GlobalAlpha int32 GlobalAlpha int32
} }
@ -459,10 +455,8 @@ type radialGradientAlphaShader struct {
Gradient int32 Gradient int32
From int32 From int32
To int32 To int32
Dir int32
RadFrom int32 RadFrom int32
RadTo int32 RadTo int32
Len int32
AlphaTex int32 AlphaTex int32
GlobalAlpha int32 GlobalAlpha int32
} }