AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

experimental faster sort

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@3872 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@google.com 2012-05-09 12:07:31 +00:00
parent 331e2dc8eb
commit 0a71a9cc37
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/SkScan_Path.cpp
View File

@ -15,6 +15,10 @@
#include "SkRasterClip.h" #include "SkRasterClip.h"
#include "SkRegion.h" #include "SkRegion.h"
#include "SkTemplates.h" #include "SkTemplates.h"
#include "SkTSort.h"
// undefine this to get faster inline sort
#define SK_USE_STD_SORT_FOR_EDGES
#define kEDGE_HEAD_Y SK_MinS32 #define kEDGE_HEAD_Y SK_MinS32
#define kEDGE_TAIL_Y SK_MaxS32 #define kEDGE_TAIL_Y SK_MaxS32
@ -374,6 +378,7 @@ static void PrePostInverseBlitterProc(SkBlitter* blitter, int y, bool isStart) {
#pragma warning ( pop ) #pragma warning ( pop )
#endif #endif
#ifdef SK_USE_STD_SORT_FOR_EDGES
extern "C" { extern "C" {
static int edge_compare(const void* a, const void* b) { static int edge_compare(const void* a, const void* b) {
const SkEdge* edgea = *(const SkEdge**)a; const SkEdge* edgea = *(const SkEdge**)a;
@ -393,9 +398,26 @@ extern "C" {
return (valuea < valueb) ? -1 : (valuea > valueb); return (valuea < valueb) ? -1 : (valuea > valueb);
} }
} }
#else
static bool operator<(const SkEdge& a, const SkEdge& b) {
int valuea = a.fFirstY;
int valueb = b.fFirstY;
if (valuea == valueb) {
valuea = a.fX;
valueb = b.fX;
}
return valuea < valueb;
}
#endif
static SkEdge* sort_edges(SkEdge* list[], int count, SkEdge** last) { static SkEdge* sort_edges(SkEdge* list[], int count, SkEdge** last) {
#ifdef SK_USE_STD_SORT_FOR_EDGES
qsort(list, count, sizeof(SkEdge*), edge_compare); qsort(list, count, sizeof(SkEdge*), edge_compare);
#else
SkTQSort(list, list + count - 1);
#endif
// now make the edges linked in sorted order // now make the edges linked in sorted order
for (int i = 1; i < count; i++) { for (int i = 1; i < count; i++) {