AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove legacy Gr things

Browse Source 
Review URL: https://codereview.chromium.org/1132813002
This commit is contained in:
bsalomon 2015-05-08 07:17:05 -07:00 committed by Commit bot
parent 2a974625c5
commit 72c7a60ecf
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/gpu/GrContext.h
View File

@ -517,23 +517,6 @@ public:
*/
uint32_t uniqueID() { return fUniqueID; }
///////////////////////////////////////////////////////////////////////////
// Legacy functions, to be removed once Chromium stops using them.
enum ScratchTexMatch {
kExact_ScratchTexMatch = GrTextureProvider::kExact_ScratchTexMatch,
kApprox_ScratchTexMatch = GrTextureProvider::kApprox_ScratchTexMatch
};
GrTexture* refScratchTexture(const GrSurfaceDesc& desc, ScratchTexMatch match) {
return this->textureProvider()->refScratchTexture(
desc, (GrTextureProvider::ScratchTexMatch) match);
}
GrTexture* wrapBackendTexture(const GrBackendTextureDesc& desc) {
return this->textureProvider()->wrapBackendTexture(desc);
}
///////////////////////////////////////////////////////////////////////////
// Functions intended for internal use only.
GrGpu* getGpu() { return fGpu; }

11
include/gpu/GrTypes.h
View File

@ -389,10 +389,6 @@ enum GrSurfaceFlags {
* GrTexture::asRenderTarget() to access.
*/
kRenderTarget_GrSurfaceFlag = 0x1,
/**
* DEPRECATED. This has no effect.
*/
kNoStencil_GrSurfaceFlag = 0x2,
/**
* Indicates that all allocations (color buffer, FBO completeness, etc)
* should be verified.
@ -402,13 +398,6 @@ enum GrSurfaceFlags {
GR_MAKE_BITFIELD_OPS(GrSurfaceFlags)
// Legacy aliases
typedef GrSurfaceFlags GrTextureFlags;
static const GrSurfaceFlags kNone_GrTextureFlags = kNone_GrSurfaceFlags;
static const GrSurfaceFlags kRenderTarget_GrTextureFlagBit = kRenderTarget_GrSurfaceFlag;
static const GrSurfaceFlags kNoStencil_GrTextureFlagBit = kNoStencil_GrSurfaceFlag;
static const GrSurfaceFlags kCheckAllocation_GrTextureFlagBit = kCheckAllocation_GrSurfaceFlag;
/**
* Some textures will be stored such that the upper and left edges of the content meet at the
* the origin (in texture coord space) and for other textures the lower and left edges meet at