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

Add SkTableColorFilter, as a foundation for several SVG filters

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@2933 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
mike@reedtribe.org 2011-12-28 20:31:00 +00:00
parent 7012162d2f
commit a69b48c29d
5 changed files with 375 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
gm/tablecolorfilter.cpp Normal file
View File

@ -0,0 +1,139 @@
/*
* Copyright 2011 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "gm.h"
#include "SkCanvas.h"
#include "SkGradientShader.h"
#include "SkTableColorFilter.h"
static void make_bm0(SkBitmap* bm) {
int W = 120;
int H = 120;
bm->setConfig(SkBitmap::kARGB_8888_Config, W, H);
bm->allocPixels();
bm->eraseColor(0);
SkCanvas canvas(*bm);
SkPaint paint;
SkPoint pts[] = { 0, 0, SkIntToScalar(W), SkIntToScalar(H) };
SkColor colors[] = {
SK_ColorBLACK, SK_ColorGREEN, SK_ColorCYAN,
SK_ColorRED, 0, SK_ColorBLUE, SK_ColorWHITE
};
SkShader* s = SkGradientShader::CreateLinear(pts, colors, NULL, SK_ARRAY_COUNT(colors),
SkShader::kClamp_TileMode);
paint.setShader(s)->unref();
canvas.drawPaint(paint);
}
static void make_bm1(SkBitmap* bm) {
int W = 120;
int H = 120;
bm->setConfig(SkBitmap::kARGB_8888_Config, W, H);
bm->allocPixels();
bm->eraseColor(0);
SkCanvas canvas(*bm);
SkPaint paint;
SkScalar cx = SkIntToScalar(W)/2;
SkScalar cy = SkIntToScalar(H)/2;
SkColor colors[] = {
SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE,
};
SkShader* s = SkGradientShader::CreateRadial(SkPoint::Make(SkIntToScalar(W)/2,
SkIntToScalar(H)/2),
SkIntToScalar(W)/2, colors, NULL, SK_ARRAY_COUNT(colors),
SkShader::kClamp_TileMode);
paint.setShader(s)->unref();
paint.setAntiAlias(true);
canvas.drawCircle(cx, cy, cx, paint);
}
static void make_table0(uint8_t table[]) {
for (int i = 0; i < 256; ++i) {
int n = i >> 5;
table[i] = (n << 5) | (n << 2) | (n >> 1);
}
}
static void make_table1(uint8_t table[]) {
for (int i = 0; i < 256; ++i) {
table[i] = i * i / 255;
}
}
static void make_table2(uint8_t table[]) {
for (int i = 0; i < 256; ++i) {
float fi = i / 255.0f;
table[i] = sqrtf(fi) * 255;
}
}
static SkColorFilter* make_cf0() {
uint8_t table[256]; make_table0(table);
return SkTableColorFilter::Create(table);
}
static SkColorFilter* make_cf1() {
uint8_t table[256]; make_table1(table);
return SkTableColorFilter::Create(table);
}
static SkColorFilter* make_cf2() {
uint8_t table[256]; make_table2(table);
return SkTableColorFilter::Create(table);
}
static SkColorFilter* make_cf3() {
uint8_t table0[256]; make_table0(table0);
uint8_t table1[256]; make_table1(table1);
uint8_t table2[256]; make_table2(table2);
return SkTableColorFilter::CreateARGB(NULL, table0, table1, table2);
}
class TableColorFilterGM : public skiagm::GM {
public:
TableColorFilterGM() {}
protected:
virtual SkString onShortName() {
return SkString("tablecolorfilter");
}
virtual SkISize onISize() {
return SkISize::Make(640, 480);
}
virtual void onDraw(SkCanvas* canvas) {
canvas->drawColor(0xFFDDDDDD);
canvas->translate(20, 20);
SkScalar x = 0, y = 0;
static void (*gMakers[])(SkBitmap*) = { make_bm0, make_bm1 };
for (size_t maker = 0; maker < SK_ARRAY_COUNT(gMakers); ++maker) {
SkBitmap bm;
gMakers[maker](&bm);
SkPaint paint;
x = 0;
canvas->drawBitmap(bm, x, y, &paint);
paint.setColorFilter(make_cf0())->unref(); x += bm.width() * 9 / 8;
canvas->drawBitmap(bm, x, y, &paint);
paint.setColorFilter(make_cf1())->unref(); x += bm.width() * 9 / 8;
canvas->drawBitmap(bm, x, y, &paint);
paint.setColorFilter(make_cf2())->unref(); x += bm.width() * 9 / 8;
canvas->drawBitmap(bm, x, y, &paint);
paint.setColorFilter(make_cf3())->unref(); x += bm.width() * 9 / 8;
canvas->drawBitmap(bm, x, y, &paint);
y += bm.height() * 9 / 8;
}
}
private:
typedef GM INHERITED;
};
//////////////////////////////////////////////////////////////////////////////
static skiagm::GM* MyFactory(void*) { return new TableColorFilterGM; }
static skiagm::GMRegistry reg(MyFactory);

2
gyp/effects.gyp
View File

@ -36,6 +36,7 @@
'../include/effects/SkPixelXorXfermode.h',
'../include/effects/SkPorterDuff.h',
'../include/effects/SkRectShape.h',
'../include/effects/SkTableColorFilter.h',
'../include/effects/SkTransparentShader.h',
'../src/effects/Sk1DPathEffect.cpp',
@ -69,6 +70,7 @@
'../src/effects/SkPorterDuff.cpp',
'../src/effects/SkRadialGradient_Table.h',
'../src/effects/SkRectShape.cpp',
'../src/effects/SkTableColorFilter.cpp',
'../src/effects/SkTestImageFilters.cpp',
'../src/effects/SkTransparentShader.cpp',
],

1
gyp/gmslides.gypi
View File

@ -38,6 +38,7 @@
'../gm/shapes.cpp',
'../gm/strokerects.cpp',
'../gm/strokes.cpp',
'../gm/tablecolorfilter.cpp',
'../gm/testimagefilters.cpp',
'../gm/texdata.cpp',
'../gm/tilemodes.cpp',

34
include/effects/SkTableColorFilter.h Normal file
View File

@ -0,0 +1,34 @@
#ifndef SkTableColorFilter_DEFINED
#define SkTableColorFilter_DEFINED
#include "SkColorFilter.h"
class SkTableColorFilter {
public:
/**
* Create a table colorfilter, copying the table into the filter, and
* applying it to all 4 components.
* a' = table[a];
* r' = table[r];
* g' = table[g];
* b' = table[b];
* Compoents are operated on in unpremultiplied space. If the incomming
* colors are premultiplied, they are temporarily unpremultiplied, then
* the table is applied, and then the result is remultiplied.
*/
static SkColorFilter* Create(const uint8_t table[256]);
/**
* Create a table colorfilter, with a different table for each
* component [A, R, G, B]. If a given table is NULL, then it is
* treated as identity, with the component left unchanged. If a table
* is not null, then its contents are copied into the filter.
*/
static SkColorFilter* CreateARGB(const uint8_t tableA[256],
const uint8_t tableR[256],
const uint8_t tableG[256],
const uint8_t tableB[256]);
};
#endif

