Index: src/gpu/gl/GrGpuGL.h |
diff --git a/src/gpu/gl/GrGpuGL.h b/src/gpu/gl/GrGpuGL.h |
index 46d970069bf675cb53103c28d9600056ac4160f8..369d95bd8b0a02ecac2ffc6a0dd1edba05785da0 100644 |
--- a/src/gpu/gl/GrGpuGL.h |
+++ b/src/gpu/gl/GrGpuGL.h |
@@ -256,7 +256,7 @@ private: |
GrGLenum* externalFormat, |
GrGLenum* externalType); |
// helper for onCreateTexture and writeTexturePixels |
- bool uploadTexData(const GrGLTexture::Desc& desc, |
+ bool uploadTexData(const GrSurfaceDesc& desc, |
bool isNewTexture, |
int left, int top, int width, int height, |
GrPixelConfig dataConfig, |
@@ -269,15 +269,13 @@ private: |
// whenever a new texture needs to be created. Otherwise, we assume that |
// the texture is already in GPU memory and that it's going to be updated |
// with new data. |
- bool uploadCompressedTexData(const GrGLTexture::Desc& desc, |
+ bool uploadCompressedTexData(const GrSurfaceDesc& desc, |
const void* data, |
bool isNewTexture = true, |
int left = 0, int top = 0, |
int width = -1, int height = -1); |
- bool createRenderTargetObjects(int width, int height, |
- GrGLuint texID, |
- GrGLRenderTarget::Desc* desc); |
+ bool createRenderTargetObjects(const GrSurfaceDesc&, GrGLuint texID, GrGLRenderTarget::IDDesc*); |
GrGLuint bindSurfaceAsFBO(GrSurface* surface, GrGLenum fboTarget, GrGLIRect* viewport); |