mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Remove std/nie decoder.swizzle derived var hack
This commit is contained in:
1 parent
f6d11c78da
commit
332fb46b5c
4 files changed
+30
-10
No files matched your search
@@ -43,7 +43,8 @@ var (
|
||||
|
||||
maxInt64 = big.NewInt((1 << 63) - 1)
|
||||
|
||||
typeExprUtility = a.NewTypeExpr(0, t.IDBase, t.IDUtility, nil, nil, nil)
|
||||
typeExprPixelSwizzler = a.NewTypeExpr(0, t.IDBase, t.IDPixelSwizzler, nil, nil, nil)
|
||||
typeExprUtility = a.NewTypeExpr(0, t.IDBase, t.IDUtility, nil, nil, nil)
|
||||
)
|
||||
|
||||
// Prefixes are prepended to names to form a namespace and to avoid e.g.
|
||||
|
||||
+28
-2
@@ -24,6 +24,18 @@ import (
|
||||
|
||||
var errNeedDerivedVar = errors.New("cgen: internal error: need derived var")
|
||||
|
||||
// argsContainsArgsDotFoo returns whether the argNodes, a slice of *ast.Node
|
||||
// where each ast.Node is an ast.Arg, contains a "name: value" element whose
|
||||
// value is "args.foo".
|
||||
func argsContainsArgsDotFoo(argNodes []*a.Node, foo t.ID) bool {
|
||||
for _, o := range argNodes {
|
||||
if foo == o.AsArg().Value().IsArgsDotFoo() {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func (g *gen) needDerivedVar(name t.ID) bool {
|
||||
if name == 0 {
|
||||
return false
|
||||
@@ -34,10 +46,24 @@ func (g *gen) needDerivedVar(name t.ID) bool {
|
||||
if p.Kind() != a.KExpr {
|
||||
return nil
|
||||
}
|
||||
recv, _, _ := p.AsExpr().IsMethodCall()
|
||||
if (recv != nil) && (recv.IsArgsDotFoo() == name) {
|
||||
recv, meth, args := p.AsExpr().IsMethodCall()
|
||||
if recv == nil {
|
||||
return nil
|
||||
}
|
||||
if recv.IsArgsDotFoo() == name {
|
||||
return errNeedDerivedVar
|
||||
}
|
||||
// Some built-in methods will also need a derived var for their
|
||||
// arguments.
|
||||
//
|
||||
// TODO: use a comprehensive list of such methods.
|
||||
switch meth {
|
||||
case t.IDLimitedSwizzleU32InterleavedFromReader,
|
||||
t.IDSwizzleInterleavedFromReader:
|
||||
if recv.MType().Eq(typeExprPixelSwizzler) && argsContainsArgsDotFoo(args, name) {
|
||||
return errNeedDerivedVar
|
||||
}
|
||||
}
|
||||
return nil
|
||||
})
|
||||
if err == errNeedDerivedVar {
|
||||
|
||||
@@ -28780,8 +28780,6 @@ wuffs_nie__decoder__swizzle(
|
||||
v_dst_bytes_per_pixel = ((uint64_t)((v_dst_bits_per_pixel / 8)));
|
||||
v_dst_bytes_per_row = (((uint64_t)(self->private_impl.f_width)) * v_dst_bytes_per_pixel);
|
||||
v_tab = wuffs_base__pixel_buffer__plane(a_dst, 0);
|
||||
if (((uint64_t)(io2_a_src - iop_a_src)) <= 0) {
|
||||
}
|
||||
label__0__continue:;
|
||||
while (true) {
|
||||
if (self->private_impl.f_dst_x == self->private_impl.f_width) {
|
||||
|
||||
@@ -206,11 +206,6 @@ pri func decoder.swizzle!(dst: ptr base.pixel_buffer, src: base.io_reader) base.
|
||||
dst_bytes_per_row = (this.width as base.u64) * dst_bytes_per_pixel
|
||||
tab = args.dst.plane(p: 0)
|
||||
|
||||
// TODO: this hack (to generate derived variables for args.src) shouldn't
|
||||
// be necessary.
|
||||
if args.src.length() <= 0 {
|
||||
}
|
||||
|
||||
while true {
|
||||
if this.dst_x == this.width {
|
||||
this.dst_x = 0
|
||||
|
||||
Reference in new issue
Block a user