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/GrGpu.cpp | |
| 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/GrGpu.cpp')
| -rw-r--r-- | src/gpu/GrGpu.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp index 3538b8042f..4880f6c742 100644 --- a/src/gpu/GrGpu.cpp +++ b/src/gpu/GrGpu.cpp @@ -58,12 +58,16 @@ void GrGpu::disconnect(DisconnectType) {} //////////////////////////////////////////////////////////////////////////////// bool GrGpu::makeCopyForTextureParams(int width, int height, const GrSamplerParams& textureParams, - GrTextureProducer::CopyParams* copyParams) const { + GrTextureProducer::CopyParams* copyParams, + SkScalar scaleAdjust[2]) const { const GrCaps& caps = *this->caps(); if (textureParams.isTiled() && !caps.npotTextureTileSupport() && (!SkIsPow2(width) || !SkIsPow2(height))) { + SkASSERT(scaleAdjust); copyParams->fWidth = GrNextPow2(width); copyParams->fHeight = GrNextPow2(height); + scaleAdjust[0] = ((SkScalar) copyParams->fWidth) / width; + scaleAdjust[1] = ((SkScalar) copyParams->fHeight) / height; switch (textureParams.filterMode()) { case GrSamplerParams::kNone_FilterMode: copyParams->fFilter = GrSamplerParams::kNone_FilterMode; |