Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(3955)

Unified Diff: src/gpu/SkGpuDevice.cpp

Issue 6353094: Start removing calls to GrDrawState::setTexture() (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Simplify, simplify, simplify Created 12 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/gpu/SkGpuDevice.cpp
===================================================================
--- src/gpu/SkGpuDevice.cpp (revision 4601)
+++ src/gpu/SkGpuDevice.cpp (working copy)
@@ -562,7 +562,6 @@
SkDebugf("Couldn't convert bitmap to texture.\n");
return false;
}
- grPaint->setTexture(kShaderTextureIdx, texture);
switch (bmptype) {
case SkShader::kRadial_BitmapType:
@@ -595,6 +594,9 @@
} else {
sampler->setFilter(GrSamplerState::kNearest_Filter);
}
+ // TODO - once we have a trivial GrCustomStage for texture drawing,
+ // create that here & get rid of the paint's texture
+ grPaint->setTexture(kShaderTextureIdx, texture);
break;
}
sampler->setWrapX(sk_tile_mode_to_grwrap(tileModes[0]));
@@ -1476,7 +1478,6 @@
paint.textureSampler(0)->setFilter(GrSamplerState::kBilinear_Filter);
paint.textureSampler(0)->reset(sampleM);
paint.textureSampler(0)->setCustomStage(stage);
- paint.setTexture(0, srcTexture);
context->drawRect(paint, rect);
}
« no previous file with comments | « src/gpu/GrDrawState.h ('k') | src/gpu/gl/GrGpuGL.cpp » ('j') | src/gpu/gl/GrGpuGL.cpp » ('J')

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b