Revert of Implement text rendering with NVPR (https://codereview.chromium.org/196133014/)
Reason for revert:
This probably caused Win8 test bot fail during gm run:
http://108.170.217.252:10117/builders/Test-Win8-ShuttleA-GTX660-x86-Debug/builds/574
I can not identify any errors from the logs, so maybe it hung or something?
Original issue's description:
> Implement text rendering with NVPR
>
> Use path rendering to render the text from outlines if supported by the
> GPU. Implement this in GrStencilAndCoverTextContext by copying large
> chunks of code from GrBitmapTextContext (drawText) and
> GrDistanceFieldTextContext (drawPosText).
>
> The drawing is implemented with "instanced" path drawing
> functions.
>
> Moves the creation of the "main" text context from SkGpuDevice to the
> GrContext::createTextContext. This is done because the decision of which
> text renderer is optimal can be made only with the internal
> implementation-specific information of the context.
>
> Committed: http://code.google.com/p/skia/source/detail?r=13962
R=jvanverth@google.com, bsalomon@google.com, mtklein@google.com
TBR=bsalomon@google.com, jvanverth@google.com, mtklein@google.com
NOTREECHECKS=true
NOTRY=true
Author: kkinnunen@nvidia.com
Review URL: https://codereview.chromium.org/213123014
git-svn-id: http://skia.googlecode.com/svn/trunk@13963 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 0876b4d..3a2bbe8 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -14,26 +14,24 @@
#include "GrAARectRenderer.h"
#include "GrBufferAllocPool.h"
-#include "GrDistanceFieldTextContext.h"
-#include "GrDrawTargetCaps.h"
#include "GrGpu.h"
-#include "GrInOrderDrawBuffer.h"
+#include "GrDrawTargetCaps.h"
#include "GrIndexBuffer.h"
+#include "GrInOrderDrawBuffer.h"
#include "GrOvalRenderer.h"
#include "GrPathRenderer.h"
#include "GrPathUtils.h"
#include "GrResourceCache.h"
#include "GrSoftwarePathRenderer.h"
-#include "GrStencilAndCoverTextContext.h"
#include "GrStencilBuffer.h"
#include "GrTextStrike.h"
#include "GrTracing.h"
#include "SkGr.h"
-#include "SkRRect.h"
#include "SkRTConf.h"
+#include "SkRRect.h"
#include "SkStrokeRec.h"
-#include "SkTLS.h"
#include "SkTLazy.h"
+#include "SkTLS.h"
#include "SkTraceEvent.h"
// It can be useful to set this to false to test whether a bug is caused by using the
@@ -229,17 +227,6 @@
return fTextureCache->getCachedResourceCount();
}
-GrTextContext* GrContext::createTextContext(GrRenderTarget* renderTarget,
- const SkDeviceProperties&
- leakyProperties) {
- if (fGpu->caps()->pathRenderingSupport()) {
- if (renderTarget->getStencilBuffer() && renderTarget->isMultisampled()) {
- return SkNEW_ARGS(GrStencilAndCoverTextContext, (this, leakyProperties));
- }
- }
- return SkNEW_ARGS(GrDistanceFieldTextContext, (this, leakyProperties));
-}
-
////////////////////////////////////////////////////////////////////////////////
GrTexture* GrContext::findAndRefTexture(const GrTextureDesc& desc,