AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix perf regression in Color32.

Browse Source 
The regression was due to the fact that we were calling PlatformColorProc() for
every span (which in turns makes CPUID, a fairly expensive call).  Since we draw
a lot of rects, and rects have 1-pixel wide spans for the vertical segments,
that's a lot of CPUID.

Fixed by cacheing the result of PlatformColorProc(), as is done for the other
platform-specific blitters.

Review URL:  http://codereview.appspot.com/3669042/



git-svn-id: http://skia.googlecode.com/svn/trunk@636 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
senorblanco@chromium.org 2010-12-16 19:07:45 +00:00
parent 31e6230034
commit 29e5054dd0
6 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -94,6 +94,7 @@ endif
# For these files, and these files only, compile with -msse2.
SSE2_OBJS := out/src/opts/SkBlitRow_opts_SSE2.o \
out/src/opts/SkBitmapProcState_opts_SSE2.o \
out/src/opts/SkUtils_opts_SSE2.o
$(SSE2_OBJS) : CFLAGS := $(CFLAGS_SSE2)

14
include/core/SkBlitRow.h
View File

@ -55,24 +55,16 @@ public:
const SkPMColor* SK_RESTRICT src,
int count, U8CPU alpha);
static void Color32_BlitRow32(SkPMColor dst[], const SkPMColor src[],
int count, SkPMColor color);
static Proc32 Factory32(unsigned flags32);
/** Blend a single color onto a row of S32 pixels, writing the result
into a row of D32 pixels. src and dst may be the same memory, but
if they are not, they may not overlap.
*/
static void Color32(SkPMColor dst[], const SkPMColor src[], int count,
SkPMColor color);
static void Color32(SkPMColor dst[], const SkPMColor src[],
int count, SkPMColor color);
/** Blend a single color onto a row of 32bit pixels, writing the result
into the same row.
*/
static void Color32(SkPMColor row[], int count, SkPMColor color) {
Color32(row, row, count, color);
}
static ColorProc ColorProcFactory();
/** These static functions are called by the Factory and Factory32
functions, and should return either NULL, or a

13
src/core/SkBlitRow_D32.cpp
View File

@ -86,18 +86,17 @@ SkBlitRow::Proc32 SkBlitRow::Factory32(unsigned flags) {
return proc;
}
void SkBlitRow::Color32(SkPMColor dst[], const SkPMColor src[], int count,
SkPMColor color) {
SkBlitRow::Proc32 SkBlitRow::ColorProcFactory() {
SkBlitRow::ColorProc proc = PlatformColorProc();
if (NULL == proc) {
Color32_BlitRow32(dst, src, count, color);
return;
proc = Color32;
}
proc(dst, src, count, color);
SkASSERT(proc);
return proc;
}
void SkBlitRow::Color32_BlitRow32(SkPMColor dst[], const SkPMColor src[],
int count, SkPMColor color) {
void SkBlitRow::Color32(SkPMColor dst[], const SkPMColor src[],
int count, SkPMColor color) {
if (count > 0) {
if (0 == color) {
if (src != dst) {

8
src/core/SkBlitter_ARGB32.cpp
View File

@ -51,6 +51,7 @@ SkARGB32_Blitter::SkARGB32_Blitter(const SkBitmap& device, const SkPaint& paint)
fSrcB = SkAlphaMul(SkColorGetB(color), scale);
fPMColor = SkPackARGB32(fSrcA, fSrcR, fSrcG, fSrcB);
fColor32Proc = SkBlitRow::ColorProcFactory();
}
const SkBitmap* SkARGB32_Blitter::justAnOpaqueColor(uint32_t* value) {
@ -69,7 +70,8 @@ const SkBitmap* SkARGB32_Blitter::justAnOpaqueColor(uint32_t* value) {
void SkARGB32_Blitter::blitH(int x, int y, int width) {
SkASSERT(x >= 0 && y >= 0 && x + width <= fDevice.width());
SkBlitRow::Color32(fDevice.getAddr32(x, y), width, fPMColor);
uint32_t* device = fDevice.getAddr32(x, y);
fColor32Proc(device, device, width, fPMColor);
}
void SkARGB32_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[],
@ -94,7 +96,7 @@ void SkARGB32_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[],
sk_memset32(device, color, count);
} else {
uint32_t sc = SkAlphaMulQ(color, SkAlpha255To256(aa));
SkBlitRow::Color32(device, count, sc);
fColor32Proc(device, device, count, sc);
}
}
runs += count;
@ -286,7 +288,7 @@ void SkARGB32_Blitter::blitRect(int x, int y, int width, int height) {
size_t rowBytes = fDevice.rowBytes();
while (--height >= 0) {
SkBlitRow::Color32(device, width, color);
fColor32Proc(device, device, width, color);
device = (uint32_t*)((char*)device + rowBytes);
}
}

3
src/core/SkCoreBlitters.h
View File

@ -101,7 +101,8 @@ public:
virtual const SkBitmap* justAnOpaqueColor(uint32_t*);
protected:
SkColor fPMColor;
SkColor fPMColor;
SkBlitRow::ColorProc fColor32Proc;
private:
unsigned fSrcA, fSrcR, fSrcG, fSrcB;

8
src/effects/SkColorFilters.cpp
View File

@ -75,7 +75,8 @@ private:
class SkSrcOver_XfermodeColorFilter : public Sk_XfermodeColorFilter {
public:
SkSrcOver_XfermodeColorFilter(SkColor color) : INHERITED(color) {}
SkSrcOver_XfermodeColorFilter(SkColor color)
: INHERITED(color), fColor32Proc(SkBlitRow::ColorProcFactory()) {}
virtual uint32_t getFlags() {
if (SkGetPackedA32(fPMColor) == 0xFF) {
@ -87,7 +88,7 @@ public:
virtual void filterSpan(const SkPMColor shader[], int count,
SkPMColor result[]) {
SkBlitRow::Color32(result, shader, count, fPMColor);
fColor32Proc(result, shader, count, fPMColor);
}
virtual void filterSpan16(const uint16_t shader[], int count,
@ -100,7 +101,7 @@ protected:
virtual Factory getFactory() { return CreateProc; }
SkSrcOver_XfermodeColorFilter(SkFlattenableReadBuffer& buffer)
: INHERITED(buffer) {}
: INHERITED(buffer), fColor32Proc(SkBlitRow::ColorProcFactory()) {}
private:
static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) {
@ -108,6 +109,7 @@ private:
}
typedef Sk_XfermodeColorFilter INHERITED;
SkBlitRow::ColorProc fColor32Proc;
};
//////////////////////////////////////////////////////////////////////////////