code style

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

1 files changed, 1 insertions, 245 deletions

diff --git a/src/core/SkGraphics.cpp b/src/core/SkGraphics.cpp
index 40f0ea3389..863850414f 100644
--- a/src/core/SkGraphics.cpp
+++ b/src/core/SkGraphics.cpp
@@ -37,48 +37,8 @@
 #include "SkUtils.h"
 #include "SkXfermode.h"
 
-#if 0
-
-#define SK_SORT_TEMPLATE_TYPE       int
-#define SK_SORT_TEMPLATE_NAME       sort_int
-#define SK_SORT_TEMPLATE_CMP(a, b)   ((a) - (b))
-#include "SkSortTemplate.h"
-
-#define SK_SORT_TEMPLATE_TYPE       int*
-#define SK_SORT_TEMPLATE_NAME       sort_intptr
-#define SK_SORT_TEMPLATE_CMP(a, b)   (*(a) - *(b))
-#include "SkSortTemplate.h"
-
-static void test_sort()
-{
-    int array[] = { 4, 3, 7, 5, 2, 5, 1, 2, 9, 6, 7, 4, 5, 3, 1, 0 };
-    int* ptr[SK_ARRAY_COUNT(array)];
-    int i, N = SK_ARRAY_COUNT(array) - 1;
-
-    for (i = 0; i < N; i++)
-        printf(" %d", array[i]);
-    printf("\n");
-    
-    for (i = 0; i < N; i++)
-        ptr[i] = &array[i];
-    sort_intptr(ptr, N);
-    for (i = 0; i < N; i++)
-        printf(" %d", *ptr[i]);
-    printf("\n");
-
-    sort_int(array, N);
-    for (i = 0; i < N; i++)
-        printf(" %d", array[i]);
-    printf("\n");
-
-}
-#endif
-
-#define SPEED_TESTx
-
 #define typesizeline(type)  { #type , sizeof(type) }
 
-
 #ifdef BUILD_EMBOSS_TABLE
     extern void SkEmbossMask_BuildTable();
 #endif
@@ -87,65 +47,6 @@ static void test_sort()
     extern void SkRadialGradient_BuildTable();
 #endif
 
