mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-26 19:58:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/shader: allow integer types for clamp

Browse Source 
Closes #2788
This commit is contained in:
Hajime Hoshi 2024-02-25 20:26:43 +09:00
parent 4b9508c523
commit cc3db584f2
2 changed files with 110 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
internal/shader/expr.go
View File

@ -426,21 +426,90 @@ func (cs *compileState) parseExpr(block *block, fname string, expr ast.Expr, mar
cs.addError(e.Pos(), fmt.Sprintf("number of %s's arguments must be 3 but %d", callee.BuiltinFunc, len(args))) cs.addError(e.Pos(), fmt.Sprintf("number of %s's arguments must be 3 but %d", callee.BuiltinFunc, len(args)))
return nil, nil, nil, false return nil, nil, nil, false
} }
switch callee.BuiltinFunc {
case shaderir.Clamp:
if kind, allConsts := resolveConstKind(args, argts); allConsts {
switch kind {
case gconstant.Unknown:
cs.addError(e.Pos(), fmt.Sprintf("%s's arguments don't match: %s, %s, and %s", callee.BuiltinFunc, argts[0].String(), argts[1].String(), argts[2].String()))
return nil, nil, nil, false
case gconstant.Int:
for i, arg := range args {
v := gconstant.ToInt(arg.Const)
if v.Kind() == gconstant.Unknown {
cs.addError(e.Pos(), fmt.Sprintf("cannot convert %s to type int", arg.Const.String()))
return nil, nil, nil, false
}
args[i].Const = gconstant.ToInt(args[i].Const)
argts[i] = shaderir.Type{Main: shaderir.Int}
}
case gconstant.Float:
for i, arg := range args {
v := gconstant.ToFloat(arg.Const)
if v.Kind() == gconstant.Unknown {
cs.addError(e.Pos(), fmt.Sprintf("cannot convert %s to type float", arg.Const.String()))
return nil, nil, nil, false
}
args[i].Const = gconstant.ToFloat(args[i].Const)
argts[i] = shaderir.Type{Main: shaderir.Float}
}
}
}
if argts[0].IsIntVector() {
for i := 1; i < 3; i++ {
if args[i].Const != nil {
v := gconstant.ToInt(args[i].Const)
if v.Kind() == gconstant.Unknown {
cs.addError(e.Pos(), fmt.Sprintf("cannot convert %s to type int", args[i].Const.String()))
return nil, nil, nil, false
}
args[i].Const = v
argts[i] = shaderir.Type{Main: shaderir.Int}
}
}
}
if argts[0].IsFloatVector() {
for i := 1; i < 3; i++ {
if args[i].Const != nil {
v := gconstant.ToFloat(args[i].Const)
if v.Kind() == gconstant.Unknown {
cs.addError(e.Pos(), fmt.Sprintf("cannot convert %s to type float", args[i].Const.String()))
return nil, nil, nil, false
}
args[i].Const = v
argts[i] = shaderir.Type{Main: shaderir.Float}
}
}
}
default:
for i := range args { for i := range args {
// If the argument is a non-typed constant value, treat this as a float value (#1874). // If the argument is a non-typed constant value, treat this as a float value (#1874).
if args[i].Const != nil && argts[i].Main == shaderir.None && gconstant.ToFloat(args[i].Const).Kind() != gconstant.Unknown { if args[i].Const != nil && argts[i].Main == shaderir.None && gconstant.ToFloat(args[i].Const).Kind() != gconstant.Unknown {
args[i].Const = gconstant.ToFloat(args[i].Const) args[i].Const = gconstant.ToFloat(args[i].Const)
argts[i] = shaderir.Type{Main: shaderir.Float} argts[i] = shaderir.Type{Main: shaderir.Float}
} }
if argts[i].Main != shaderir.Float && argts[i].Main != shaderir.Vec2 && argts[i].Main != shaderir.Vec3 && argts[i].Main != shaderir.Vec4 { }
}
for i := range args {
switch callee.BuiltinFunc {
case shaderir.Clamp:
if argts[i].Main != shaderir.Float && !argts[i].IsFloatVector() && argts[i].Main != shaderir.Int && !argts[i].IsIntVector() {
cs.addError(e.Pos(), fmt.Sprintf("cannot use %s as float, vecN, int, or ivecN value in argument to %s", argts[i].String(), callee.BuiltinFunc))
return nil, nil, nil, false
}
default:
if argts[i].Main != shaderir.Float && !argts[i].IsFloatVector() {
cs.addError(e.Pos(), fmt.Sprintf("cannot use %s as float, vec2, vec3, or vec4 value in argument to %s", argts[i].String(), callee.BuiltinFunc)) cs.addError(e.Pos(), fmt.Sprintf("cannot use %s as float, vec2, vec3, or vec4 value in argument to %s", argts[i].String(), callee.BuiltinFunc))
return nil, nil, nil, false return nil, nil, nil, false
} }
} }
}
switch callee.BuiltinFunc { switch callee.BuiltinFunc {
case shaderir.Clamp: case shaderir.Clamp:
if (!argts[0].Equal(&argts[1]) || !argts[0].Equal(&argts[2])) && (argts[1].Main != shaderir.Float || argts[2].Main != shaderir.Float) { if !((argts[0].Equal(&argts[1]) && argts[0].Equal(&argts[2])) ||
cs.addError(e.Pos(), fmt.Sprintf("the second and the third arguments for %s must equal to the first argument %s or float but %s and %s", callee.BuiltinFunc, argts[0].String(), argts[1].String(), argts[2].String())) (argts[0].IsFloatVector() && argts[1].Main == shaderir.Float && argts[2].Main == shaderir.Float) ||
(argts[0].IsIntVector() && argts[1].Main == shaderir.Int && argts[2].Main == shaderir.Int)) {
cs.addError(e.Pos(), fmt.Sprintf("the second and the third arguments for %s must equal to the first argument %s or float or int but %s and %s", callee.BuiltinFunc, argts[0].String(), argts[1].String(), argts[2].String()))
return nil, nil, nil, false return nil, nil, nil, false
} }
case shaderir.Mix: case shaderir.Mix:

36
internal/shader/syntax_test.go
View File

@ -2498,10 +2498,18 @@ func TestSyntaxBuiltinFuncClampType(t *testing.T) {
{stmt: "a := clamp(false, false); _ = a", err: true}, {stmt: "a := clamp(false, false); _ = a", err: true},
{stmt: "a := clamp(1, 1); _ = a", err: true}, {stmt: "a := clamp(1, 1); _ = a", err: true},
{stmt: "a := clamp(false, false, false); _ = a", err: true}, {stmt: "a := clamp(false, false, false); _ = a", err: true},
{stmt: "a := clamp(1, 1, 1); _ = a", err: false}, {stmt: "a := clamp(1, 1, 1); var _ int = a", err: false},
{stmt: "a := clamp(1.0, 1, 1); _ = a", err: false}, {stmt: "a := clamp(int(1), 1, 1); var _ int = a", err: false},
{stmt: "a := clamp(1, 1.0, 1); _ = a", err: false}, {stmt: "a := clamp(int(1), 1.0, 1); var _ int = a", err: false},
{stmt: "a := clamp(1, 1, 1.0); _ = a", err: false}, {stmt: "a := clamp(int(1), 1, 1.0); var _ int = a", err: false},
{stmt: "a := clamp(int(1), 1.1, 1); _ = a", err: true},
{stmt: "a := clamp(int(1), 1, 1.1); _ = a", err: true},
{stmt: "a := clamp(1.0, 1, 1); var _ float = a", err: false},
{stmt: "a := clamp(1, 1.0, 1); var _ float = a", err: false},
{stmt: "a := clamp(1, 1, 1.0); var _ float = a", err: false},
{stmt: "a := clamp(1.1, 1, 1); var _ float = a", err: false},
{stmt: "a := clamp(1, 1.1, 1); var _ float = a", err: false},
{stmt: "a := clamp(1, 1, 1.1); var _ float = a", err: false},
{stmt: "a := clamp(1, vec2(1), 1); _ = a", err: true}, {stmt: "a := clamp(1, vec2(1), 1); _ = a", err: true},
{stmt: "a := clamp(1, 1, vec2(1)); _ = a", err: true}, {stmt: "a := clamp(1, 1, vec2(1)); _ = a", err: true},
{stmt: "a := clamp(1, vec2(1), vec2(1)); _ = a", err: true}, {stmt: "a := clamp(1, vec2(1), vec2(1)); _ = a", err: true},
@ -2518,7 +2526,25 @@ func TestSyntaxBuiltinFuncClampType(t *testing.T) {
{stmt: "a := clamp(vec4(1), 1, vec4(1)); _ = a", err: true}, {stmt: "a := clamp(vec4(1), 1, vec4(1)); _ = a", err: true},
{stmt: "a := clamp(vec4(1), vec4(1), 1); _ = a", err: true}, {stmt: "a := clamp(vec4(1), vec4(1), 1); _ = a", err: true},
{stmt: "a := clamp(vec4(1), vec4(1), vec4(1)); _ = a", err: false}, {stmt: "a := clamp(vec4(1), vec4(1), vec4(1)); _ = a", err: false},
{stmt: "a := clamp(ivec2(1), 1, 1); _ = a", err: true}, {stmt: "a := clamp(ivec2(1), 1, 1); _ = a", err: false},
{stmt: "a := clamp(ivec2(1), 1.1, 1); _ = a", err: true},
{stmt: "a := clamp(ivec2(1), 1, 1.1); _ = a", err: true},
{stmt: "a := clamp(ivec2(1), 1, ivec2(1)); _ = a", err: true},
{stmt: "a := clamp(ivec2(1), ivec2(1), 1); _ = a", err: true},
{stmt: "a := clamp(ivec2(1), ivec2(1), ivec2(1)); _ = a", err: false},
{stmt: "a := clamp(ivec2(1), ivec2(1), ivec3(1)); _ = a", err: true},
{stmt: "a := clamp(ivec3(1), 1, 1); _ = a", err: false},
{stmt: "a := clamp(ivec3(1), 1.1, 1); _ = a", err: true},
{stmt: "a := clamp(ivec3(1), 1, 1.1); _ = a", err: true},
{stmt: "a := clamp(ivec3(1), 1, ivec3(1)); _ = a", err: true},
{stmt: "a := clamp(ivec3(1), ivec3(1), 1); _ = a", err: true},
{stmt: "a := clamp(ivec3(1), ivec3(1), ivec3(1)); _ = a", err: false},
{stmt: "a := clamp(ivec4(1), 1, 1); _ = a", err: false},
{stmt: "a := clamp(ivec4(1), 1.1, 1); _ = a", err: true},
{stmt: "a := clamp(ivec4(1), 1, 1.1); _ = a", err: true},
{stmt: "a := clamp(ivec4(1), 1, ivec4(1)); _ = a", err: true},
{stmt: "a := clamp(ivec4(1), ivec4(1), 1); _ = a", err: true},
{stmt: "a := clamp(ivec4(1), ivec4(1), ivec4(1)); _ = a", err: false},
{stmt: "a := clamp(1, 1, 1, 1); _ = a", err: true}, {stmt: "a := clamp(1, 1, 1, 1); _ = a", err: true},
} }