diff options
| author |  joshualitt <joshualitt@chromium.org> | 2014-12-03 06:24:10 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-12-03 06:24:10 -0800 |
| commit | 2dd1ae016d7f297b433c3ea3a771ef8e01657c1f (patch) | |
| tree | 96aa03d4b4b1802490cb5b769627b75f3de4a470 /src/gpu/GrInOrderDrawBuffer.cpp | |
| parent | 960fb50a1a7ac76fd51e22983812f26bfffa6d1e (diff) | |
First step to moving vertex attributes to the geometryProcessor
BUG=skia:
Review URL: https://codereview.chromium.org/761563002
Diffstat (limited to 'src/gpu/GrInOrderDrawBuffer.cpp')
| -rw-r--r-- | src/gpu/GrInOrderDrawBuffer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/GrInOrderDrawBuffer.cpp b/src/gpu/GrInOrderDrawBuffer.cpp index 6b98e13439..5533174853 100644 --- a/src/gpu/GrInOrderDrawBuffer.cpp +++ b/src/gpu/GrInOrderDrawBuffer.cpp @@ -66,8 +66,7 @@ static void set_vertex_attributes(GrDrawState* drawState, bool hasLocalCoords, G uint32_t flags = GrDefaultGeoProcFactory::kPosition_GPType | GrDefaultGeoProcFactory::kColor_GPType; flags |= hasLocalCoords ? GrDefaultGeoProcFactory::kLocalCoord_GPType : 0; - drawState->setGeometryProcessor(GrDefaultGeoProcFactory::CreateAndSetAttribs(drawState, - flags))->unref(); + drawState->setGeometryProcessor(GrDefaultGeoProcFactory::Create(flags))->unref(); if (0xFF == GrColorUnpackA(color)) { drawState->setHint(GrDrawState::kVertexColorsAreOpaque_Hint, true); } @@ -119,7 +118,10 @@ void GrInOrderDrawBuffer::onDrawRect(GrDrawState* ds, GrColor color = ds->getColor(); set_vertex_attributes(ds, SkToBool(localRect), color); - AutoReleaseGeometry geo(this, 4, ds->getVertexStride(), 0); + size_t vstride = ds->getGeometryProcessor()->getVertexStride(); + SkASSERT(vstride == sizeof(SkPoint) + sizeof(GrColor) + (SkToBool(localRect) ? sizeof(SkPoint) : + 0)); + AutoReleaseGeometry geo(this, 4, vstride, 0); if (!geo.succeeded()) { SkDebugf("Failed to get space for vertices!\n"); return; @@ -136,8 +138,6 @@ void GrInOrderDrawBuffer::onDrawRect(GrDrawState* ds, return; } - size_t vstride = ds->getVertexStride(); - geo.positions()->setRectFan(rect.fLeft, rect.fTop, rect.fRight, rect.fBottom, vstride); matrix.mapPointsWithStride(geo.positions(), vstride, 4); |