diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-01-20 12:44:06 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-20 18:18:18 +0000 |
| commit | 67c18d6b5188a0497f6912a73d964c763d2f8f84 (patch) | |
| tree | d32888c6b13589c2718fc6673f29acf2bb546c38 /src/gpu/gl | |
| parent | 41398f430dc501d450e04540a83b6aa5baf87cd7 (diff) | |
Continue making Ganesh use absolute texture coordinates - take 2
The idea here is that the GrCoordTransform will actually hold a GrTextureProxy (rather than a GrTexture) and then, in GrGLSLPrimitiveProcessor::GetTransformMatrix, use the instantiated width & height (when uploading the transform matrix)
Relanding of: https://skia-review.googlesource.com/c/6977/
Change-Id: Ibc9b9e354f7fc23b1a6e6e4fe7c9fe3cef771c02
Reviewed-on: https://skia-review.googlesource.com/7265
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/gl')
| -rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 3 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLGpu.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index 0e5d8563a4..b9b87a16b5 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -4706,7 +4706,8 @@ GrGLAttribArrayState* GrGLGpu::HWVertexArrayState::bindInternalVertexArray(GrGLG } bool GrGLGpu::onMakeCopyForTextureParams(GrTexture* texture, const GrSamplerParams& textureParams, - GrTextureProducer::CopyParams* copyParams) const { + GrTextureProducer::CopyParams* copyParams, + SkScalar scaleAdjust[2]) const { if (textureParams.isTiled() || GrSamplerParams::kMipMap_FilterMode == textureParams.filterMode()) { GrGLTexture* glTexture = static_cast<GrGLTexture*>(texture); diff --git a/src/gpu/gl/GrGLGpu.h b/src/gpu/gl/GrGLGpu.h index c9c3fc4409..fdc2ebbfa9 100644 --- a/src/gpu/gl/GrGLGpu.h +++ b/src/gpu/gl/GrGLGpu.h @@ -187,7 +187,8 @@ private: const SkTArray<GrMipLevel>& texels); bool onMakeCopyForTextureParams(GrTexture*, const GrSamplerParams&, - GrTextureProducer::CopyParams*) const override; + GrTextureProducer::CopyParams*, + SkScalar scaleAdjust[2]) const override; // Checks whether glReadPixels can be called to get pixel values in readConfig from the // render target. |