commit c43649962221c348d656d425a3fa9b29c78231d4
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Nov 07 15:54:49 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Nov 07 15:54:49 2011 +0000
tree bf88793470f20fa99c9fb51971b90b5510a1a880
parent 6ff82553df07ec9502bfe5b4a97a2c2aaf15e39f

[GPU] Add explicit byte order and PM vs. UPM 8888 configs

Review URL: http://codereview.appspot.com/5347042/



git-svn-id: http://skia.googlecode.com/svn/trunk@2618 2bbb7eff-a529-9590-31e7-b0007b416f81

gm/gmmain.cpp

diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index f437906..99b1584 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -648,7 +648,7 @@
         gGrContext = GrContext::Create(kOpenGL_Shaders_GrEngine, ctx);
         if (NULL != gGrContext) {
             GrPlatformRenderTargetDesc desc;
-            desc.fConfig = kRGBA_8888_GrPixelConfig;
+            desc.fConfig = kSkia8888_PM_GrPixelConfig;
             desc.fWidth = maxW;
             desc.fHeight = maxH;
             desc.fStencilBits = 8;

gm/texdata.cpp

diff --git a/gm/texdata.cpp b/gm/texdata.cpp
index e3547af..a55bdeb 100644
--- a/gm/texdata.cpp
+++ b/gm/texdata.cpp
@@ -79,7 +79,7 @@
                 // use RT flag bit because in GL it makes the texture be bottom-up
                 desc.fFlags     = i ? kRenderTarget_GrTextureFlagBit :
                                       kNone_GrTextureFlags;
-                desc.fFormat    = kRGBA_8888_GrPixelConfig;
+                desc.fFormat    = kSkia8888_PM_GrPixelConfig;
                 desc.fWidth     = 2 * S;
                 desc.fHeight    = 2 * S;
                 GrTexture* texture =