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

Left over cleanup from r4416 (fix for lingering AA clip mask bug)

Browse Source 
http://codereview.appspot.com/6356058/



git-svn-id: http://skia.googlecode.com/svn/trunk@4474 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
robertphillips@google.com 2012-07-09 16:32:28 +00:00
parent d3ba5cc85e
commit 5dfb67219a
4 changed files with 93 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/gpu/GrClipMaskManager.cpp
View File

@ -360,40 +360,19 @@ bool draw_path_in_software(GrContext* context,
bool doAA,
const GrIRect& resultBounds) {
GrAutoScratchTexture ast;
if (!GrSWMaskHelper::DrawToTexture(context, path, resultBounds, fill,
&ast, doAA, NULL)) {
SkAutoTUnref<GrTexture> texture(
GrSWMaskHelper::DrawPathMaskToTexture(context, path,
resultBounds, fill,
doAA, NULL));
if (NULL == texture) {
return false;
}
// TODO: merge this with the similar code in the GrSoftwarePathRenderer.cpp
SkAutoTUnref<GrTexture> texture(ast.detach());
GrAssert(NULL != texture);
// The ClipMaskManager accumulates the clip mask in the UL corner
GrIRect rect = GrIRect::MakeWH(resultBounds.width(), resultBounds.height());
GrDrawState::StageMask stageMask = 0;
GrDrawTarget::AutoDeviceCoordDraw adcd(gpu, stageMask);
enum {
// the SW path renderer shares this stage with glyph
// rendering (kGlyphMaskStage in GrBatchedTextContext)
kPathMaskStage = GrPaint::kTotalStages,
};
GrAssert(NULL == gpu->drawState()->getTexture(kPathMaskStage));
gpu->drawState()->setTexture(kPathMaskStage, texture);
gpu->drawState()->sampler(kPathMaskStage)->reset();
GrScalar w = GrIntToScalar(resultBounds.width());
GrScalar h = GrIntToScalar(resultBounds.height());
GrRect maskRect = GrRect::MakeWH(w / texture->width(),
h / texture->height());
GrSWMaskHelper::DrawToTargetWithPathMask(texture, gpu, 0, rect);
const GrRect* srcRects[GrDrawState::kNumStages] = {NULL};
srcRects[kPathMaskStage] = &maskRect;
stageMask |= 1 << kPathMaskStage;
GrRect dstRect = GrRect::MakeWH(
SK_Scalar1* resultBounds.width(),
SK_Scalar1* resultBounds.height());
gpu->drawRect(dstRect, NULL, stageMask, srcRects, NULL);
gpu->drawState()->setTexture(kPathMaskStage, NULL);
GrAssert(!GrIsFillInverted(fill));
return true;
}

61
src/gpu/GrSWMaskHelper.cpp
View File

@ -169,30 +169,63 @@ void GrSWMaskHelper::toTexture(GrTexture *texture, uint8_t alpha) {
////////////////////////////////////////////////////////////////////////////////
/**
* Software rasterizes path to A8 mask (possibly using the context's matrix)
* and uploads the result to a scratch texture. Returns true on success;
* false on failure.
* and uploads the result to a scratch texture. Returns the resulting
* texture on success; NULL on failure.
*/
bool GrSWMaskHelper::DrawToTexture(GrContext* context,
const SkPath& path,
const GrIRect& resultBounds,
GrPathFill fill,
GrAutoScratchTexture* result,
bool antiAlias,
GrMatrix* matrix) {
GrTexture* GrSWMaskHelper::DrawPathMaskToTexture(GrContext* context,
const SkPath& path,
const GrIRect& resultBounds,
GrPathFill fill,
bool antiAlias,
GrMatrix* matrix) {
GrAutoScratchTexture ast;
GrSWMaskHelper helper(context);
if (!helper.init(resultBounds, matrix)) {
return false;
return NULL;
}
helper.draw(path, SkRegion::kReplace_Op, fill, antiAlias, 0xFF);
if (!helper.getTexture(result)) {
return false;
if (!helper.getTexture(&ast)) {
return NULL;
}
helper.toTexture(result->texture(), 0x00);
helper.toTexture(ast.texture(), 0x00);
return true;
return ast.detach();
}
void GrSWMaskHelper::DrawToTargetWithPathMask(GrTexture* texture,
GrDrawTarget* target,
GrDrawState::StageMask stageMask,
const GrIRect& rect) {
GrDrawState* drawState = target->drawState();
GrDrawTarget::AutoDeviceCoordDraw adcd(target, stageMask);
enum {
// the SW path renderer shares this stage with glyph
// rendering (kGlyphMaskStage in GrBatchedTextContext)
kPathMaskStage = GrPaint::kTotalStages,
};
GrAssert(!drawState->isStageEnabled(kPathMaskStage));
drawState->setTexture(kPathMaskStage, texture);
drawState->sampler(kPathMaskStage)->reset();
GrScalar w = GrIntToScalar(rect.width());
GrScalar h = GrIntToScalar(rect.height());
GrRect maskRect = GrRect::MakeWH(w / texture->width(),
h / texture->height());
const GrRect* srcRects[GrDrawState::kNumStages] = { NULL };
srcRects[kPathMaskStage] = &maskRect;
stageMask |= 1 << kPathMaskStage;
GrRect dstRect = GrRect::MakeLTRB(
SK_Scalar1 * rect.fLeft,
SK_Scalar1 * rect.fTop,
SK_Scalar1 * rect.fRight,
SK_Scalar1 * rect.fBottom);
target->drawRect(dstRect, NULL, stageMask, srcRects, NULL);
drawState->setTexture(kPathMaskStage, NULL);
}

30
src/gpu/GrSWMaskHelper.h
View File

@ -15,11 +15,13 @@
#include "SkDraw.h"
#include "SkRasterClip.h"
#include "SkRegion.h"
#include "GrDrawState.h"
class GrAutoScratchTexture;
class GrContext;
class GrTexture;
class SkPath;
class GrDrawTarget;
/**
* The GrSWMaskHelper helps generate clip masks using the software rendering
@ -70,13 +72,27 @@ public:
// Canonical usage utility that draws a single path and uploads it
// to the GPU. The result is returned in "result".
static bool DrawToTexture(GrContext* context,
const SkPath& path,
const GrIRect& resultBounds,
GrPathFill fill,
GrAutoScratchTexture* result,
bool antiAlias,
GrMatrix* matrix);
static GrTexture* DrawPathMaskToTexture(GrContext* context,
const SkPath& path,
const GrIRect& resultBounds,
GrPathFill fill,
bool antiAlias,
GrMatrix* matrix);
// This utility routine is used to add a path's mask to some other draw.
// The ClipMaskManager uses it to accumulate clip masks while the
// GrSoftwarePathRenderer uses it to fulfill a drawPath call.
// It draws with "texture" as a path mask into "target" using "rect" as
// geometry and the current drawState. The current drawState is altered to
// accommodate the mask.
// Note that this method assumes that the GrPaint::kTotalStages slot in
// the draw state can be used to hold the mask texture stage.
// This method is really only intended to be used with the
// output of DrawPathMaskToTexture.
static void DrawToTargetWithPathMask(GrTexture* texture,
GrDrawTarget* target,
GrDrawState::StageMask stageMask,
const GrIRect& rect);
protected:
private:

50
src/gpu/GrSoftwarePathRenderer.cpp
View File

@ -123,7 +123,6 @@ bool GrSoftwarePathRenderer::onDrawPath(const SkPath& path,
vm.postTranslate(translate->fX, translate->fY);
}
GrAutoScratchTexture ast;
GrIRect pathBounds, clipBounds;
if (!get_path_and_clip_bounds(target, path, vm,
&pathBounds, &clipBounds)) {
@ -134,40 +133,21 @@ bool GrSoftwarePathRenderer::onDrawPath(const SkPath& path,
return true;
}
if (GrSWMaskHelper::DrawToTexture(fContext, path, pathBounds, fill,
&ast, antiAlias, &vm)) {
SkAutoTUnref<GrTexture> texture(ast.detach());
GrAssert(NULL != texture);
GrDrawTarget::AutoDeviceCoordDraw adcd(target, stageMask);
enum {
// the SW path renderer shares this stage with glyph
// rendering (kGlyphMaskStage in GrBatchedTextContext)
kPathMaskStage = GrPaint::kTotalStages,
};
GrAssert(NULL == drawState->getTexture(kPathMaskStage));
drawState->setTexture(kPathMaskStage, texture);
drawState->sampler(kPathMaskStage)->reset();
GrScalar w = GrIntToScalar(pathBounds.width());
GrScalar h = GrIntToScalar(pathBounds.height());
GrRect maskRect = GrRect::MakeWH(w / texture->width(),
h / texture->height());
const GrRect* srcRects[GrDrawState::kNumStages] = {NULL};
srcRects[kPathMaskStage] = &maskRect;
stageMask |= 1 << kPathMaskStage;
GrRect dstRect = GrRect::MakeLTRB(
SK_Scalar1* pathBounds.fLeft,
SK_Scalar1* pathBounds.fTop,
SK_Scalar1* pathBounds.fRight,
SK_Scalar1* pathBounds.fBottom);
target->drawRect(dstRect, NULL, stageMask, srcRects, NULL);
drawState->setTexture(kPathMaskStage, NULL);
if (GrIsFillInverted(fill)) {
draw_around_inv_path(target, stageMask,
clipBounds, pathBounds);
}
return true;
SkAutoTUnref<GrTexture> texture(
GrSWMaskHelper::DrawPathMaskToTexture(fContext, path,
pathBounds, fill,
antiAlias, &vm));
if (NULL == texture) {
return false;
}
return false;
GrSWMaskHelper::DrawToTargetWithPathMask(texture, target,
stageMask, pathBounds);
if (GrIsFillInverted(fill)) {
draw_around_inv_path(target, stageMask,
clipBounds, pathBounds);
}
return true;
}