diff options
| author |  senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-05-04 20:12:01 +0000 |
|---|---|---|
| committer | senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-05-04 20:12:01 +0000 |
| commit | 99c2a8b362add1750ecba9f9c3f98abb01824c9b (patch) | |
| tree | a6fd9ae11bcc39fe619e0fefea4b610a520c4e98 | |
| parent | c1587e0f45ae662bdc933148114457ba7f6af084 (diff) | |
SampleApp builds skia on Linux with BGRA pixel order, but Ganesh's SampleApp
assumes GL_RGBA texture format on all platforms except Windows (where it uses
GL_BGRA), so texture colours come out wrong. As a temporary fix, do on Linux
what we do on Windows, and assume GL_BGRA. (This should be made more general
later, and the assumption of matching formats between Skia and Ganesh removed.)
Review URL: http://codereview.appspot.com/4474046/
git-svn-id: http://skia.googlecode.com/svn/trunk@1247 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gpu/include/GrGLConfig.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gpu/include/GrGLConfig.h b/gpu/include/GrGLConfig.h index 18cc049010..b4ca78cee5 100644 --- a/gpu/include/GrGLConfig.h +++ b/gpu/include/GrGLConfig.h @@ -133,7 +133,7 @@ // Pick a pixel config for 32bit bitmaps. Our default is GL_RGBA (except on // Windows where we match GDI's order). #ifndef GR_GL_32BPP_COLOR_FORMAT - #if GR_WIN32_BUILD + #if GR_WIN32_BUILD || GR_LINUX_BUILD #define GR_GL_32BPP_COLOR_FORMAT GR_GL_BGRA #else #define GR_GL_32BPP_COLOR_FORMAT GR_GL_RGBA |