Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

framebuffer: fix alpha blending

This commit is contained in:
Sebastien Bourdeauducq 2013-05-11 09:21:12 +02:00
parent e96b027dee
commit 8c335d66fd
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
milkymist/framebuffer/__init__.py
View File

@ -75,7 +75,11 @@ class Blender(PipelinedActor, AutoCSR):
for component in ["r", "g", "b"]: for component in ["r", "g", "b"]:
incomps = [getattr(pix, component) for pix in inpixs] incomps = [getattr(pix, component) for pix in inpixs]
outcomp = getattr(outpix, component) outcomp = getattr(outpix, component)
self.comb += outcomp.eq(sum(incomp*factor for incomp, factor in zip(incomps, factors)) >> 8) outcomp_full = Signal(18)
self.comb += [
outcomp_full.eq(sum(incomp*factor for incomp, factor in zip(incomps, factors))),
outcomp.eq(outcomp_full[8:])
]
pipe_stmts = [] pipe_stmts = []
for i in range(latency): for i in range(latency):
@ -86,7 +90,7 @@ class Blender(PipelinedActor, AutoCSR):
self.comb += self.source.payload.eq(outval) self.comb += self.source.payload.eq(outval)
class MixFramebuffer(Module, AutoCSR): class MixFramebuffer(Module, AutoCSR):
def __init__(self, pads, *asmiports, blender_latency=3): def __init__(self, pads, *asmiports, blender_latency=4):
pack_factor = asmiports[0].hub.dw//(2*bpp) pack_factor = asmiports[0].hub.dw//(2*bpp)
packed_pixels = structuring.pack_layout(pixel_layout, pack_factor) packed_pixels = structuring.pack_layout(pixel_layout, pack_factor)
@ -103,7 +107,7 @@ class MixFramebuffer(Module, AutoCSR):
g.add_connection(dma, cast) g.add_connection(dma, cast)
g.add_connection(cast, unpack) g.add_connection(cast, unpack)
g.add_connection(unpack, self.blender, sink_subr=["i"+str(n)+"/p0", "i"+str(n)+"/p1"]) g.add_connection(unpack, self.blender, sink_subr=["i"+str(n)])
self.comb += dma.generator.trigger.eq(self._enable.storage) self.comb += dma.generator.trigger.eq(self._enable.storage)
setattr(self, "dma"+str(n), dma) setattr(self, "dma"+str(n), dma)