diff options
| author | egraether@chromium.org <egraether@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-15 16:39:31 +0000 |
|---|---|---|
| committer | egraether@chromium.org <egraether@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-15 16:39:31 +0000 |
| commit | 948cd822948b8e77dd5f013b849f79411a75f6ea (patch) | |
| tree | 6d5f6ddd0d069f9e4f2050d074ffd74705e784e0 | |
| parent | 160179a7db8979aa67691c167704069ac8f77fa5 (diff) | |
| download | chromium_src-948cd822948b8e77dd5f013b849f79411a75f6ea.zip chromium_src-948cd822948b8e77dd5f013b849f79411a75f6ea.tar.gz chromium_src-948cd822948b8e77dd5f013b849f79411a75f6ea.tar.bz2 | |
cc: fix HudLayer's RGB ordering on Android
This change deactivates the RGBA to BGRA swizzling on the HudLayer for builds using RGBA shaders (Android).
BUG=169345
Review URL: https://chromiumcodereview.appspot.com/11885022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176919 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | cc/heads_up_display_layer_impl.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cc/heads_up_display_layer_impl.cc b/cc/heads_up_display_layer_impl.cc index d15893a..9aa1e0c 100644 --- a/cc/heads_up_display_layer_impl.cc +++ b/cc/heads_up_display_layer_impl.cc @@ -29,6 +29,8 @@ namespace cc { static inline SkPaint createPaint() { + SkPaint paint; +#if (SK_R32_SHIFT || SK_B32_SHIFT != 16) // The SkCanvas is in RGBA but the shader is expecting BGRA, so we need to // swizzle our colors when drawing to the SkCanvas. SkColorMatrix swizzleMatrix; @@ -39,11 +41,10 @@ static inline SkPaint createPaint() swizzleMatrix.fMat[2 + 5 * 0] = 1; swizzleMatrix.fMat[3 + 5 * 3] = 1; - SkPaint paint; skia::RefPtr<SkColorMatrixFilter> filter = skia::AdoptRef(new SkColorMatrixFilter(swizzleMatrix)); paint.setColorFilter(filter.get()); - +#endif return paint; } |