diff options
author | 2015-09-30 12:21:45 -0700 | |
---|---|---|
committer | 2015-09-30 12:21:45 -0700 | |
commit | 856e9d921462136da8562f8f122d42e114cd4710 (patch) | |
tree | 9ebc00a92f5aacdd54d00c528fa3ed19f48f6fd6 /src/gpu/gl/GrGLGpu.cpp | |
parent | 8a6697af95b340aad6dee7e6228048fa305c1e59 (diff) |
Revert[4] of add ImageShader, sharing code with its Bitmap cousin
Now with GrTextureMaker subclasses to handle npot usage.
This reverts commit 476506d070dbc59b158acc1a00c34bff95ab2968.
BUG=skia:
Review URL: https://codereview.chromium.org/1370223002
Diffstat (limited to 'src/gpu/gl/GrGLGpu.cpp')
-rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index cb12fefc32..5388387c3b 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -2246,6 +2246,18 @@ static inline GrGLenum tile_to_gl_wrap(SkShader::TileMode tm) { void GrGLGpu::bindTexture(int unitIdx, const GrTextureParams& params, GrGLTexture* texture) { SkASSERT(texture); +#ifdef SK_DEBUG + if (!this->caps()->npotTextureTileSupport()) { + const bool tileX = SkShader::kClamp_TileMode != params.getTileModeX(); + const bool tileY = SkShader::kClamp_TileMode != params.getTileModeY(); + if (tileX || tileY) { + const int w = texture->width(); + const int h = texture->height(); + SkASSERT(SkIsPow2(w) && SkIsPow2(h)); + } + } +#endif + // If we created a rt/tex and rendered to it without using a texture and now we're texturing // from the rt it will still be the last bound texture, but it needs resolving. So keep this // out of the "last != next" check. |