From fdf92e13eabd39cc1a237f716b9ea77c47ffc497 Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Thu, 14 Mar 2019 04:48:03 +0100 Subject: [PATCH] Remove the Kobo-specific 16bpp JIT loopunroll tweak (#4784) * Remove the Kobo-specific 16bpp JIT loopunroll tweak It's now generic, and handled in ffi/blitbuffer.lua directly. --- base | 2 +- frontend/device/kobo/device.lua | 15 ++------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/base b/base index 8c9456654..6d27a176d 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit 8c9456654369b74813e3932471d307d94647285f +Subproject commit 6d27a176d1bc6124aafe7bee9dbbcaea0651fe35 diff --git a/frontend/device/kobo/device.lua b/frontend/device/kobo/device.lua index 4a19a6893..3a2d3cf9f 100644 --- a/frontend/device/kobo/device.lua +++ b/frontend/device/kobo/device.lua @@ -249,20 +249,9 @@ end function Kobo:init() self.screen = require("ffi/framebuffer_mxcfb"):new{device = self, debug = logger.dbg} - -- NOTE: Something about the extra work needed to handle RGB565 conversions is making the JIT optimizer crazy when doing - -- alpha-blending, causing it to very quickly blacklist the entire blitbuffer code, which basically murders performance. - -- The least terrible workaround we could come up with is tweaking the optimizer's thresholds a bit, - -- to convince it not to give up too early. - -- As this may have a detrimental effect on performance, we try to deviate from defaults as little as possible, - -- completely avoiding it if possible... - -- c.f., #4137 for the gory details. - -- FIXME: Might want to make that mandatory, because we've been finding more and more ways to make the JIT go crazy, - -- both at 32bpp and at 8bpp (c.f., #4752). - if self.screen.fb_bpp == 16 then - logger.info("Enabling Kobo @ 16bpp tweaks") - jit.opt.start("loopunroll=45") - elseif self.screen.fb_bpp == 32 then + if self.screen.fb_bpp == 32 then -- Ensure we decode images properly, as our framebuffer is BGRA... + logger.info("Enabling Kobo @ 32bpp BGR tweaks") self.hasBGRFrameBuffer = yes end self.powerd = require("device/kobo/powerd"):new{device = self}