sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Image buffer rectangle operation optimization: Remove a switch statement

Browse Source 
outside of loop and remove a function call. Should give a little speedup when
painting inside the image editor.
This commit is contained in:
Antony Riakiotakis 2013-03-05 02:47:00 +00:00
parent 044955276a
commit 47c1570e68
2 changed files with 93 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/imbuf/IMB_imbuf_types.h
View File

@ -179,6 +179,7 @@ typedef struct ImBuf {
* Note that the lower 11 bits is used for storing custom flags * Note that the lower 11 bits is used for storing custom flags
*/ */
#define IB_CUSTOM_FLAGS_MASK 0x7ff #define IB_CUSTOM_FLAGS_MASK 0x7ff
#define IB_ALPHA_MASK 0xff
#define PNG (1 << 30) #define PNG (1 << 30)
#define TGA (1 << 28) #define TGA (1 << 28)

97
source/blender/imbuf/intern/rectop.c
View File

@ -121,6 +121,27 @@ static void blend_color_darken(char cp[3], const char cp1[3], const char cp2[3],
} }
} }
static void blend_color_erase_alpha(char cp[3], const char cp1[3], const char cp2[3], const int fac)
{
int temp = (cp1[3] - fac * cp2[3] / 255);
cp[0] = cp1[0];
cp[1] = cp1[1];
cp[2] = cp1[2];
cp[3] = (temp < 0) ? 0 : temp;
}
static void blend_color_add_alpha(char cp[3], const char cp1[3], const char cp2[3], const int fac)
{
int temp = (cp1[3] + fac * cp2[3] / 255);
cp[0] = cp1[0];
cp[1] = cp1[1];
cp[2] = cp1[2];
cp[3] = (temp < 0) ? 0 : temp;
}
unsigned int IMB_blend_color(unsigned int src1, unsigned int src2, int fac, IMB_BlendMode mode) unsigned int IMB_blend_color(unsigned int src1, unsigned int src2, int fac, IMB_BlendMode mode)
{ {
unsigned int dst; unsigned int dst;
@ -230,6 +251,26 @@ static void blend_color_darken_float(float cp[3], const float cp1[3], const floa
blend_color_mix_float(cp, cp1, cp2, fac); blend_color_mix_float(cp, cp1, cp2, fac);
} }
static void blend_color_erase_alpha_float(float cp[3], const float cp1[3], const float cp2[3], const float fac)
{
cp[0] = cp1[0];
cp[1] = cp1[1];
cp[2] = cp1[2];
cp[3] = (cp1[3] - fac * cp2[3]);
if (cp[3] < 0.0f) cp[3] = 0.0f;
}
static void blend_color_add_alpha_float(float cp[3], const float cp1[3], const float cp2[3], const float fac)
{
cp[0] = cp1[0];
cp[1] = cp1[1];
cp[2] = cp1[2];
cp[3] = (cp1[3] + fac * cp2[3]);
if (cp[3] < 0.0f) cp[3] = 0.0f;
}
void IMB_blend_color_float(float *dst, float *src1, float *src2, float fac, IMB_BlendMode mode) void IMB_blend_color_float(float *dst, float *src1, float *src2, float fac, IMB_BlendMode mode)
{ {
if (fac == 0) { if (fac == 0) {
@ -326,12 +367,18 @@ void IMB_rectcpy(struct ImBuf *dbuf, struct ImBuf *sbuf, int destx,
IMB_BLEND_COPY); IMB_BLEND_COPY);
} }
typedef void (*IMB_blend_func)(char *dst, const char *src1, const char *src2, const int fac);
typedef void (*IMB_blend_func_float)(float *dst, const float *src1, const float *src2, const float fac);
void IMB_rectblend(struct ImBuf *dbuf, struct ImBuf *sbuf, int destx, void IMB_rectblend(struct ImBuf *dbuf, struct ImBuf *sbuf, int destx,
int desty, int srcx, int srcy, int width, int height, IMB_BlendMode mode) int desty, int srcx, int srcy, int width, int height, IMB_BlendMode mode)
{ {
unsigned int *drect = NULL, *srect = NULL, *dr, *sr; unsigned int *drect = NULL, *srect = NULL, *dr, *sr;
float *drectf = NULL, *srectf = NULL, *drf, *srf; float *drectf = NULL, *srectf = NULL, *drf, *srf;
int do_float, do_char, srcskip, destskip, x; int do_float, do_char, srcskip, destskip, x;
IMB_blend_func func = NULL;
IMB_blend_func_float func_float = NULL;
if (dbuf == NULL) return; if (dbuf == NULL) return;
@ -427,13 +474,52 @@ void IMB_rectblend(struct ImBuf *dbuf, struct ImBuf *sbuf, int destx,
} }
} }
else { else {
switch (mode) {
case IMB_BLEND_MIX:
func = blend_color_mix;
func_float = blend_color_mix_float;
break;
case IMB_BLEND_ADD:
func = blend_color_add;
func_float = blend_color_add_float;
break;
case IMB_BLEND_SUB:
func = blend_color_sub;
func_float = blend_color_sub_float;
break;
case IMB_BLEND_MUL:
func = blend_color_mul;
func_float = blend_color_mul_float;
break;
case IMB_BLEND_LIGHTEN:
func = blend_color_lighten;
func_float = blend_color_lighten_float;
break;
case IMB_BLEND_DARKEN:
func = blend_color_darken;
func_float = blend_color_darken_float;
break;
case IMB_BLEND_ERASE_ALPHA:
func = blend_color_erase_alpha;
func_float = blend_color_erase_alpha_float;
break;
case IMB_BLEND_ADD_ALPHA:
func = blend_color_add_alpha;
func_float = blend_color_add_alpha_float;
break;
default:
break;
}
/* blend */ /* blend */
for (; height > 0; height--) { for (; height > 0; height--) {
if (do_char) { if (do_char) {
dr = drect; dr = drect;
sr = srect; sr = srect;
for (x = width; x > 0; x--, dr++, sr++) for (x = width; x > 0; x--, dr++, sr++) {
*dr = IMB_blend_color(*dr, *sr, ((char *)sr)[3], mode); if(*sr & IB_ALPHA_MASK)
func((char *)dr, (char *)dr, (char *)sr, ((char *)sr)[3]);
}
drect += destskip; drect += destskip;
srect += srcskip; srect += srcskip;
@ -442,9 +528,10 @@ void IMB_rectblend(struct ImBuf *dbuf, struct ImBuf *sbuf, int destx,
if (do_float) { if (do_float) {
drf = drectf; drf = drectf;
srf = srectf; srf = srectf;
for (x = width; x > 0; x--, drf += 4, srf += 4) for (x = width; x > 0; x--, drf += 4, srf += 4) {
IMB_blend_color_float(drf, drf, srf, srf[3], mode); if (srf[3] != 0)
func_float(drf, drf, srf, srf[3]);
}
drectf += destskip * 4; drectf += destskip * 4;
srectf += srcskip * 4; srectf += srcskip * 4;
} }