nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cache results of offset/shift functions so we don't do 6 function calls per pixel when reducing color depth

Browse source
This commit is contained in:
Derek Foreman 2014-04-10 15:12:56 -05:00 committed by Mikael Magnusson
parent 33caeb559e
commit 540c53eeab
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
obrender/color.c
View file

@ -126,22 +126,26 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
{ {
gint r, g, b; gint r, g, b;
gint x,y; gint x,y;
gint ro = RrRedOffset(inst);
gint bo = RrBlueOffset(inst);
gint go = RrGreenOffset(inst);
gint rs = RrRedShift(inst);
gint bs = RrBlueShift(inst);
gint gs = RrGreenShift(inst);
RrPixel32 *p32 = (RrPixel32 *) im->data; RrPixel32 *p32 = (RrPixel32 *) im->data;
RrPixel16 *p16 = (RrPixel16 *) im->data; RrPixel16 *p16 = (RrPixel16 *) im->data;
RrPixel8 *p8 = (RrPixel8 *) im->data; RrPixel8 *p8 = (RrPixel8 *) im->data;
switch (im->bits_per_pixel) { switch (im->bits_per_pixel) {
case 32: case 32:
if ((RrRedOffset(inst) != RrDefaultRedOffset) || if ((ro != RrDefaultRedOffset) ||
(RrBlueOffset(inst) != RrDefaultBlueOffset) || (bo != RrDefaultBlueOffset) ||
(RrGreenOffset(inst) != RrDefaultGreenOffset)) { (go != RrDefaultGreenOffset)) {
for (y = 0; y < im->height; y++) { for (y = 0; y < im->height; y++) {
for (x = 0; x < im->width; x++) { for (x = 0; x < im->width; x++) {
r = (data[x] >> RrDefaultRedOffset) & 0xFF; r = (data[x] >> RrDefaultRedOffset) & 0xFF;
g = (data[x] >> RrDefaultGreenOffset) & 0xFF; g = (data[x] >> RrDefaultGreenOffset) & 0xFF;
b = (data[x] >> RrDefaultBlueOffset) & 0xFF; b = (data[x] >> RrDefaultBlueOffset) & 0xFF;
p32[x] = (r << RrRedOffset(inst)) p32[x] = (r << ro) + (g << go) + (b << bo);
+ (g << RrGreenOffset(inst))
+ (b << RrBlueOffset(inst));
} }
data += im->width; data += im->width;
p32 += im->width; p32 += im->width;
@ -152,9 +156,9 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
{ {
/* reverse the ordering, shifting left 16bit should be the first byte /* reverse the ordering, shifting left 16bit should be the first byte
out of three, etc */ out of three, etc */
const guint roff = (16 - RrRedOffset(inst)) / 8; const guint roff = (16 - ro) / 8;
const guint goff = (16 - RrGreenOffset(inst)) / 8; const guint goff = (16 - go) / 8;
const guint boff = (16 - RrBlueOffset(inst)) / 8; const guint boff = (16 - bo) / 8;
gint outx; gint outx;
for (y = 0; y < im->height; y++) { for (y = 0; y < im->height; y++) {
for (x = 0, outx = 0; x < im->width; x++, outx += 3) { for (x = 0, outx = 0; x < im->width; x++, outx += 3) {
@ -174,14 +178,12 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
for (y = 0; y < im->height; y++) { for (y = 0; y < im->height; y++) {
for (x = 0; x < im->width; x++) { for (x = 0; x < im->width; x++) {
r = (data[x] >> RrDefaultRedOffset) & 0xFF; r = (data[x] >> RrDefaultRedOffset) & 0xFF;
r = r >> RrRedShift(inst); r = r >> rs;
g = (data[x] >> RrDefaultGreenOffset) & 0xFF; g = (data[x] >> RrDefaultGreenOffset) & 0xFF;
g = g >> RrGreenShift(inst); g = g >> gs;
b = (data[x] >> RrDefaultBlueOffset) & 0xFF; b = (data[x] >> RrDefaultBlueOffset) & 0xFF;
b = b >> RrBlueShift(inst); b = b >> bs;
p16[x] = (r << RrRedOffset(inst)) p16[x] = (r << ro) + (g << go) + (b << bo);
+ (g << RrGreenOffset(inst))
+ (b << RrBlueOffset(inst));
} }
data += im->width; data += im->width;
p16 += im->bytes_per_line/2; p16 += im->bytes_per_line/2;
@ -192,14 +194,12 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
for (y = 0; y < im->height; y++) { for (y = 0; y < im->height; y++) {
for (x = 0; x < im->width; x++) { for (x = 0; x < im->width; x++) {
r = (data[x] >> RrDefaultRedOffset) & 0xFF; r = (data[x] >> RrDefaultRedOffset) & 0xFF;
r = r >> RrRedShift(inst); r = r >> rs;
g = (data[x] >> RrDefaultGreenOffset) & 0xFF; g = (data[x] >> RrDefaultGreenOffset) & 0xFF;
g = g >> RrGreenShift(inst); g = g >> gs;
b = (data[x] >> RrDefaultBlueOffset) & 0xFF; b = (data[x] >> RrDefaultBlueOffset) & 0xFF;
b = b >> RrBlueShift(inst); b = b >> bs;
p8[x] = (r << RrRedOffset(inst)) p8[x] = (r << ro) + (g << go) + (b << bo);
+ (g << RrGreenOffset(inst))
+ (b << RrBlueOffset(inst));
} }
data += im->width; data += im->width;
p8 += im->bytes_per_line; p8 += im->bytes_per_line;