-#define BIG_LOOP_COUNT  1000000
-#define TEXT_LOOP_COUNT 1000
-
-#ifdef SPEED_TEST
-static int test_s64(int i)
-{
-    Sk64    a, b, c;
-    
-    c.set(0);
-    a.set(i);
-    b.setMul(i, i);
-    a.add(b);
-    a.add(c);
-    return c.getFixed();
-}
-
-static int test_native_64(int i)
-{
-    int16_t    a, b, c;
-    
-    c = 0;
-    a = i;
-    b = (int64_t)i * i;
-    a += b;
-    a += c;
-    return (int)(c >> 16);
-}
-
-static void test_drawText(SkBitmap::Config config, SkColor color)
-{
-    SkBitmap    bm;
-    
-    bm.setConfig(config, 320, 240);
-    bm.allocPixels();
-    
-    SkCanvas canvas(bm);
-    SkPaint  paint;
-    
-    paint.setAntiAlias(true);
-    paint.setTextSize(SkIntToScalar(12));
-    paint.setColor(color);
-    
-    SkScalar x = SkIntToScalar(20);
-    SkScalar y = SkIntToScalar(100);
-    const char* text = "Hamburgefons";
-    size_t      len = strlen(text);
-
-    // draw once to populate the cache
-    canvas.drawText(text, len, x, y, paint);
-    
-    SkMSec now = SkTime::GetMSecs();
-    for (int i = 0; i < TEXT_LOOP_COUNT; i++)
-        canvas.drawText(text, len, x, y, paint);
-    printf("----------- Config: %d, Color=%x, CPS = %g\n", config, color,
-           len * TEXT_LOOP_COUNT * 1000.0 / (SkTime::GetMSecs() - now));
-}
-
-#endif
-
 void SkGraphics::Init() {
     SkGlobals::Init();
 
@@ -210,154 +111,9 @@ void SkGraphics::Init() {
     }
 
 #endif
-
-    if (false)  // test asm fixmul
-    {
-        int j;
-        SkMSec now = SkTime::GetMSecs();
-        for (j = 0; j < BIG_LOOP_COUNT; j++) {
-            (void)SkFixedMul_portable(0x8000, 0x150000);
-        }
-        SkMSec now2 = SkTime::GetMSecs();
-        printf("-------- SkFixedMul_portable = %d\n", now2 - now);
-
-        for (j = 0; j < BIG_LOOP_COUNT; j++) {
-            (void)SkFixedMul(0x8000, 0x150000);
-        }
-        printf("-------- SkFixedMul = %d\n", SkTime::GetMSecs() - now2);
-
-        SkRandom rand;
-        for (j = 0; j < 10000; j++) {
-            SkFixed a = rand.nextS() >> 8;
-            SkFixed b = rand.nextS() >> 8;
-            SkFixed c1 = SkFixedMul_portable(a, b);
-            SkFixed c2 = SkFixedMul(a, b);
-            if (SkAbs32(c1 - c2) > 1)
-                printf("------ FixMul disagreement: (%x %x) slow=%x fast=%x\n", a, b, c1, c2);
-        }
-    }
-    
-    if (false)  // test asm fractmul
-    {
-        int j;
-        SkMSec now = SkTime::GetMSecs();
-        for (j = 0; j < BIG_LOOP_COUNT; j++) {
-            (void)SkFractMul_portable(0x800000, 0x1500000);
-        }
-        SkMSec now2 = SkTime::GetMSecs();
-        printf("-------- SkFractMul_portable = %d\n", now2 - now);
-
-        for (j = 0; j < BIG_LOOP_COUNT; j++) {
-            (void)SkFractMul(0x800000, 0x1500000);
-        }
-        printf("-------- SkFractMul = %d\n", SkTime::GetMSecs() - now2);
-
-        SkRandom rand;
-        for (j = 0; j < 10000; j++) {
-            SkFixed a = rand.nextS() >> 1;
-            SkFixed b = rand.nextS() >> 1;
-            SkFixed c1 = SkFractMul_portable(a, b);
-            SkFixed c2 = SkFractMul(a, b);
-            if (SkAbs32(c1 - c2) > 1)
-                printf("------ FractMul disagreement: (%x %x) slow=%x fast=%x\n", a, b, c1, c2);
-        }
-    }
-    
-    if (false)   // test asm clz
-    {
-        int j;
-        SkMSec now = SkTime::GetMSecs();
-        for (j = 0; j < BIG_LOOP_COUNT; j++) {
-            (void)SkCLZ_portable(now);
-        }
-        SkMSec now2 = SkTime::GetMSecs();
-        printf("-------- SkCLZ_portable = %d\n", now2 - now);
-
-        for (j = 0; j < BIG_LOOP_COUNT; j++) {
-            (void)SkCLZ(now);
-        }
-        printf("-------- SkCLZ = %d\n", SkTime::GetMSecs() - now2);
-
-        SkRandom rand;
-        for (j = 0; j < 10000; j++) {
-            uint32_t a = rand.nextU();
-            int c1 = SkCLZ_portable(a);
-            int c2 = SkCLZ(a);
-            if (c1 != c2)
-                printf("------ CLZ disagreement: (%x) slow=%x fast=%x\n", a, c1, c2);
-        }
-    }
-    
-#ifdef SPEED_TEST
-    if (false) {
-        int i;
-        int (*proc)(int);
-
-        static const struct {
-            int (*proc)(int);
-            const char* name;
-        } gList[] = {
-            { test_s64, "Sk64" },
-            { test_native_64, "native" }
-        };
-
-        for (size_t j = 0; j < SK_ARRAY_COUNT(gList); j++) {
-            SkMSec now = SkTime::GetMSecs();
-            proc = gList[j].proc;
-            for (i = 0; i < BIG_LOOP_COUNT; i++) {
-                proc(i);
-            }
-            printf("-------- %s = %d\n", gList[j].name, SkTime::GetMSecs() - now);
-        }
-    }
-#endif
-
-    if (false) {
-        size_t i, size = 480;
-        char* buffer = (char*)sk_malloc_throw(size);
-        uint16_t* buffer16 = (uint16_t*)buffer;
-        uint32_t* buffer32 = (uint32_t*)buffer;
-
-        SkMSec now = SkTime::GetMSecs();
-        for (i = 0; i < 100000; i++) {
-            sk_memset16(buffer16, (uint16_t)i, size >> 1);
-        }
-        SkMSec now2 = SkTime::GetMSecs();
-        for (i = 0; i < 100000; i++) {
-            sk_memset16_portable(buffer16, (uint16_t)i, size >> 1);
-        }
-        SkMSec now3 = SkTime::GetMSecs();
-        printf("----------- memset16: native %d, portable %d\n", now2 - now, now3 - now2);
-
-        now = SkTime::GetMSecs();
-        for (i = 0; i < 100000; i++) {
-            sk_memset32(buffer32, i, size >> 2);
-        }
-        now2 = SkTime::GetMSecs();
-        for (i = 0; i < 100000; i++) {
-            sk_memset32_portable(buffer32, i, size >> 2);
-        }
-        now3 = SkTime::GetMSecs();
-        printf("----------- memset32: native %d, portable %d\n", now2 - now, now3 - now2);
-        
-        sk_free(buffer);
-    }
-    
-#ifdef SPEED_TEST
-    if (false) {
-        test_drawText(SkBitmap::kARGB_8888_Config, SK_ColorBLACK);
-        test_drawText(SkBitmap::kARGB_8888_Config, SK_ColorRED);
-        test_drawText(SkBitmap::kRGB_565_Config, SK_ColorBLACK);
-        test_drawText(SkBitmap::kRGB_565_Config, SK_ColorRED);
-    }
-#endif
-    
-//    if (true) {
-//        test_sort();
-//    }
 }
 
-////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
 
 #include "SkGlyphCache.h"