dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed the existing command line option, --no-mmx to --no-cpu-accel and 

* app/composite/gimp-composite.c:
* app/composite/gimp-composite.h:
* app/main.c:
* app/base/base.c:

Changed the existing command line option, --no-mmx to
--no-cpu-accel and propogated the changes necessary to use that
flag to turn OFF the use of CPU extensions using only the generic
implementations in app/composite/gimp-composite-generic.c

Nota Bene: All of the previous gimp 1.2 code is still available
and is is enabled by setting the GIMP_COMPOSITE environment
variable to zero (GIMP_COMPOSITE=0x0).  This causes only the 1.2
code to be used and is helpful for regression testing of the newer
gimp-composite code.  Whether using the new code, or the old code
there should be absolutely no visible differences.

The newly renamed option --no-cpu-accel retains its previous
semantic meaning with the old 1.2 code--turning OFF MMX
optimisations.
This commit is contained in:
Helvetix Victorinox 2003-11-30 17:29:37 +00:00
parent cb850162b4
commit 11903e3078
6 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ChangeLog
View File

@ -1,3 +1,26 @@
2003-11-30 Helvetix Victorinox <helvetix@gimp.org>
* app/composite/gimp-composite.c:
* app/composite/gimp-composite.h:
* app/main.c:
* app/base/base.c:
Changed the existing command line option, --no-mmx to
--no-cpu-accel and propogated the changes necessary to use that
flag to turn OFF the use of CPU extensions using only the generic
implementations in app/composite/gimp-composite-generic.c
Nota Bene: All of the previous gimp 1.2 code is still available
and is is enabled by setting the GIMP_COMPOSITE environment
variable to zero (GIMP_COMPOSITE=0x0). This causes only the 1.2
code to be used and is helpful for regression testing of the newer
gimp-composite code. Whether using the new code, or the old code
there should be absolutely no visible differences.
The newly renamed option --no-cpu-accel retains its previous
semantic meaning with the old 1.2 code--turning OFF MMX
optimisations.
2003-11-30 Sven Neumann <sven@gimp.org>
* app/batch.c: removed the hack that used to call gimp_exit() when

2
app/base/base.c
View File

@ -96,7 +96,7 @@ base_init (GimpBaseConfig *config,
g_free (path);
/* FIXME: pass use_cpu_accel to GimpComposite */
gimp_composite_init ();
gimp_composite_init (use_cpu_accel);
paint_funcs_setup (use_cpu_accel);
}

6
app/composite/gimp-composite.c
View File

@ -347,10 +347,14 @@ gimp_composite_pixelformat_astext (GimpPixelFormat format)
*
**/
void
gimp_composite_init (void)
gimp_composite_init (gboolean use_cpu_accel)
{
const gchar *p;
if (!use_cpu_accel) {
gimp_composite_options.bits |= GIMP_COMPOSITE_OPTION_NOEXTENSIONS;
}
if ((p = g_getenv ("GIMP_COMPOSITE")))
{
gimp_composite_options.bits = strtoul(p, NULL, 16);

2
app/composite/gimp-composite.h
View File

@ -157,7 +157,7 @@ struct GimpCompositeOptions
extern struct GimpCompositeOptions gimp_composite_options;
extern void gimp_composite_init (void);
extern void gimp_composite_init (gboolean use_cpu_accel);
extern void gimp_composite_dispatch (GimpCompositeContext *ctx);
extern void gimp_composite_context_print (GimpCompositeContext *ctx);

4
app/main.c
View File

@ -316,7 +316,7 @@ main (int argc,
use_shm = FALSE;
argv[i] = NULL;
}
else if (strcmp (argv[i], "--no-mmx") == 0)
else if (strcmp (argv[i], "--no-cpu-accel") == 0)
{
use_mmx = FALSE;
argv[i] = NULL;
@ -481,7 +481,7 @@ gimp_show_help (const gchar *progname)
g_print (_(" -v, --version Output version information.\n"));
g_print (_(" --verbose Show startup messages.\n"));
g_print (_(" --no-shm Do not use shared memory between GIMP and plugins.\n"));
g_print (_(" --no-mmx Do not use MMX routines.\n"));
g_print (_(" --no-cpu-accel Do not use special CPU accelerations.\n"));
g_print (_(" -d, --no-data Do not load brushes, gradients, palettes, patterns.\n"));
g_print (_(" -f, --no-fonts Do not load any fonts.\n"));
g_print (_(" -i, --no-interface Run without a user interface.\n"));

1
configure.in
View File

@ -1297,6 +1297,7 @@ AC_SUBST(GIMP_MKENUMS)
if test "x$have_gtk_2_3" != "xyes"; then
CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
CPPFLAGS="${CPPFLAGS}"
fi
############################