Get rid of createRenderTargetFrom3DAPIState and associated glGets necessary to support it.
Review URL: http://codereview.appspot.com/4928041/
git-svn-id: http://skia.googlecode.com/svn/trunk@2144 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gpu/include/GrContext.h b/gpu/include/GrContext.h
index ee16321..2f98cdf 100644
--- a/gpu/include/GrContext.h
+++ b/gpu/include/GrContext.h
@@ -251,20 +251,6 @@
*/
GrResource* createPlatformSurface(const GrPlatformSurfaceDesc& desc);
- /**
- * Reads the current target object (e.g. FBO or IDirect3DSurface9*) and
- * viewport state from the underlying 3D API and wraps it in a
- * GrRenderTarget. The GrRenderTarget will not attempt to delete/destroy the
- * underlying object in its destructor and it is up to caller to guarantee
- * that it remains valid while the GrRenderTarget is used.
- *
- * Will not detect that the render target is also a texture. If you need
- * to also use the render target as a GrTexture use createPlatformSurface.
- *
- * @return the newly created GrRenderTarget
- */
- GrRenderTarget* createRenderTargetFrom3DApiState();
-
///////////////////////////////////////////////////////////////////////////
// Matrix state
diff --git a/gpu/include/GrRenderTarget.h b/gpu/include/GrRenderTarget.h
index 6fa9f0f..dd7a371 100644
--- a/gpu/include/GrRenderTarget.h
+++ b/gpu/include/GrRenderTarget.h
@@ -62,7 +62,7 @@
* if client asked us to render to a target that has a pixel
* config that isn't equivalent with one of our configs.
*/
- int config() const { return fConfig; }
+ GrPixelConfig config() const { return fConfig; }
/**
* @return the texture associated with the rendertarget, may be NULL.