| Index: src/gpu/gl/GrGLGpu.cpp
|
| diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
|
| index 49b8f3acb806855b78da7351589433198900f6fe..e0b7d4aca5e2561df0249a8e81b4e41c3b5a50e4 100644
|
| --- a/src/gpu/gl/GrGLGpu.cpp
|
| +++ b/src/gpu/gl/GrGLGpu.cpp
|
| @@ -2485,11 +2485,11 @@ static GrGLenum get_component_enum_from_char(char component) {
|
| /** If texture swizzling is available using tex parameters then it is preferred over mangling
|
| the generated shader code. This potentially allows greater reuse of cached shaders. */
|
| static void get_tex_param_swizzle(GrPixelConfig config,
|
| - const GrGLSLCaps& caps,
|
| + const GrGLCaps& caps,
|
| GrGLenum* glSwizzle) {
|
| - const char* swizzle = caps.getSwizzleMap(config);
|
| + const GrSwizzle& swizzle = caps.configSwizzle(config);
|
| for (int i = 0; i < 4; ++i) {
|
| - glSwizzle[i] = get_component_enum_from_char(swizzle[i]);
|
| + glSwizzle[i] = get_component_enum_from_char(swizzle.c_str()[i]);
|
| }
|
| }
|
|
|
| @@ -2558,7 +2558,7 @@ void GrGLGpu::bindTexture(int unitIdx, const GrTextureParams& params, GrGLTextur
|
|
|
| newTexParams.fWrapS = tile_to_gl_wrap(params.getTileModeX());
|
| newTexParams.fWrapT = tile_to_gl_wrap(params.getTileModeY());
|
| - get_tex_param_swizzle(texture->config(), *this->glCaps().glslCaps(), newTexParams.fSwizzleRGBA);
|
| + get_tex_param_swizzle(texture->config(), this->glCaps(), newTexParams.fSwizzleRGBA);
|
| if (setAll || newTexParams.fMagFilter != oldTexParams.fMagFilter) {
|
| this->setTextureUnit(unitIdx);
|
| GL_CALL(TexParameteri(target, GR_GL_TEXTURE_MAG_FILTER, newTexParams.fMagFilter));
|
| @@ -2575,7 +2575,7 @@ void GrGLGpu::bindTexture(int unitIdx, const GrTextureParams& params, GrGLTextur
|
| this->setTextureUnit(unitIdx);
|
| GL_CALL(TexParameteri(target, GR_GL_TEXTURE_WRAP_T, newTexParams.fWrapT));
|
| }
|
| - if (!this->glCaps().glslCaps()->mustSwizzleInShader() &&
|
| + if (this->glCaps().textureSwizzleSupport() &&
|
| (setAll || memcmp(newTexParams.fSwizzleRGBA,
|
| oldTexParams.fSwizzleRGBA,
|
| sizeof(newTexParams.fSwizzleRGBA)))) {
|
|
|