diff options
| author | 2015-07-14 16:57:58 +0000 | |
|---|---|---|
| committer | 2015-07-14 16:58:01 +0000 | |
| commit | 941bcedb4c03832cd54225217697c7b8cba6e07c (patch) | |
| tree | ebb470d2e2b3099a1a71cae94b3b5dca9619b9db /libs/hwui/SkiaShader.cpp | |
| parent | 10633c96b55d13f05304b758b01be48035adece3 (diff) | |
| parent | e310f83d591dc3fb7bd5c684239481a586f00662 (diff) | |
Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev
Diffstat (limited to 'libs/hwui/SkiaShader.cpp')
| -rw-r--r-- | libs/hwui/SkiaShader.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/hwui/SkiaShader.cpp b/libs/hwui/SkiaShader.cpp index 2cfb9e1dc8c1..a2aa2d103048 100644 --- a/libs/hwui/SkiaShader.cpp +++ b/libs/hwui/SkiaShader.cpp @@ -370,7 +370,11 @@ void SkiaShader::store(Caches& caches, const SkShader& shader, const Matrix4& mo if (tryStoreLayer(caches, shader, modelViewMatrix, textureUnit, description, &outData->layerData)) { outData->skiaShaderType = kLayer_SkiaShaderType; + return; } + + // Unknown/unsupported type, so explicitly ignore shader + outData->skiaShaderType = kNone_SkiaShaderType; } void SkiaShader::apply(Caches& caches, const SkiaShaderData& data) { |