2001-12-03 Sven Neumann <sven@gimp.org> Michael Natterer <mitch@gimp.org> * app/paint-funcs/paint-funcs-mmx.h: removed redefiniton of HAS_ALPHA macro. * app/core/gimp.c: reverted Daniel's change; it doesn't make the code simpler, only more error-prone. * app/gui/info-dialog.h * app/gui/resize-dialog.h * app/core/gimp.h * app/core/gimpbrushgenerated.h * app/core/gimpbrushpipe.h * app/core/gimpchannel.[ch] * app/core/gimpcontainer.h * app/core/gimpcoreconfig.h * app/core/gimpdata.h * app/core/gimpdatafactory.[ch] * app/core/gimpdrawable-blend.c * app/core/gimpdrawable.[ch] * app/core/gimpimage.h * app/core/gimpimagefile.h * app/core/gimplayer.h * app/core/gimplayermask.h * app/core/gimpmoduleinfo.h * app/core/gimppalette.h * app/core/gimpundo.h * app/widgets/gimpbrushfactoryview.h * app/widgets/gimpconstrainedhwrapbox.h * app/widgets/gimpcontainermenu.h * app/widgets/gimpcontainerview.h * app/widgets/gimpdialogfactory.h * app/widgets/gimpimagedock.h * app/widgets/gimplistitem.h * app/widgets/gimpmenuitem.h * app/widgets/gimpnavigationpreview.h * app/widgets/gimppreview.h * app/gimprc.h * app/pathP.h * app/tools/gimpbezierselecttool.h * app/tools/gimpcolorbalancetool.h * app/tools/gimpcurvestool.h * app/tools/gimpdodgeburntool.c * app/tools/gimpfreeselecttool.h * app/tools/gimphuesaturationtool.h * app/tools/gimpinktool-blob.h * app/tools/gimpinktool.h * app/tools/gimpiscissorstool.h * app/tools/gimpmagnifytool.h * app/tools/gimpmeasuretool.h * app/tools/gimppainttool.h * app/tools/gimppathtool.h * app/tools/gimprectselecttool.h * app/tools/gimpthresholdtool.h * app/tools/gimptool.h * app/tools/gimptransformtool.h * app/base/base-config.h * app/base/gimplut.[ch] * app/base/pixel-region.h * app/base/pixel-surround.[ch] * app/base/temp-buf.[ch] * app/base/tile-manager-private.h * app/base/tile-manager.[ch] * app/base/tile-private.h * app/base/tile.[ch] * app/display/gimpdisplay.h * app/display/gimpdisplayshell-selection.h * app/display/gimpdisplayshell.h * app/gui/brush-select.h * app/gui/gradient-editor.h * app/gui/gradient-select.h: reverted most of Daniel's changes. There's no reason to use unsigned integers here and in lots of places it is even wrong. Then it's way too early to convert gbooleans into bitfields. This change may make sense in a few places but can happen later when the API has settled and the code is more stable. * app/gimprc.c: reverted Daniel's change. This is a GCC-ism and this code is about to die soon anyway.
108 lines
2.9 KiB
C
108 lines
2.9 KiB
C
/* The GIMP -- an image manipulation program
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
/*
|
|
* This file is supposed to contain the MMX implementation of the
|
|
* pixelfiddeling paint-functions.
|
|
*/
|
|
|
|
#ifndef __PAINT_FUNCS_MMX_H__
|
|
#define __PAINT_FUNCS_MMX_H__
|
|
|
|
/* FIXME: Needs a bigger overhaul. Maybe inline assembly would be better? */
|
|
#ifdef HAVE_ASM_MMX
|
|
|
|
#define MMX_PIXEL_OP(x) \
|
|
void \
|
|
x( \
|
|
const guchar *src1, \
|
|
const guchar *src2, \
|
|
guint count, \
|
|
guchar *dst) __attribute((regparm(3)));
|
|
|
|
#define MMX_PIXEL_OP_3A_1A(op) \
|
|
MMX_PIXEL_OP(op##_pixels_3a_3a) \
|
|
MMX_PIXEL_OP(op##_pixels_1a_1a)
|
|
|
|
#define USE_MMX_PIXEL_OP_3A_1A(op) \
|
|
if (HAS_ALPHA (alms->bytes1) && HAS_ALPHA (alms->bytes2)) \
|
|
{ \
|
|
if (alms->bytes1==2 && alms->bytes2==2) \
|
|
return op##_pixels_1a_1a(alms->src1, alms->src2, alms->length, *(alms->dest)); \
|
|
if (alms->bytes1==4 && alms->bytes2==4) \
|
|
return op##_pixels_3a_3a(alms->src1, alms->src2, alms->length, *(alms->dest)); \
|
|
}
|
|
|
|
MMX_PIXEL_OP_3A_1A(multiply);
|
|
static void
|
|
layer_multiply_mode_mmx (struct apply_layer_mode_struct *alms)
|
|
{
|
|
USE_MMX_PIXEL_OP_3A_1A(multiply);
|
|
}
|
|
|
|
MMX_PIXEL_OP_3A_1A(screen);
|
|
static void
|
|
layer_screen_mode_mmx (struct apply_layer_mode_struct *alms)
|
|
{
|
|
USE_MMX_PIXEL_OP_3A_1A(screen);
|
|
}
|
|
|
|
MMX_PIXEL_OP_3A_1A(overlay);
|
|
static void
|
|
layer_overlay_mode_mmx (struct apply_layer_mode_struct *alms)
|
|
{
|
|
USE_MMX_PIXEL_OP_3A_1A(overlay);
|
|
}
|
|
|
|
MMX_PIXEL_OP_3A_1A(difference);
|
|
static void
|
|
layer_difference_mode_mmx (struct apply_layer_mode_struct *alms)
|
|
{
|
|
USE_MMX_PIXEL_OP_3A_1A(difference);
|
|
}
|
|
|
|
MMX_PIXEL_OP_3A_1A(add);
|
|
static void
|
|
layer_addition_mode_mmx (struct apply_layer_mode_struct *alms)
|
|
{
|
|
USE_MMX_PIXEL_OP_3A_1A(add);
|
|
}
|
|
|
|
MMX_PIXEL_OP_3A_1A(substract);
|
|
static void
|
|
layer_subtract_mode_mmx (struct apply_layer_mode_struct *alms)
|
|
{
|
|
USE_MMX_PIXEL_OP_3A_1A(substract);
|
|
}
|
|
|
|
MMX_PIXEL_OP_3A_1A(darken);
|
|
static void
|
|
layer_darken_only_mode_mmx (struct apply_layer_mode_struct *alms)
|
|
{
|
|
USE_MMX_PIXEL_OP_3A_1A(darken);
|
|
}
|
|
|
|
MMX_PIXEL_OP_3A_1A(lighten);
|
|
static void
|
|
layer_lighten_only_mode_mmx (struct apply_layer_mode_struct *alms)
|
|
{
|
|
USE_MMX_PIXEL_OP_3A_1A(lighten);
|
|
}
|
|
|
|
#endif /* HAVE_ASM_MMX */
|
|
#endif /* __PAINT_FUNCS_MMX_H__ */
|