On Wed, Jan 30, 2002 at 06:27:05PM -0500, Steve Freeland wrote:
>
> Well, I've got the xfx driver working again. Unfortunately the
> performance is rather abysmal: Gauntlet gets me 20-30 fps with xfx versus
> 30-40 with x11 on a PII/400 and a Voodoo 1. Mind you this is a kernel
> without MTRR support, so I should give that a try before passing judgment.
> The fix was a complete no-brainer actually, the svgafx patch did
> all the work.
> For the time being I'm leaving out the fx vector code since as far
> as anyone seems to know it doesn't work.
>
Sorry, line wrapping seems to have hosed the previous patch. This
should be better:
diff -ur xmame-0.57.1/src/unix/Makefile xmame-0.57.1-xfx/src/unix/Makefile
--- xmame-0.57.1/src/unix/Makefile Tue Jan 1 21:45:55 2002
+++ xmame-0.57.1-xfx/src/unix/Makefile Wed Jan 30 13:49:04 2002
@@ -30,11 +30,9 @@
$(VID_DIR)/glvec.o $(VID_DIR)/glgen.o $(VID_DIR)/glexport.o \
$(VID_DIR)/glcab.o $(VID_DIR)/gljpg.o \
$(VID_DIR)/xinput.o
-VID_OBJS.xfx = $(VID_DIR)/fxgen.o $(VID_DIR)/fxvec.o $(VID_DIR)/xinput.o \
- $(VID_DIR)/vectorgen.o
+VID_OBJS.xfx = $(VID_DIR)/fxgen.o $(VID_DIR)/xinput.o
VID_OBJS.svgalib = $(VID_DIR)/svgainput.o
-VID_OBJS.svgafx = $(VID_DIR)/svgainput.o $(VID_DIR)/fxgen.o \
- $(VID_DIR)/fxvec.o $(VID_DIR)/vectorgen.o
+VID_OBJS.svgafx = $(VID_DIR)/svgainput.o $(VID_DIR)/fxgen.o
VID_OBJS.openstep = $(VID_DIR)/openstep_input.o
VID_OBJS.photon2 = $(VID_DIR)/photon2_input.o \
$(VID_DIR)/photon2_window.o \
diff -ur xmame-0.57.1/src/unix/video-drivers/xfx.c
xmame-0.57.1-xfx/src/unix/video-drivers/xfx.c
--- xmame-0.57.1/src/unix/video-drivers/xfx.c Tue Jan 1 21:45:56 2002
+++ xmame-0.57.1-xfx/src/unix/video-drivers/xfx.c Wed Jan 30 13:50:16 2002
@@ -89,12 +89,6 @@
MotifWmHints mwmhints;
Atom mwmatom;
- if(depth == 16)
- {
- fprintf(stderr_file, "%s doesn't support 16bpp video modes\n", title);
- return OSD_NOT_OK;
- }
-
screen=DefaultScreenOfDisplay(display);
myscreen=DefaultScreen(display);
cursor=XCreateFontCursor(display,XC_trek);
diff -ur xmame-0.57.1/src/unix/video.c xmame-0.57.1-xfx/src/unix/video.c
--- xmame-0.57.1/src/unix/video.c Tue Jan 1 21:45:56 2002
+++ xmame-0.57.1-xfx/src/unix/video.c Wed Jan 30 15:13:28 2002
@@ -604,19 +604,19 @@
sysdep_palette_set_pen(normal_palette, i, palette[i * 3],
palette[i * 3 + 1], palette[i * 3 + 2]);
}
-#ifdef svgafx
+#if (defined svgafx) || (defined xfx)
color_values = malloc(video_colors_used * sizeof(UINT16));
#endif
for (i = 0; i < totalcolors; i++) {
palette_get_color(i, (UINT8*)&rr, (UINT8*)&gg, (UINT8*)&bb);
-#ifdef svgafx
+#if (defined svgafx) || (defined xfx)
color_values[i] = (((rr >> 3) << 10) | ((gg >> 3) << 5) | (bb >> 3));
#endif
}
-#ifdef svgafx
+#if (defined svgafx) || (defined xfx)
color_values[totalcolors] = 0x0000;
color_values[totalcolors+1] = 0x7FFF;
#endif
@@ -650,7 +650,7 @@
void osd_modify_pen(int pen, unsigned char red,unsigned char green,unsigned char
blue)
{
-#ifdef svgafx
+#if (defined svgafx) || (defined xfx)
color_values[pen] = (((red >> 3) << 10) | ((green >> 3) << 5) | (blue >> 3));
#endif
diff -ur xmame-0.57.1/src/vidhrdw/vector.c xmame-0.57.1-xfx/src/vidhrdw/vector.c
--- xmame-0.57.1/src/vidhrdw/vector.c Tue Jan 1 21:45:52 2002
+++ xmame-0.57.1-xfx/src/vidhrdw/vector.c Wed Jan 30 13:53:04 2002
@@ -30,7 +30,7 @@
**************************************************************************** */
/* GLmame and FXmame provide their own vector implementations */
-#if !(defined xgl) && !(defined xfx) && !(defined svgafx)
+#if !(defined xgl)
#include <math.h>
#include "osinline.h"
--
Steve 'Nephtes' Freeland | For Christmas this year I'd like to see Martha
[EMAIL PROTECTED] | Stewart compete on an episode of Junkyard Wars.
_______________________________________________
Xmame mailing list
[EMAIL PROTECTED]
http://toybox.twisted.org.uk/mailman/listinfo/xmame
