Commit 0984f940 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller 🐠
Browse files

gst/goom/: Compile fixes for x86-64.

Original commit message from CVS:
* gst/goom/goomsl_heap.c: (align_it):
* gst/goom/plugin_info.c: (setOptimizedMethods):
Compile fixes for x86-64.
parent 9b2e72ca
2008-02-23 Tim-Philipp Müller <tim at centricular dot net>
* gst/goom/goomsl_heap.c: (align_it):
* gst/goom/plugin_info.c: (setOptimizedMethods):
Compile fixes for x86-64.
2008-02-23 Bastien Nocera <hadess@hadess.net> 2008-02-23 Bastien Nocera <hadess@hadess.net>
   
* gst/goom/Makefile.am: Don't compile lex or yacc outputs * gst/goom/Makefile.am: Don't compile lex or yacc outputs
......
...@@ -46,8 +46,8 @@ align_it (GoomHeap * _this, int alignment) ...@@ -46,8 +46,8 @@ align_it (GoomHeap * _this, int alignment)
{ {
if ((alignment > 1) && (_this->number_of_arrays > 0)) { if ((alignment > 1) && (_this->number_of_arrays > 0)) {
void *last_array = _this->arrays[_this->number_of_arrays - 1]; void *last_array = _this->arrays[_this->number_of_arrays - 1];
int last_address = (int) last_array + _this->consumed_in_last_array; long last_address = (long) last_array + _this->consumed_in_last_array;
int decal = (last_address % alignment); long decal = (last_address % alignment);
if (decal != 0) { if (decal != 0) {
_this->consumed_in_last_array += alignment - decal; _this->consumed_in_last_array += alignment - decal;
......
...@@ -36,11 +36,12 @@ setOptimizedMethods (PluginInfo * p) ...@@ -36,11 +36,12 @@ setOptimizedMethods (PluginInfo * p)
p->methods.zoom_filter = zoom_filter_c; p->methods.zoom_filter = zoom_filter_c;
/* p->methods.create_output_with_brightness = create_output_with_brightness;*/ /* p->methods.create_output_with_brightness = create_output_with_brightness;*/
/* FIXME: what about HAVE_CPU_X86_64 ? */
#ifdef HAVE_CPU_I386 #ifdef HAVE_CPU_I386
printf ("have an x86\n"); printf ("have an x86\n");
if (cpuFlavour & OIL_IMPL_FLAG_MMXEXT) { if (cpuFlavour & OIL_IMPL_FLAG_MMXEXT) {
#ifdef VERBOSE #ifdef VERBOSE
printf ("Extented MMX detected. Using the fastest methods !\n"); printf ("Extended MMX detected. Using the fastest methods !\n");
#endif #endif
p->methods.draw_line = draw_line_mmx; p->methods.draw_line = draw_line_mmx;
p->methods.zoom_filter = zoom_filter_xmmx; p->methods.zoom_filter = zoom_filter_xmmx;
...@@ -74,6 +75,7 @@ setOptimizedMethods (PluginInfo * p) ...@@ -74,6 +75,7 @@ setOptimizedMethods (PluginInfo * p)
} }
#endif /* HAVE_CPU_PPC */ #endif /* HAVE_CPU_PPC */
cpuFlavour = 0; /* trick compiler into thinking variable is used */
} }
void void
......
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