Commit 768b34b1 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

app/composite/gimp-composite-altivec.c app/composite/gimp-composite-mmx.c

2003-10-01  Sven Neumann  <sven@gimp.org>

	* app/composite/gimp-composite-altivec.c
	* app/composite/gimp-composite-mmx.c
	* app/composite/gimp-composite-sse.c
	* app/composite/gimp-composite-sse2.c
	* app/composite/gimp-composite-vis.c: moved includes out of the
	#if __GNUC__ >= 3 to make the code compile on other compilers.

	* app/composite/gimp-composite-3dnow.[ch]: added the same stubs here
	for symmetry.
parent 69f7bd13
2003-10-01 Sven Neumann <sven@gimp.org>
* app/composite/gimp-composite-altivec.c
* app/composite/gimp-composite-mmx.c
* app/composite/gimp-composite-sse.c
* app/composite/gimp-composite-sse2.c
* app/composite/gimp-composite-vis.c: moved includes out of the
#if __GNUC__ >= 3 to make the code compile on other compilers.
* app/composite/gimp-composite-3dnow.[ch]: added the same stubs here
for symmetry.
2003-10-01 Sven Neumann <sven@gimp.org>
* app/core/Makefile.am
......@@ -23,26 +23,34 @@
#include "config.h"
#if defined(USE_MMX)
#if defined(ARCH_X86)
#include <stdio.h>
#include <glib-object.h>
#include "base/base-types.h"
#include "base/cpu-accel.h"
#include "gimp-composite.h"
#include "gimp-composite-3dnow.h"
#if defined(USE_MMX)
#if defined(ARCH_X86)
#if __GNUC__ >= 3
#endif /* __GNUC__ > 3 */
#endif /* defined(ARCH_X86) */
#endif /* defined(USE_MMX) */
#endif /* ARCH_X86 */
#endif /* USE_MMX */
void
gimp_composite_3dnow_init(void)
int
gimp_composite_3dnow_init (void)
{
#if defined(USE_MMX) && defined(ARCH_X86)
guint32 cpu = cpu_accel ();
if (cpu & CPU_ACCEL_X86_3DNOW)
{
return (1);
}
#endif
return (0);
}
#ifndef gimp_composite_3dnow_h
#define gimp_composite_3dnow_h
extern void gimp_composite_3dnow_init(void);
extern int gimp_composite_3dnow_init (void);
/*
* The function gimp_composite_*_install() is defined in the code generated by make-install.py
* I hate to create a .h file just for that declaration, so I do it here (for now).
*/
extern void gimp_composite_3dnow_install(void);
extern void gimp_composite_3dnow_install (void);
#endif
......@@ -20,7 +20,6 @@
#include "config.h"
#ifdef ARCH_PPC
#include <stdio.h>
#include <glib-object.h>
......@@ -31,6 +30,7 @@
#include "gimp-composite.h"
#include "gimp-composite-altivec.h"
#ifdef ARCH_PPC
#if __GNUC__ >= 3
#endif /* __GNUC__ > 3 */
......
......@@ -31,10 +31,6 @@
#include "config.h"
#if defined(USE_MMX)
#if defined(ARCH_X86)
#if __GNUC__ >= 3
#include <stdio.h>
#include <glib-object.h>
......@@ -46,6 +42,10 @@
#include "gimp-composite-mmx.h"
#include "gimp-composite-x86.h"
#if defined(USE_MMX)
#if defined(ARCH_X86)
#if __GNUC__ >= 3
#define pminub(src,dst,tmp) "\tmovq %%" #dst ", %%" #tmp ";" "psubusb %%" #src ", %%" #tmp ";" "psubb %%" #tmp ", %%" #dst "\n"
#define pmaxub(a,b,tmp) "\tmovq %%" #a ", %%" #tmp ";" "psubusb %%" #b ", %%" #tmp ";" "paddb %%" #tmp ", %%" #b "\n"
......
......@@ -32,10 +32,6 @@
#include "config.h"
#if defined(USE_SSE)
#if defined(ARCH_X86)
#if __GNUC__ >= 3
#include <stdio.h>
#include <glib-object.h>
......@@ -47,6 +43,10 @@
#include "gimp-composite-sse.h"
#include "gimp-composite-x86.h"
#if defined(USE_SSE)
#if defined(ARCH_X86)
#if __GNUC__ >= 3
#define pminub(src,dst,tmp) "pminub " "%%" #src ", %%" #dst
#define pmaxub(src,dst,tmp) "pmaxub " "%%" #src ", %%" #dst
......
......@@ -25,9 +25,6 @@
#include "config.h"
#if defined(USE_SSE)
#if defined(ARCH_X86)
#include <stdio.h>
#include <glib-object.h>
......@@ -39,6 +36,8 @@
#include "gimp-composite-sse2.h"
#include "gimp-composite-x86.h"
#if defined(USE_SSE)
#if defined(ARCH_X86)
#if __GNUC__ >= 3
static const guint32 rgba8_alpha_mask_128[4] = { 0xFF000000, 0xFF000000, 0xFF000000, 0xFF000000 };
......
......@@ -23,9 +23,6 @@
#include "config.h"
#if defined(USE_VIS)
#if defined(ARCH_SPARC)
#include <stdio.h>
#include <glib-object.h>
......@@ -35,6 +32,8 @@
#include "gimp-composite.h"
#include "gimp-composite-vis.h"
#if defined(USE_VIS)
#if defined(ARCH_SPARC)
#if __GNUC__ >= 3
#endif /* __GNUC__ > 3 */
......@@ -45,8 +44,8 @@ int
gimp_composite_vis_init (void)
{
#ifdef ARCH_SPARC
return (1);
return (1);
#else
return (0);
return (0);
#endif
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment