Index: src/gpu/GrProcessor.cpp |
diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/GrProcessor.cpp |
index 8aeef04b48e8dcd1244bbd37c172baf1f80d4df0..810c751f1c7686fa2bac08d48a98e751229dd00e 100644 |
--- a/src/gpu/GrProcessor.cpp |
+++ b/src/gpu/GrProcessor.cpp |
@@ -6,7 +6,6 @@ |
*/ |
#include "GrProcessor.h" |
-#include "GrBackendProcessorFactory.h" |
#include "GrContext.h" |
#include "GrCoordTransform.h" |
#include "GrGeometryData.h" |
@@ -16,6 +15,9 @@ |
#if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS |
+class GrFragmentProcessor; |
+class GrGeometryProcessor; |
+ |
/* |
* Originally these were both in the processor unit test header, but then it seemed to cause linker |
* problems on android. |
@@ -109,17 +111,13 @@ private: |
} |
}; |
-int32_t GrBackendProcessorFactory::fCurrProcessorClassID = |
- GrBackendProcessorFactory::kIllegalProcessorClassID; |
+int32_t GrProcessor::gCurrProcessorClassID = |
+ GrProcessor::kIllegalProcessorClassID; |
/////////////////////////////////////////////////////////////////////////////// |
GrProcessor::~GrProcessor() {} |
-const char* GrProcessor::name() const { |
- return this->getFactory().name(); |
-} |
- |
void GrProcessor::addTextureAccess(const GrTextureAccess* access) { |
fTextureAccesses.push_back(access); |
this->addGpuResource(access->getProgramTexture()); |
@@ -181,4 +179,3 @@ void* GrGeometryData::operator new(size_t size) { |
void GrGeometryData::operator delete(void* target) { |
GrProcessor_Globals::GetTLS()->release(target); |
} |
- |