zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Split the colormatching portion of getclosestcol_lim into getclosestcol_nocache_lim in case speed is desired when processing an image with mostly unique colors.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5376 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2015-10-10 06:57:32 +00:00
parent 07a2ccd79b
commit a0018555ee
2 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
polymer/eduke32/build/include/colmatch.h
View file

@ -10,12 +10,17 @@ extern void initfastcolorlookup_palette(uint8_t const * pal) ATTRIBUTE((nonnull(
extern void initfastcolorlookup_gridvectors(void); extern void initfastcolorlookup_gridvectors(void);
extern int32_t getclosestcol_lim(int32_t r, int32_t g, int32_t b, int32_t lastokcol); extern int32_t getclosestcol_lim(int32_t r, int32_t g, int32_t b, int32_t lastokcol);
extern int32_t getclosestcol_nocache_lim(int32_t r, int32_t g, int32_t b, int32_t lastokcol);
extern void getclosestcol_flush(void); extern void getclosestcol_flush(void);
FORCE_INLINE int32_t getclosestcol(int32_t r, int32_t g, int32_t b) FORCE_INLINE int32_t getclosestcol(int32_t r, int32_t g, int32_t b)
{ {
return getclosestcol_lim(r, g, b, 255); return getclosestcol_lim(r, g, b, 255);
} }
FORCE_INLINE int32_t getclosestcol_nocache(int32_t r, int32_t g, int32_t b)
{
return getclosestcol_nocache_lim(r, g, b, 255);
}
#ifdef __cplusplus #ifdef __cplusplus
} }

33
polymer/eduke32/build/src/colmatch.c
View file

@ -82,13 +82,8 @@ void getclosestcol_flush(void)
// Finds a color index in [0 .. lastokcol] closest to (r, g, b). // Finds a color index in [0 .. lastokcol] closest to (r, g, b).
// <lastokcol> must be in [0 .. 255]. // <lastokcol> must be in [0 .. 255].
int32_t getclosestcol_lim(int32_t r, int32_t g, int32_t b, int32_t lastokcol) int32_t getclosestcol_lim(int32_t const r, int32_t const g, int32_t const b, int32_t const lastokcol)
{ {
const int j = (r>>FASTPALRIGHTSHIFT)*FASTPALGRIDSIZ*FASTPALGRIDSIZ
+ (g>>FASTPALRIGHTSHIFT)*FASTPALGRIDSIZ + (b>>FASTPALRIGHTSHIFT)
+ FASTPALGRIDSIZ*FASTPALGRIDSIZ
+ FASTPALGRIDSIZ + 1;
#ifdef DEBUGGINGAIDS #ifdef DEBUGGINGAIDS
Bassert(lastokcol >= 0 && lastokcol <= 255); Bassert(lastokcol >= 0 && lastokcol <= 255);
#endif #endif
@ -122,13 +117,27 @@ int32_t getclosestcol_lim(int32_t r, int32_t g, int32_t b, int32_t lastokcol)
return getclosestcol_results[mindist]>>24; return getclosestcol_results[mindist]>>24;
skip: skip:
getclosestcol_results[numclosestcolresults & (COLRESULTSIZ-1)] = col; i = getclosestcol_nocache_lim(r, g, b, lastokcol);
getclosestcol_results[numclosestcolresults++ & (COLRESULTSIZ-1)] = col | (i << 24);
return i;
}
int32_t getclosestcol_nocache_lim(int32_t r, int32_t g, int32_t b, int32_t const lastokcol)
{
#ifdef DEBUGGINGAIDS
Bassert(lastokcol >= 0 && lastokcol <= 255);
#endif
int const j = (r>>FASTPALRIGHTSHIFT)*FASTPALGRIDSIZ*FASTPALGRIDSIZ
+ (g>>FASTPALRIGHTSHIFT)*FASTPALGRIDSIZ + (b>>FASTPALRIGHTSHIFT)
+ FASTPALGRIDSIZ*FASTPALGRIDSIZ
+ FASTPALGRIDSIZ + 1;
int const minrdist = rdist[coldist[r&FASTPALCOLDISTMASK]+FASTPALCOLDEPTH]; int const minrdist = rdist[coldist[r&FASTPALCOLDISTMASK]+FASTPALCOLDEPTH];
int const mingdist = gdist[coldist[g&FASTPALCOLDISTMASK]+FASTPALCOLDEPTH]; int const mingdist = gdist[coldist[g&FASTPALCOLDISTMASK]+FASTPALCOLDEPTH];
int const minbdist = bdist[coldist[b&FASTPALCOLDISTMASK]+FASTPALCOLDEPTH]; int const minbdist = bdist[coldist[b&FASTPALCOLDISTMASK]+FASTPALCOLDEPTH];
mindist = min(minrdist, mingdist); int mindist = min(minrdist, mingdist);
mindist = min(mindist, minbdist) + 1; mindist = min(mindist, minbdist) + 1;
r = FASTPALCOLDEPTH-r, g = FASTPALCOLDEPTH-g, b = FASTPALCOLDEPTH-b; r = FASTPALCOLDEPTH-r, g = FASTPALCOLDEPTH-g, b = FASTPALCOLDEPTH-b;
@ -137,7 +146,7 @@ skip:
for (int k=26; k>=0; k--) for (int k=26; k>=0; k--)
{ {
i = colscan[k]+j; int i = colscan[k]+j;
if ((colhere[i>>3]&pow2char(i&7)) == 0) if ((colhere[i>>3]&pow2char(i&7)) == 0)
continue; continue;
@ -160,14 +169,11 @@ skip:
} }
if (retcol >= 0) if (retcol >= 0)
{
getclosestcol_results[numclosestcolresults++ & (COLRESULTSIZ-1)] |= retcol<<24;
return retcol; return retcol;
}
mindist = INT32_MAX; mindist = INT32_MAX;
for (i = 0; i < lastokcol; ++i) for (int i = 0; i < lastokcol; ++i)
{ {
char const * const pal1 = (char *)&colmatch_palette[i*3]; char const * const pal1 = (char *)&colmatch_palette[i*3];
int dist = gdist[pal1[1]+g]; int dist = gdist[pal1[1]+g];
@ -180,6 +186,5 @@ skip:
retcol = i; retcol = i;
} }
getclosestcol_results[numclosestcolresults++ & (COLRESULTSIZ-1)] |= retcol<<24;
return retcol; return retcol;
} }