mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-09-19 21:02:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

graphicscommand: Move the shader program to testing package

Browse Source
This commit is contained in:
Hajime Hoshi 2020-05-24 20:15:07 +09:00
parent 465d8aa273
commit 155c63ec76
2 changed files with 234 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

214
internal/graphicscommand/image_test.go
View File

@ -21,12 +21,11 @@ import (
"github.com/hajimehoshi/ebiten/internal/driver"
"github.com/hajimehoshi/ebiten/internal/graphics"
. "github.com/hajimehoshi/ebiten/internal/graphicscommand"
"github.com/hajimehoshi/ebiten/internal/shaderir"
t "github.com/hajimehoshi/ebiten/internal/testing"
etesting "github.com/hajimehoshi/ebiten/internal/testing"
)
func TestMain(m *testing.M) {
t.MainWithRunLoop(m)
etesting.MainWithRunLoop(m)
}
func quadVertices(w, h float32) []float32 {
@ -92,213 +91,8 @@ func TestShader(t *testing.T) {
is := graphics.QuadIndices()
dst.DrawTriangles(clr, vs, is, nil, driver.CompositeModeClear, driver.FilterNearest, driver.AddressClampToZero, nil, nil)
mat := shaderir.Expr{
Type: shaderir.Call,
Exprs: []shaderir.Expr{
{
Type: shaderir.BuiltinFuncExpr,
BuiltinFunc: shaderir.Mat4F,
},
{
Type: shaderir.Binary,
Op: shaderir.Div,
Exprs: []shaderir.Expr{
{
Type: shaderir.FloatExpr,
Float: 2,
},
{
Type: shaderir.FieldSelector,
Exprs: []shaderir.Expr{
{
Type: shaderir.UniformVariable,
Index: 0,
},
{
Type: shaderir.SwizzlingExpr,
Swizzling: "x",
},
},
},
},
},
{
Type: shaderir.FloatExpr,
Float: 0,
},
{
Type: shaderir.FloatExpr,
Float: 0,
},
{
Type: shaderir.FloatExpr,
Float: 0,
},
{
Type: shaderir.FloatExpr,
Float: 0,
},
{
Type: shaderir.Binary,
Op: shaderir.Div,
Exprs: []shaderir.Expr{
{
Type: shaderir.FloatExpr,
Float: 2,
},
{
Type: shaderir.FieldSelector,
Exprs: []shaderir.Expr{
{
Type: shaderir.UniformVariable,
Index: 0,
},
{
Type: shaderir.SwizzlingExpr,
Swizzling: "y",
},
},
},
},
},
{
Type: shaderir.FloatExpr,
Float: 0,
},
{
Type: shaderir.FloatExpr,
Float: 0,
},
{
Type: shaderir.FloatExpr,
Float: 0,
},
{
Type: shaderir.FloatExpr,
Float: 0,
},
{
Type: shaderir.FloatExpr,
Float: 1,
},
{
Type: shaderir.FloatExpr,
Float: 0,
},
{
Type: shaderir.FloatExpr,
Float: -1,
},
{
Type: shaderir.FloatExpr,
Float: -1,
},
{
Type: shaderir.FloatExpr,
Float: 0,
},
{
Type: shaderir.FloatExpr,
Float: 1,
},
},
}
pos := shaderir.Expr{
Type: shaderir.Call,
Exprs: []shaderir.Expr{
{
Type: shaderir.BuiltinFuncExpr,
BuiltinFunc: shaderir.Vec4F,
},
{
Type: shaderir.LocalVariable,
Index: 0,
},
{
Type: shaderir.FloatExpr,
Float: 0,
},
{
Type: shaderir.FloatExpr,
Float: 1,
},
},
}
red := shaderir.Expr{
Type: shaderir.Call,
Exprs: []shaderir.Expr{
{
Type: shaderir.BuiltinFuncExpr,
BuiltinFunc: shaderir.Vec4F,
},
{
Type: shaderir.FloatExpr,
Float: 1,
},
{
Type: shaderir.FloatExpr,
Float: 0,
},
{
Type: shaderir.FloatExpr,
Float: 0,
},
{
Type: shaderir.FloatExpr,
Float: 1,
},
},
}
s := NewShader(&shaderir.Program{
Uniforms: []shaderir.Type{
{Main: shaderir.Vec2},
},
Attributes: []shaderir.Type{
{Main: shaderir.Vec2},
{Main: shaderir.Vec2},
{Main: shaderir.Vec4},
{Main: shaderir.Vec4},
},
VertexFunc: shaderir.VertexFunc{
Block: shaderir.Block{
Stmts: []shaderir.Stmt{
{
Type: shaderir.Assign,
Exprs: []shaderir.Expr{
{
Type: shaderir.LocalVariable,
Index: 4,
},
{
Type: shaderir.Binary,
Op: shaderir.Mul,
Exprs: []shaderir.Expr{
mat,
pos,
},
},
},
},
},
},
},
FragmentFunc: shaderir.FragmentFunc{
Block: shaderir.Block{
Stmts: []shaderir.Stmt{
{
Type: shaderir.Assign,
Exprs: []shaderir.Expr{
{
Type: shaderir.LocalVariable,
Index: 1,
},
red,
},
},
},
},
},
})
ir := etesting.ShaderProgramFill(0xff, 0, 0, 0xff)
s := NewShader(&ir)
us := map[int]interface{}{
0: []float32{w, h},
}

230
internal/testing/shader.go Normal file
View File

@ -0,0 +1,230 @@
// Copyright 2020 The Ebiten Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package testing
import (
"github.com/hajimehoshi/ebiten/internal/shaderir"
)
func ShaderProgramFill(r, g, b, a byte) shaderir.Program {
mat := shaderir.Expr{
Type: shaderir.Call,
Exprs: []shaderir.Expr{
{
Type: shaderir.BuiltinFuncExpr,
BuiltinFunc: shaderir.Mat4F,
},
{
Type: shaderir.Binary,
Op: shaderir.Div,
Exprs: []shaderir.Expr{
{
Type: shaderir.FloatExpr,
Float: 2,
},
{
Type: shaderir.FieldSelector,
Exprs: []shaderir.Expr{
{
Type: shaderir.UniformVariable,
Index: 0,
},
{
Type: shaderir.SwizzlingExpr,
Swizzling: "x",
},
},
},
},
},
{
Type: shaderir.FloatExpr,
Float: 0,
},
{
Type: shaderir.FloatExpr,
Float: 0,
},
{
Type: shaderir.FloatExpr,
Float: 0,
},
{
Type: shaderir.FloatExpr,
Float: 0,
},
{
Type: shaderir.Binary,
Op: shaderir.Div,
Exprs: []shaderir.Expr{
{
Type: shaderir.FloatExpr,
Float: 2,
},
{
Type: shaderir.FieldSelector,
Exprs: []shaderir.Expr{
{
Type: shaderir.UniformVariable,
Index: 0,
},
{
Type: shaderir.SwizzlingExpr,
Swizzling: "y",
},
},
},
},
},
{
Type: shaderir.FloatExpr,
Float: 0,
},
{
Type: shaderir.FloatExpr,
Float: 0,
},
{
Type: shaderir.FloatExpr,
Float: 0,
},
{
Type: shaderir.FloatExpr,
Float: 0,
},
{
Type: shaderir.FloatExpr,
Float: 1,
},
{
Type: shaderir.FloatExpr,
Float: 0,
},
{
Type: shaderir.FloatExpr,
Float: -1,
},
{
Type: shaderir.FloatExpr,
Float: -1,
},
{
Type: shaderir.FloatExpr,
Float: 0,
},
{
Type: shaderir.FloatExpr,
Float: 1,
},
},
}
pos := shaderir.Expr{
Type: shaderir.Call,
Exprs: []shaderir.Expr{
{
Type: shaderir.BuiltinFuncExpr,
BuiltinFunc: shaderir.Vec4F,
},
{
Type: shaderir.LocalVariable,
Index: 0,
},
{
Type: shaderir.FloatExpr,
Float: 0,
},
{
Type: shaderir.FloatExpr,
Float: 1,
},
},
}
clr := shaderir.Expr{
Type: shaderir.Call,
Exprs: []shaderir.Expr{
{
Type: shaderir.BuiltinFuncExpr,
BuiltinFunc: shaderir.Vec4F,
},
{
Type: shaderir.FloatExpr,
Float: float32(r) / 0xff,
},
{
Type: shaderir.FloatExpr,
Float: float32(g) / 0xff,
},
{
Type: shaderir.FloatExpr,
Float: float32(b) / 0xff,
},
{
Type: shaderir.FloatExpr,
Float: float32(a) / 0xff,
},
},
}
return shaderir.Program{
Uniforms: []shaderir.Type{
{Main: shaderir.Vec2},
},
Attributes: []shaderir.Type{
{Main: shaderir.Vec2},
{Main: shaderir.Vec2},
{Main: shaderir.Vec4},
{Main: shaderir.Vec4},
},
VertexFunc: shaderir.VertexFunc{
Block: shaderir.Block{
Stmts: []shaderir.Stmt{
{
Type: shaderir.Assign,
Exprs: []shaderir.Expr{
{
Type: shaderir.LocalVariable,
Index: 4,
},
{
Type: shaderir.Binary,
Op: shaderir.Mul,
Exprs: []shaderir.Expr{
mat,
pos,
},
},
},
},
},
},
},
FragmentFunc: shaderir.FragmentFunc{
Block: shaderir.Block{
Stmts: []shaderir.Stmt{
{
Type: shaderir.Assign,
Exprs: []shaderir.Expr{
{
Type: shaderir.LocalVariable,
Index: 1,
},
clr,
},
},
},
},
},
}
}