199
src/effects/SkTableColorFilter.cpp Normal file
View File

@ -0,0 +1,199 @@
#include "SkColorPriv.h"
#include "SkTableColorFilter.h"
#include "SkUnPreMultiply.h"
class SkTable_ColorFilter : public SkColorFilter {
public:
SkTable_ColorFilter(const uint8_t tableA[], const uint8_t tableR[],
const uint8_t tableG[], const uint8_t tableB[]) {
fFlags = 0;
uint8_t* dst = fStorage;
if (tableA) {
memcpy(dst, tableA, 256);
dst += 256;
fFlags |= kA_Flag;
}
if (tableR) {
memcpy(dst, tableR, 256);
dst += 256;
fFlags |= kR_Flag;
}
if (tableG) {
memcpy(dst, tableG, 256);
dst += 256;
fFlags |= kG_Flag;
}
if (tableB) {
memcpy(dst, tableB, 256);
fFlags |= kB_Flag;
}
}
virtual void filterSpan(const SkPMColor src[], int count,
SkPMColor dst[]) SK_OVERRIDE;
virtual void flatten(SkFlattenableWriteBuffer&) SK_OVERRIDE;
virtual Factory getFactory() SK_OVERRIDE;
static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) {
return SkNEW_ARGS(SkTable_ColorFilter, (buffer));
}
protected:
SkTable_ColorFilter(SkFlattenableReadBuffer& buffer);
private:
enum {
kA_Flag = 1 << 0,
kR_Flag = 1 << 1,
kG_Flag = 1 << 2,
kB_Flag = 1 << 3,
};
uint8_t fStorage[256 * 4];
unsigned fFlags;
typedef SkColorFilter INHERITED;
};
static const uint8_t gIdentityTable[] = {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F,
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F,
0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F,
0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F,
0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F,
0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F,
0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F,
0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7,
0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF,
0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7,
0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF,
0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7,
0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF,
0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7,
0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF,
0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,
0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
};
void SkTable_ColorFilter::filterSpan(const SkPMColor src[], int count,
SkPMColor dst[]) {
const uint8_t* table = fStorage;
const uint8_t* tableA = gIdentityTable;
const uint8_t* tableR = gIdentityTable;
const uint8_t* tableG = gIdentityTable;
const uint8_t* tableB = gIdentityTable;
if (fFlags & kA_Flag) {
tableA = table; table += 256;
}
if (fFlags & kR_Flag) {
tableR = table; table += 256;
}
if (fFlags & kG_Flag) {
tableG = table; table += 256;
}
if (fFlags & kB_Flag) {
tableB = table;
}
const SkUnPreMultiply::Scale* scaleTable = SkUnPreMultiply::GetScaleTable();
for (int i = 0; i < count; ++i) {
SkPMColor c = src[i];
unsigned a, r, g, b;
if (0 == c) {
a = r = g = b = 0;
} else {
a = SkGetPackedA32(c);
r = SkGetPackedR32(c);
g = SkGetPackedG32(c);
b = SkGetPackedB32(c);
if (a < 255) {
SkUnPreMultiply::Scale scale = scaleTable[a];
r = SkUnPreMultiply::ApplyScale(scale, r);
g = SkUnPreMultiply::ApplyScale(scale, g);
b = SkUnPreMultiply::ApplyScale(scale, b);
}
}
dst[i] = SkPremultiplyARGBInline(tableA[a], tableR[r],
tableG[g], tableB[b]);
}
}
SkFlattenable::Factory SkTable_ColorFilter::getFactory() {
return CreateProc;
}
static const uint8_t gCountNibBits[] = {
0, 1, 1, 2,
1, 2, 2, 3,
1, 2, 2, 3,
2, 3, 3, 4
};
#include "SkPackBits.h"
void SkTable_ColorFilter::flatten(SkFlattenableWriteBuffer& buffer) {
this->INHERITED::flatten(buffer);
uint8_t storage[5*256];
int count = gCountNibBits[fFlags & 0xF];
size_t size = SkPackBits::Pack8(fStorage, count * 256, storage);
SkASSERT(size <= sizeof(storage));
// SkDebugf("raw %d packed %d\n", count * 256, size);
buffer.writeInt(fFlags);
buffer.writeInt(size);
buffer.write(storage, size);
}
SkTable_ColorFilter::SkTable_ColorFilter(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {
uint8_t storage[5*256];
fFlags = buffer.readInt();
size_t size = buffer.readInt();
buffer.read(storage, size);
size_t raw = SkPackBits::Unpack8(storage, size, fStorage);
SkASSERT(raw <= sizeof(fStorage));
int count = gCountNibBits[fFlags & 0xF];
SkASSERT(raw == count * 256);
}
///////////////////////////////////////////////////////////////////////////////
#ifdef SK_CPU_BENDIAN
#else
#define SK_A32_INDEX (3 - (SK_A32_SHIFT >> 3))
#define SK_R32_INDEX (3 - (SK_R32_SHIFT >> 3))
#define SK_G32_INDEX (3 - (SK_G32_SHIFT >> 3))
#define SK_B32_INDEX (3 - (SK_B32_SHIFT >> 3))
#endif
///////////////////////////////////////////////////////////////////////////////
SkColorFilter* SkTableColorFilter::Create(const uint8_t table[256]) {
return SkNEW_ARGS(SkTable_ColorFilter, (table, table, table, table));
}
SkColorFilter* SkTableColorFilter::CreateARGB(const uint8_t tableA[256],
const uint8_t tableR[256],
const uint8_t tableG[256],
const uint8_t tableB[256]) {
return SkNEW_ARGS(SkTable_ColorFilter, (tableA, tableR, tableG, tableB));
}