Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-07 21:33:45 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

atlantis: Removed unused define parameter. (nw)

Browse Source 
zeus2: Updated waveram organization. Updated quad rendering command size. Updated register naming. (nw)
midzeus: Removed midzeus2.h as not needed. (nw)
arcade.lua: Removed midzeus2.h and midzeus2.cpp as they aren't used anymore. (nw)
This commit is contained in:
Ted Green 2016-10-07 10:05:54 -06:00
parent 2117cc5a64
commit a722fc2912
5 changed files with 292 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/target/mame/arcade.lua
View File

@ -2518,9 +2518,7 @@ files {
MAME_DIR .. "src/mame/video/midyunit.cpp", MAME_DIR .. "src/mame/video/midyunit.cpp",
MAME_DIR .. "src/mame/drivers/midzeus.cpp", MAME_DIR .. "src/mame/drivers/midzeus.cpp",
MAME_DIR .. "src/mame/includes/midzeus.h", MAME_DIR .. "src/mame/includes/midzeus.h",
MAME_DIR .. "src/mame/includes/midzeus2.h",
MAME_DIR .. "src/mame/video/midzeus.cpp", MAME_DIR .. "src/mame/video/midzeus.cpp",
MAME_DIR .. "src/mame/video/midzeus2.cpp",
MAME_DIR .. "src/mame/drivers/mw18w.cpp", MAME_DIR .. "src/mame/drivers/mw18w.cpp",
MAME_DIR .. "src/mame/drivers/mwsub.cpp", MAME_DIR .. "src/mame/drivers/mwsub.cpp",
MAME_DIR .. "src/mame/drivers/omegrace.cpp", MAME_DIR .. "src/mame/drivers/omegrace.cpp",

379
src/devices/video/zeus2.cpp
View File

@ -67,8 +67,7 @@ TIMER_CALLBACK_MEMBER(zeus2_device::int_timer_callback)
void zeus2_device::device_start() void zeus2_device::device_start()
{ {
/* allocate memory for "wave" RAM */ /* allocate memory for "wave" RAM */
waveram[0] = auto_alloc_array(machine(), UINT32, WAVERAM0_WIDTH * WAVERAM0_HEIGHT * 8/4); waveram = auto_alloc_array(machine(), UINT32, WAVERAM0_WIDTH * WAVERAM0_HEIGHT * 8/4);
//waveram[1] = auto_alloc_array(machine(), UINT32, WAVERAM1_WIDTH * WAVERAM1_HEIGHT * 12/4);
m_frameColor = std::make_unique<UINT32[]>(WAVERAM1_WIDTH * WAVERAM1_HEIGHT * 2); m_frameColor = std::make_unique<UINT32[]>(WAVERAM1_WIDTH * WAVERAM1_HEIGHT * 2);
m_frameDepth = std::make_unique<UINT16[]>(WAVERAM1_WIDTH * WAVERAM1_HEIGHT * 2); m_frameDepth = std::make_unique<UINT16[]>(WAVERAM1_WIDTH * WAVERAM1_HEIGHT * 2);
@ -86,13 +85,16 @@ void zeus2_device::device_start()
int_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(zeus2_device::int_timer_callback), this)); int_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(zeus2_device::int_timer_callback), this));
vblank_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(zeus2_device::display_irq), this)); vblank_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(zeus2_device::display_irq), this));
//printf("%s\n", machine().system().name);
m_thegrid = strcmp(machine().system().name, "thegrid")==0;
/* save states */ /* save states */
save_pointer(NAME(waveram[0]), WAVERAM0_WIDTH * WAVERAM0_HEIGHT * 8 / sizeof(waveram[0][0])); save_pointer(NAME(waveram), WAVERAM0_WIDTH * WAVERAM0_HEIGHT * 2);
//save_pointer(NAME(waveram[1]), WAVERAM1_WIDTH * WAVERAM1_HEIGHT * 12 / sizeof(waveram[1][0]));
save_pointer(NAME(m_frameColor.get()), WAVERAM1_WIDTH * WAVERAM1_HEIGHT * 2); save_pointer(NAME(m_frameColor.get()), WAVERAM1_WIDTH * WAVERAM1_HEIGHT * 2);
save_pointer(NAME(m_frameDepth.get()), WAVERAM1_WIDTH * WAVERAM1_HEIGHT * 2); save_pointer(NAME(m_frameDepth.get()), WAVERAM1_WIDTH * WAVERAM1_HEIGHT);
save_item(NAME(m_zeusbase)); save_pointer(NAME(m_zeusbase), 0x80);
save_item(NAME(m_renderRegs)); save_pointer(NAME(m_renderRegs), 0x50);
save_pointer(NAME(m_pal_table), 0x100);
save_item(NAME(zeus_fifo)); save_item(NAME(zeus_fifo));
save_item(NAME(zeus_fifo_words)); save_item(NAME(zeus_fifo_words));
save_item(NAME(zeus_cliprect.min_x)); save_item(NAME(zeus_cliprect.min_x));
@ -103,18 +105,17 @@ void zeus2_device::device_start()
save_item(NAME(zeus_point)); save_item(NAME(zeus_point));
save_item(NAME(zeus_point2)); save_item(NAME(zeus_point2));
save_item(NAME(zeus_texbase)); save_item(NAME(zeus_texbase));
save_item(NAME(m_renderMode));
save_item(NAME(zeus_quad_size)); save_item(NAME(zeus_quad_size));
save_item(NAME(m_fill_color)); save_item(NAME(m_fill_color));
save_item(NAME(m_fill_depth)); save_item(NAME(m_fill_depth));
save_item(NAME(m_renderPtr)); save_item(NAME(m_renderAddr));
save_item(NAME(m_yScale)); save_item(NAME(m_yScale));
} }
void zeus2_device::device_reset() void zeus2_device::device_reset()
{ {
memset(m_zeusbase, 0, sizeof(m_zeusbase[0]) * 0x80); memset(m_zeusbase, 0, sizeof(m_zeusbase[0]) * 0x80);
memset(m_renderRegs, 0, sizeof(m_renderRegs[0]) * 0x40); memset(m_renderRegs, 0, sizeof(m_renderRegs[0]) * 0x50);
zbase = 32.0f; zbase = 32.0f;
m_yScale = 0; m_yScale = 0;
@ -124,24 +125,30 @@ void zeus2_device::device_reset()
zeus_fifo_words = 0; zeus_fifo_words = 0;
m_fill_color = 0; m_fill_color = 0;
m_fill_depth = 0; m_fill_depth = 0;
m_renderPtr = 0; m_renderAddr = 0;
} m_directCmd = nullptr;
// Setup a linear pal conversion table for thegrid
for (int i = 0; i < 0x100; ++i) {
m_pal_table[i] = (i << 16) | (i << 8) | (i << 0);
}
}
#if DUMP_WAVE_RAM
#include <iostream>
#include <fstream>
#endif
void zeus2_device::device_stop() void zeus2_device::device_stop()
{ {
#if DUMP_WAVE_RAM #if DUMP_WAVE_RAM
FILE *f = fopen("waveram.dmp", "w"); std::string fileName = "waveram_";
int i; fileName += machine().system().name;
fileName += ".bin";
std::ofstream myfile;
myfile.open(fileName.c_str(), std::ios::out | std::ios::trunc | std::ios::binary);
for (i = 0; i < WAVERAM0_WIDTH * WAVERAM0_HEIGHT; i++) if (myfile.is_open())
{ myfile.write((char *)waveram, WAVERAM0_WIDTH * WAVERAM0_HEIGHT * 2 * sizeof(UINT32));
if (i % 4 == 0) fprintf(f, "%03X%03X: ", i / WAVERAM0_WIDTH, i % WAVERAM0_WIDTH); myfile.close();
fprintf(f, " %08X %08X ",
WAVERAM_READ32(waveram[0], i*2+0),
WAVERAM_READ32(waveram[0], i*2+1));
if (i % 4 == 3) fprintf(f, "\n");
}
fclose(f);
#endif #endif
#if TRACK_REG_USAGE #if TRACK_REG_USAGE
@ -195,7 +202,7 @@ UINT32 zeus2_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
int x, y; int x, y;
poly->wait(); poly->wait("SCREEN_UPDATE");
if (machine().input().code_pressed(KEYCODE_DOWN)) { zbase += machine().input().code_pressed(KEYCODE_LSHIFT) ? 0x10 : 1; popmessage("Zbase = %f", (double)zbase); } if (machine().input().code_pressed(KEYCODE_DOWN)) { zbase += machine().input().code_pressed(KEYCODE_LSHIFT) ? 0x10 : 1; popmessage("Zbase = %f", (double)zbase); }
if (machine().input().code_pressed(KEYCODE_UP)) { zbase -= machine().input().code_pressed(KEYCODE_LSHIFT) ? 0x10 : 1; popmessage("Zbase = %f", (double)zbase); } if (machine().input().code_pressed(KEYCODE_UP)) { zbase -= machine().input().code_pressed(KEYCODE_LSHIFT) ? 0x10 : 1; popmessage("Zbase = %f", (double)zbase); }
@ -210,7 +217,6 @@ UINT32 zeus2_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
UINT32 *dest = &bitmap.pix32(y); UINT32 *dest = &bitmap.pix32(y);
for (x = cliprect.min_x; x <= cliprect.max_x; x++) { for (x = cliprect.min_x; x <= cliprect.max_x; x++) {
UINT32 bufX = x - xoffs; UINT32 bufX = x - xoffs;
//dest[x] = WAVERAM_READPIX(base, y, x - xoffs);
dest[x] = colorptr[bufX]; dest[x] = colorptr[bufX];
} }
} }
@ -444,7 +450,7 @@ void zeus2_device::zeus2_register_update(offs_t offset, UINT32 oldval, int logit
m_zeusbase[0x38] = oldval; m_zeusbase[0x38] = oldval;
m_screen->update_partial(m_screen->vpos()); m_screen->update_partial(m_screen->vpos());
log_fifo = machine().input().code_pressed(KEYCODE_L); log_fifo = machine().input().code_pressed(KEYCODE_L);
log_fifo = 1; //log_fifo = 1;
m_zeusbase[0x38] = temp; m_zeusbase[0x38] = temp;
} }
break; break;
@ -464,6 +470,72 @@ void zeus2_device::zeus2_register_update(offs_t offset, UINT32 oldval, int logit
m_zeusbase[0x41] &= ~0xfc00; m_zeusbase[0x41] &= ~0xfc00;
} }
} }
// mwskinsa 0xE085001F -- pal 555?
// thegrid 0x0055002C ???
// crusnexo 0x005500FF ???
// crusnexo 0x00A20000 ???
// Zeus render info
if ((m_zeusbase[0x40] >> 16) == 0xc085) {
if (logit)
logerror("\t-- pal table argb32 load: control: %08X addr: %08X", m_zeusbase[0x40], m_zeusbase[0x41]);
// Load pal table from ARGB32
poly->wait("PAL_TABLE_WRITE");
void *dataPtr = waveram0_ptr_from_expanded_addr(m_zeusbase[0x41]);
load_pal_table(dataPtr, m_zeusbase[0x40], logit);
} else if ((m_zeusbase[0x40] >> 16) == 0x0084) {
// Load pal table from RGB555
poly->wait("PAL_TABLE_WRITE");
void *dataPtr = waveram0_ptr_from_expanded_addr(m_zeusbase[0x41]);
load_pal_table(dataPtr, m_zeusbase[0x40], logit);
if (logit)
logerror("\t-- pal table rgb555 load: control: %08X addr: %08X", m_zeusbase[0x40], m_zeusbase[0x41]);
}
else if ((((m_zeusbase[0x40] >> 24) & 0xff) == 0x38) ||
(((m_zeusbase[0x40] >> 24) & 0xff) == 0x2d)) {
// Direct command buffer
m_directCmd = (UINT32*)waveram0_ptr_from_expanded_addr(m_zeusbase[0x41]);
if (logit)
logerror("\t-- direct cmd: %08X addr: %08X", m_zeusbase[0x40], m_zeusbase[0x41]);
{
// Zeus Quad Size
switch (m_zeusbase[0x40]) {
case 0x38550083: case 0x3885007B: case 0x2D550083:
zeus_quad_size = 14;
break;
case 0x3855006F: case 0x38550088: case 0x388500A9:
zeus_quad_size = 12;
break;
case 0x38550075:
if (m_zeusbase[0x41] == 0x00000324)
zeus_quad_size = 12;
else
zeus_quad_size = 10;
break;
case 0x38850077:
zeus_quad_size = 10;
break;
default:
logerror("default quad size 10\n");
zeus_quad_size = 10;
break;
}
}
if (1 && logit) {
UINT32 *wavePtr = (UINT32*)WAVERAM_BLOCK0(m_zeusbase[0x41]);
UINT32 waveData;
int size = m_zeusbase[0x40] & 0xff;
logerror("\n Setup size=%d [40]=%08X [41]=%08X [4e]=%08X\n", zeus_quad_size, m_zeusbase[0x40], m_zeusbase[0x41], m_zeusbase[0x4e]);
for (int i = 0; i <= size; ++i) {
waveData = *wavePtr++;
logerror(" %08X", waveData);
waveData = *wavePtr++;
//logerror(" %08X", waveData);
if (0 && (i + 1) % 16 == 0)
logerror("\n");
}
logerror("\n");
}
}
break; break;
case 0x41: case 0x41:
/* this is the address, except in read mode, where it latches values */ /* this is the address, except in read mode, where it latches values */
@ -503,6 +575,8 @@ void zeus2_device::zeus2_register_update(offs_t offset, UINT32 oldval, int logit
void *dest = waveram0_ptr_from_expanded_addr(m_zeusbase[0x41]); void *dest = waveram0_ptr_from_expanded_addr(m_zeusbase[0x41]);
WAVERAM_WRITE32(dest, 0, m_zeusbase[0x48]); WAVERAM_WRITE32(dest, 0, m_zeusbase[0x48]);
WAVERAM_WRITE32(dest, 1, m_zeusbase[0x49]); WAVERAM_WRITE32(dest, 1, m_zeusbase[0x49]);
if (logit)
logerror("\t[41]=%08X [4E]=%08X", m_zeusbase[0x41], m_zeusbase[0x4e]);
if (m_zeusbase[0x4e] & 0x40) if (m_zeusbase[0x4e] & 0x40)
{ {
@ -575,12 +649,13 @@ void zeus2_device::zeus2_register_update(offs_t offset, UINT32 oldval, int logit
frame_read(); frame_read();
} }
/* make sure we log anything else */ /* make sure we log anything else */
else if (1 || logit) else if (logit || m_zeusbase[0x50] != 0x0)
logerror("\tw[50]=%08X [5E]=%08X\n", m_zeusbase[0x50], m_zeusbase[0x5e]); logerror("\tw[50]=%08X [5E]=%08X\n", m_zeusbase[0x50], m_zeusbase[0x5e]);
} }
break; break;
case 0x51: case 0x51:
// Set direct rendering location
m_renderAddr = frame_addr_from_phys_addr(m_zeusbase[0x51]);
/* in this mode, crusnexo expects the reads to immediately latch */ /* in this mode, crusnexo expects the reads to immediately latch */
//if ((m_zeusbase[0x50] == 0x00a20000) || (m_zeusbase[0x50] == 0x00720000)) //if ((m_zeusbase[0x50] == 0x00a20000) || (m_zeusbase[0x50] == 0x00720000))
if (m_zeusbase[0x50] == 0x00a20000) if (m_zeusbase[0x50] == 0x00a20000)
@ -647,7 +722,32 @@ void zeus2_device::zeus2_register_update(offs_t offset, UINT32 oldval, int logit
logerror("\n"); logerror("\n");
} }
/*************************************
* Load pal table from waveram
*************************************/
void zeus2_device::load_pal_table(void *wavePtr, UINT32 ctrl, int logit)
{
UINT32 *tablePtr = m_pal_table;
int count = ctrl & 0xff;
UINT32 cmd = ctrl >> 24;
if (cmd == 0x0) {
// Convert from RGB555
UINT16 *src = (UINT16*)wavePtr;
for (int i = 0; i <= count; ++i) {
*tablePtr++ = conv_rgb555_to_rgb32(*src++);
*tablePtr++ = conv_rgb555_to_rgb32(*src++);
*tablePtr++ = conv_rgb555_to_rgb32(*src++);
*tablePtr++ = conv_rgb555_to_rgb32(*src++);
}
} else if (cmd==0xc0) {
// The data seems to be in ARGB32 format
UINT32 *src = (UINT32*)wavePtr;
for (int i = 0; i <= count; ++i) {
*tablePtr++ = *src++;
*tablePtr++ = *src++;
}
}
}
/************************************* /*************************************
* *
@ -675,19 +775,14 @@ if (subregdata_count[which] < 256)
} }
} }
#endif #endif
if (which<0x40) if (which<0x50)
m_renderRegs[which] = value; m_renderRegs[which] = value;
switch (which) switch (which)
{ {
case 0x40: case 0x40:
m_renderMode = value;
// 0x020202 crusnexo quad ??
//zeus_quad_size = ((m_renderMode & 0xff) == 0x04) ? 14 : 10;
//zeus_quad_size = (m_renderMode & 0x020000) ? 14 : 10;
if (logit) if (logit)
logerror("\tRender Mode = %06X", m_renderMode); logerror("\t(R%02X) = %06x Render Unknown", which, value);
//printf("\tRender Mode = %06X\n", m_renderMode);
break; break;
case 0xff: case 0xff:
@ -739,19 +834,22 @@ int zeus2_device::zeus2_fifo_process(const UINT32 *data, int numwords)
switch (data[0] >> 24) switch (data[0] >> 24)
{ {
// 0x00: write 32-bit value to low registers // 0x00: write 32-bit value to low registers
case 0x00: case 0x00:
// Ignore the all zeros commmand // Ignore the all zeros commmand
if (((data[0] >> 16) & 0x7f) == 0x0) if (((data[0] >> 16) & 0x7f) == 0x0) {
return TRUE; if (log_fifo && (data[0] & 0xfff) != 0x2c0)
// Drop through to 0x05 command log_fifo_command(data, numwords, " -- ignored\n");
/* 0x05: write 32-bit value to low registers */ return TRUE;
case 0x05: }
if (numwords < 2) // Drop through to 0x05 command
return FALSE; /* 0x05: write 32-bit value to low registers */
if (log_fifo) case 0x05:
log_fifo_command(data, numwords, " -- reg32"); if (numwords < 2)
if (((data[0] >> 16) & 0x7f) != 0x08) return FALSE;
zeus2_register32_w((data[0] >> 16) & 0x7f, data[1], log_fifo); if (log_fifo)
log_fifo_command(data, numwords, " -- reg32");
if (((data[0] >> 16) & 0x7f) != 0x08)
zeus2_register32_w((data[0] >> 16) & 0x7f, data[1], log_fifo);
break; break;
/* 0x08: set matrix and point (thegrid) */ /* 0x08: set matrix and point (thegrid) */
@ -818,10 +916,20 @@ int zeus2_device::zeus2_fifo_process(const UINT32 *data, int numwords)
} }
break; break;
/* 0x1c: */ // 0x1c: thegrid (3 words)
// 0x1b: the grid
case 0x1b:
case 0x1c: case 0x1c:
if (m_thegrid) {
if (numwords < 3)
return FALSE;
if (log_fifo)
log_fifo_command(data, numwords, " -- unknown control\n");
break;
}
// 0x1b: thegrid
// 0x1c: crusnexo (4 words)
// 0x10: atlantis???
case 0x10:
case 0x1b:
if (numwords < 4) if (numwords < 4)
return FALSE; return FALSE;
if (log_fifo) if (log_fifo)
@ -843,7 +951,6 @@ int zeus2_device::zeus2_fifo_process(const UINT32 *data, int numwords)
case 0x1d: case 0x1d:
if (numwords < 2) if (numwords < 2)
return FALSE; return FALSE;
//zeus_point[2] = convert_float(data[1]);
if (log_fifo) if (log_fifo)
{ {
log_fifo_command(data, numwords, " -- unknown\n"); log_fifo_command(data, numwords, " -- unknown\n");
@ -862,8 +969,7 @@ int zeus2_device::zeus2_fifo_process(const UINT32 *data, int numwords)
return FALSE; return FALSE;
if (log_fifo) if (log_fifo)
log_fifo_command(data, numwords, ""); log_fifo_command(data, numwords, "");
//zeus2_draw_model(data[1], data[0] & 0xffff, log_fifo); zeus2_draw_model(data[1], data[0] & 0xffff, log_fifo);
zeus2_draw_model(data[1], data[0] & 0x3fff, log_fifo);
break; break;
// 0x2d; set direct render pixels location (atlantis) // 0x2d; set direct render pixels location (atlantis)
@ -872,7 +978,7 @@ int zeus2_device::zeus2_fifo_process(const UINT32 *data, int numwords)
return FALSE; return FALSE;
if (log_fifo) if (log_fifo)
log_fifo_command(data, numwords, "\n"); log_fifo_command(data, numwords, "\n");
m_renderPtr = frame_addr_from_phys_addr(data[1]); m_renderAddr = frame_addr_from_phys_addr(data[1]);
//zeus2_draw_model(data[1], data[0] & 0xff, log_fifo); //zeus2_draw_model(data[1], data[0] & 0xff, log_fifo);
break; break;
@ -884,20 +990,19 @@ int zeus2_device::zeus2_fifo_process(const UINT32 *data, int numwords)
case 0x32: case 0x32:
if (log_fifo) if (log_fifo)
log_fifo_command(data, numwords, " sync? \n"); log_fifo_command(data, numwords, " sync? \n");
//zeus_quad_size = 10;
break; break;
/* 0x38: direct render quad (crusnexo) */ /* 0x38: direct render quad (crusnexo) */
// 0x38: ?? (atlantis) // 0x38: direct write to frame buffer (atlantis)
case 0x38: case 0x38:
if (data[0] == 0x38000000) { if (data[0] == 0x38000000) {
if (numwords < 3) if (numwords < 3)
return FALSE; return FALSE;
// Direct write to frame buffer // Direct write to frame buffer
m_frameColor[m_renderPtr++] = conv_rgb555_to_rgb32((UINT16)data[1]); m_frameColor[m_renderAddr++] = conv_rgb555_to_rgb32((UINT16)data[1]);
m_frameColor[m_renderPtr++] = conv_rgb555_to_rgb32((UINT16)(data[1] >> 16)); m_frameColor[m_renderAddr++] = conv_rgb555_to_rgb32((UINT16)(data[1] >> 16));
m_frameColor[m_renderPtr++] = conv_rgb555_to_rgb32((UINT16)data[2]); m_frameColor[m_renderAddr++] = conv_rgb555_to_rgb32((UINT16)data[2]);
m_frameColor[m_renderPtr++] = conv_rgb555_to_rgb32((UINT16)(data[2] >> 16)); m_frameColor[m_renderAddr++] = conv_rgb555_to_rgb32((UINT16)(data[2] >> 16));
} else if (numwords < 12) } else if (numwords < 12)
return FALSE; return FALSE;
//print_fifo_command(data, numwords, "\n"); //print_fifo_command(data, numwords, "\n");
@ -905,14 +1010,8 @@ int zeus2_device::zeus2_fifo_process(const UINT32 *data, int numwords)
log_fifo_command(data, numwords, "\n"); log_fifo_command(data, numwords, "\n");
break; break;
/* 0x40: ???? */
case 0x40:
if (log_fifo)
log_fifo_command(data, numwords, "\n");
break;
default: default:
if (data[0] != 0x2c0) if (1 || data[0] != 0x2c0)
{ {
printf("Unknown command %08X\n", data[0]); printf("Unknown command %08X\n", data[0]);
if (log_fifo) if (log_fifo)
@ -934,13 +1033,10 @@ void zeus2_device::zeus2_draw_model(UINT32 baseaddr, UINT16 count, int logit)
int model_done = FALSE; int model_done = FALSE;
UINT32 texdata = 0; UINT32 texdata = 0;
// need to only set the quad size at the start of model ??
zeus_quad_size = (m_renderMode & 0x020000) ? 14 : 10;
if (logit) if (logit)
logerror(" -- model @ %08X, len %04X\n", baseaddr, count); logerror(" -- model @ %08X, len %04X\n", baseaddr, count);
if (count > 0x1000) if (count > 0xc800)
fatalerror("Extreme count\n"); fatalerror("Extreme count\n");
while (baseaddr != 0 && !model_done) while (baseaddr != 0 && !model_done)
@ -956,6 +1052,7 @@ void zeus2_device::zeus2_draw_model(UINT32 baseaddr, UINT16 count, int logit)
{ {
int countneeded = 2; int countneeded = 2;
UINT8 cmd; UINT8 cmd;
UINT8 subCmd;
/* accumulate 2 words of data */ /* accumulate 2 words of data */
databuffer[databufcount++] = WAVERAM_READ32(base, curoffs * 2 + 0); databuffer[databufcount++] = WAVERAM_READ32(base, curoffs * 2 + 0);
@ -963,25 +1060,32 @@ void zeus2_device::zeus2_draw_model(UINT32 baseaddr, UINT16 count, int logit)
/* if this is enough, process the command */ /* if this is enough, process the command */
cmd = databuffer[0] >> 24; cmd = databuffer[0] >> 24;
if ((cmd == 0x38) || (cmd == 0x2d)) subCmd = (databuffer[1] >> 24) & 0xfc;
if ((cmd == 0x38 && subCmd != 0x38) || (cmd == 0x2d)) {
countneeded = zeus_quad_size; countneeded = zeus_quad_size;
}
if (databufcount == countneeded) if (databufcount == countneeded)
{ {
/* handle logging of the command */ /* handle logging of the command */
if (logit) if (logit)
{ {
//if ((cmd == 0x38) || (cmd == 0x2d)) //if ((cmd == 0x38) || (cmd == 0x2d))
// log_render_info(); // log_render_info(texdata);
int offs; if (cmd != 0x00 || (cmd == 0x00 && curoffs == count)) {
logerror("\t"); logerror("\t");
for (offs = 0; offs < databufcount; offs++) for (int offs = 0; offs < databufcount; offs++)
logerror("%08X ", databuffer[offs]); logerror("%08X ", databuffer[offs]);
logerror("-- "); logerror("-- ");
}
} }
/* handle the command */ /* handle the command */
switch (cmd) switch (cmd)
{ {
case 0x00: // crusnexo
if (logit && curoffs == count)
logerror(" end cmd 00\n");
case 0x21: /* thegrid */ case 0x21: /* thegrid */
case 0x22: /* crusnexo */ case 0x22: /* crusnexo */
if (((databuffer[0] >> 16) & 0xff) == 0x9b) if (((databuffer[0] >> 16) & 0xff) == 0x9b)
@ -1012,15 +1116,52 @@ void zeus2_device::zeus2_draw_model(UINT32 baseaddr, UINT16 count, int logit)
break; break;
case 0x38: /* crusnexo/thegrid */ case 0x38: /* crusnexo/thegrid */
poly->zeus2_draw_quad(databuffer, texdata, logit); if (subCmd == 0x38) {
// Direct commands from waveram buffer
//UINT32 cmdData[2];
//for (int subIndex = 0; subIndex < 2; ++subIndex) {
// UINT32 offset = (databuffer[subIndex] & 0xff) * 6;
// //printf("directRead curoffs: 0x%X\n", curoffs);
// for (int cmdIndex = 0; cmdIndex < 3; ++cmdIndex) {
// cmdData[0] = m_directCmd[offset + cmdIndex * 2 + 0];
// cmdData[1] = m_directCmd[offset + cmdIndex * 2 + 1];
// if (curoffs < 0x40)
// printf("directRead curoffs: 0x%X cmdData %08X %08X\n", curoffs, cmdData[0], cmdData[1]);
// if (cmdData[0] != 0 && cmdData[1] != 0) {
// // Error check
// if (cmdData[0] != 0x58 && cmdData[0] != 0x5A) {
// if (curoffs < 0x20)
// printf("case38 error curoffs: 0x%X cmdData %08X %08X\n", curoffs, cmdData[0], cmdData[1]);
// }
// else {
// zeus2_register32_w(cmdData[0] & 0x7f, cmdData[1], logit);
// }
// }
// }
//}
//void *palbase = waveram0_ptr_from_expanded_addr(m_zeusbase[0x41]);
//UINT8 texel = databuffer[0];
//UINT32 color = WAVERAM_READ16(palbase, texel);
//m_frameDepth[m_renderAddr] = 0;
//m_frameColor[m_renderAddr++] = conv_rgb555_to_rgb32(color);
//texel = databuffer[1];
//color = WAVERAM_READ16(palbase, texel);
//m_frameDepth[m_renderAddr] = 0;
//m_frameColor[m_renderAddr++] = conv_rgb555_to_rgb32(color);
//m_frameDepth[m_renderAddr] = 0;
//m_frameColor[m_renderAddr++] = databuffer[0] & 0x00ffffff;
//m_frameDepth[m_renderAddr] = 0;
//m_frameColor[m_renderAddr++] = databuffer[1] & 0x00ffffff;
//if (logit)
// if ((curoffs + 1) % 16 == 0)
// logerror("\n");
}
else {
poly->zeus2_draw_quad(databuffer, texdata, logit);
}
break; break;
default: default:
//if (quadsize == 10)
//{
// logerror("Correcting quad size\n");
// quadsize = 14;
//}
if (logit) if (logit)
logerror("unknown model data\n"); logerror("unknown model data\n");
break; break;
@ -1030,6 +1171,16 @@ void zeus2_device::zeus2_draw_model(UINT32 baseaddr, UINT16 count, int logit)
databufcount = 0; databufcount = 0;
} }
} }
// Log unused data
if (databufcount != 0) {
if (logit)
{
logerror("\t");
for (int offs = 0; offs < databufcount; offs++)
logerror("%08X ", databuffer[offs]);
logerror("-- Unused data\n");
}
}
} }
} }
@ -1136,7 +1287,7 @@ void zeus2_renderer::zeus2_draw_quad(const UINT32 *databuffer, UINT32 texdata, i
vert[3].p[2] = (databuffer[9] >> 24) & 0xff; vert[3].p[2] = (databuffer[9] >> 24) & 0xff;
} }
else { else {
//printf("renderMode: %06X\n", m_state->m_renderMode); //printf("R40: %06X\n", m_state->m_renderRegs[0x40]);
vert[0].x = (INT16)databuffer[2]; vert[0].x = (INT16)databuffer[2];
vert[0].y = (INT16)databuffer[3]; vert[0].y = (INT16)databuffer[3];
vert[0].p[0] = (INT16)databuffer[6]; vert[0].p[0] = (INT16)databuffer[6];
@ -1234,15 +1385,10 @@ void zeus2_renderer::zeus2_draw_quad(const UINT32 *databuffer, UINT32 texdata, i
vert[i].p[0] += m_state->zbase; vert[i].p[0] += m_state->zbase;
else { else {
int shift; int shift;
// Not sure why but atlantis coordinates are scaled differently shift = 1024 >> m_state->m_zeusbase[0x6c];
if (0 && m_state->m_atlantis)
shift = 2048 >> m_state->m_zeusbase[0x6c];
else
shift = 1024 >> m_state->m_zeusbase[0x6c];
//int shift = 8 << ((m_state->m_renderRegs[0x14] >> 4) & 0xf);
vert[i].p[0] += shift; vert[i].p[0] += shift;
} }
//vert[i].p[0] *= 2.0f;
vert[i].p[2] += texdata >> 16; vert[i].p[2] += texdata >> 16;
vert[i].p[1] *= 256.0f; vert[i].p[1] *= 256.0f;
vert[i].p[2] *= 256.0f; vert[i].p[2] *= 256.0f;
@ -1280,8 +1426,8 @@ void zeus2_renderer::zeus2_draw_quad(const UINT32 *databuffer, UINT32 texdata, i
unknown[0], unknown[1], unknown[2], unknown[3], unknown[4], unknown[5], unknown[6], unknown[7], unknown[0], unknown[1], unknown[2], unknown[3], unknown[4], unknown[5], unknown[6], unknown[7],
unknownFloat[0], unknownFloat[1], unknownFloat[2], unknownFloat[3]); unknownFloat[0], unknownFloat[1], unknownFloat[2], unknownFloat[3]);
} }
bool enable_perspective = true;// !(m_state->m_renderRegs[0x14] & 0x80); bool enable_perspective = true; // !(m_state->m_renderRegs[0x14] & 0x1);
float clipVal = enable_perspective ? 1.0f / 512.0f / 4.0f : -1.0f; float clipVal = enable_perspective ? 1.0f / 512.0f / 4.0f : 0.0f;
numverts = this->zclip_if_less(4, &vert[0], &clipvert[0], 4, clipVal); numverts = this->zclip_if_less(4, &vert[0], &clipvert[0], 4, clipVal);
if (numverts < 3) if (numverts < 3)
return; return;
@ -1289,7 +1435,7 @@ void zeus2_renderer::zeus2_draw_quad(const UINT32 *databuffer, UINT32 texdata, i
float xOrigin = reinterpret_cast<float&>(m_state->m_zeusbase[0x6a]); float xOrigin = reinterpret_cast<float&>(m_state->m_zeusbase[0x6a]);
float yOrigin = reinterpret_cast<float&>(m_state->m_zeusbase[0x6b]); float yOrigin = reinterpret_cast<float&>(m_state->m_zeusbase[0x6b]);
float oozBase = (m_state->m_atlantis) ? 1024.0f : 512.0f; float oozBase = (m_state->m_atlantis) ? 1024.0f : (m_state->m_thegrid) ? 512.0f : 512.0f;
maxx = maxy = -1000.0f; maxx = maxy = -1000.0f;
for (i = 0; i < numverts; i++) for (i = 0; i < numverts; i++)
@ -1387,15 +1533,15 @@ void zeus2_renderer::zeus2_draw_quad(const UINT32 *databuffer, UINT32 texdata, i
//} //}
extra.solidcolor = 0;//m_zeusbase[0x00] & 0x7fff; extra.solidcolor = 0;//m_zeusbase[0x00] & 0x7fff;
extra.zoffset = m_state->m_renderRegs[0x15]; extra.zoffset = m_state->m_renderRegs[0x15] & 0xffff;
extra.alpha = 0;//m_zeusbase[0x4e]; extra.alpha = 0;//m_zeusbase[0x4e];
extra.transcolor = 0x100; // !(texmode & 100) ? 0 : 0x100; extra.transcolor = 0x100; // !(texmode & 100) ? 0 : 0x100;
extra.texbase = WAVERAM_BLOCK0_EXT(m_state->zeus_texbase); extra.texbase = WAVERAM_BLOCK0_EXT(m_state->zeus_texbase);
extra.palbase = m_state->waveram0_ptr_from_expanded_addr(m_state->m_zeusbase[0x41]); extra.palbase = m_state->waveram0_ptr_from_expanded_addr(m_state->m_zeusbase[0x41]);
//extra.depth_test_enable = !(m_state->m_renderMode & 0x020000); //extra.depth_test_enable = !(m_state->m_renderRegs[0x40] & 0x020000);
// crusnexo text is R14=0x4062 // crusnexo text is R14=0x4062
extra.depth_test_enable = !(m_state->m_renderRegs[0x14] & 0x000020); extra.depth_test_enable = !(m_state->m_renderRegs[0x14] & 0x000020);
//extra.depth_test_enable = !(m_state->m_renderMode & 0x000002); //extra.depth_test_enable = !(m_state->m_renderRegs[0x40] & 0x000002);
//extra.depth_test_enable = true; // (texmode & 0x0010); //extra.depth_test_enable = true; // (texmode & 0x0010);
extra.depth_write_enable = true; extra.depth_write_enable = true;
@ -1428,7 +1574,7 @@ void zeus2_renderer::render_poly_8bit(INT32 scanline, const extent_t& extent, co
INT32 dvdx = extent.param[2].dpdx; INT32 dvdx = extent.param[2].dpdx;
// INT32 didx = extent.param[3].dpdx; // INT32 didx = extent.param[3].dpdx;
const void *texbase = object.texbase; const void *texbase = object.texbase;
const void *palbase = object.palbase; //const void *palbase = object.palbase;
UINT16 transcolor = object.transcolor; UINT16 transcolor = object.transcolor;
int texwidth = object.texwidth; int texwidth = object.texwidth;
int x; int x;
@ -1462,14 +1608,18 @@ void zeus2_renderer::render_poly_8bit(INT32 scanline, const extent_t& extent, co
UINT8 texel3 = m_state->get_texel_8bit(texbase, v1, u1, texwidth); UINT8 texel3 = m_state->get_texel_8bit(texbase, v1, u1, texwidth);
if (texel0 != transcolor) if (texel0 != transcolor)
{ {
UINT32 color0 = WAVERAM_READ16(palbase, texel0); UINT32 color0 = m_state->m_pal_table[texel0];
UINT32 color1 = WAVERAM_READ16(palbase, texel1); UINT32 color1 = m_state->m_pal_table[texel1];
UINT32 color2 = WAVERAM_READ16(palbase, texel2); UINT32 color2 = m_state->m_pal_table[texel2];
UINT32 color3 = WAVERAM_READ16(palbase, texel3); UINT32 color3 = m_state->m_pal_table[texel3];
color0 = ((color0 & 0x7c00) << 9) | ((color0 & 0x3e0) << 6) | ((color0 & 0x1f) << 3); //UINT32 color0 = WAVERAM_READ16(palbase, texel0);
color1 = ((color1 & 0x7c00) << 9) | ((color1 & 0x3e0) << 6) | ((color1 & 0x1f) << 3); //UINT32 color1 = WAVERAM_READ16(palbase, texel1);
color2 = ((color2 & 0x7c00) << 9) | ((color2 & 0x3e0) << 6) | ((color2 & 0x1f) << 3); //UINT32 color2 = WAVERAM_READ16(palbase, texel2);
color3 = ((color3 & 0x7c00) << 9) | ((color3 & 0x3e0) << 6) | ((color3 & 0x1f) << 3); //UINT32 color3 = WAVERAM_READ16(palbase, texel3);
//color0 = ((color0 & 0x7c00) << 9) | ((color0 & 0x3e0) << 6) | ((color0 & 0x1f) << 3);
//color1 = ((color1 & 0x7c00) << 9) | ((color1 & 0x3e0) << 6) | ((color1 & 0x1f) << 3);
//color2 = ((color2 & 0x7c00) << 9) | ((color2 & 0x3e0) << 6) | ((color2 & 0x1f) << 3);
//color3 = ((color3 & 0x7c00) << 9) | ((color3 & 0x3e0) << 6) | ((color3 & 0x1f) << 3);
rgb_t filtered = rgbaint_t::bilinear_filter(color0, color1, color2, color3, curu, curv); rgb_t filtered = rgbaint_t::bilinear_filter(color0, color1, color2, color3, curu, curv);
//WAVERAM_WRITEPIX(m_state->zeus_renderbase, scanline, x, filtered); //WAVERAM_WRITEPIX(m_state->zeus_renderbase, scanline, x, filtered);
//*depthptr = depth; //*depthptr = depth;
@ -1505,12 +1655,15 @@ void zeus2_device::print_fifo_command(const UINT32 *data, int numwords, const ch
printf("%s", suffix); printf("%s", suffix);
} }
void zeus2_device::log_render_info() void zeus2_device::log_render_info(UINT32 texdata)
{ {
logerror("-- RMode = %08X", m_renderMode); logerror("-- RMode0 R40 = %08X texdata = %08X", m_renderRegs[0x40], texdata);
for (int i = 1; i <= 0x15; ++i) logerror("\n-- RMode1 ");
for (int i = 1; i <= 0x9; ++i)
logerror(" R%02X=%06X", i, m_renderRegs[i]); logerror(" R%02X=%06X", i, m_renderRegs[i]);
logerror("\n-- RMode "); for (int i = 0xa; i <= 0x15; ++i)
logerror(" R%02X=%06X", i, m_renderRegs[i]);
logerror("\n-- RMode2 ");
for (int i = 0x63; i <= 0x6f; ++i) for (int i = 0x63; i <= 0x6f; ++i)
logerror(" %02X=%08X", i, m_zeusbase[i]); logerror(" %02X=%08X", i, m_zeusbase[i]);
logerror("\n"); logerror("\n");

37
src/devices/video/zeus2.h
View File

@ -53,10 +53,8 @@ struct zeus2_poly_extra_data
* Macros * Macros
*************************************/ *************************************/
#define WAVERAM_BLOCK0(blocknum) ((void *)((UINT8 *)waveram[0] + 8 * (blocknum))) #define WAVERAM_BLOCK0(blocknum) ((void *)((UINT8 *)waveram + 8 * (blocknum)))
#define WAVERAM_BLOCK1(blocknum) ((void *)((UINT8 *)waveram[1] + 12 * (blocknum))) #define WAVERAM_BLOCK0_EXT(blocknum) ((void *)((UINT8 *)m_state->waveram + 8 * (blocknum)))
#define WAVERAM_BLOCK0_EXT(blocknum) ((void *)((UINT8 *)m_state->waveram[0] + 8 * (blocknum)))
#define WAVERAM_BLOCK1_EXT(blocknum) ((void *)((UINT8 *)m_state->waveram[1] + 12 * (blocknum)))
#define WAVERAM_PTR8(base, bytenum) ((UINT8 *)(base) + BYTE4_XOR_LE(bytenum)) #define WAVERAM_PTR8(base, bytenum) ((UINT8 *)(base) + BYTE4_XOR_LE(bytenum))
#define WAVERAM_READ8(base, bytenum) (*WAVERAM_PTR8(base, bytenum)) #define WAVERAM_READ8(base, bytenum) (*WAVERAM_PTR8(base, bytenum))
@ -70,17 +68,6 @@ struct zeus2_poly_extra_data
#define WAVERAM_READ32(base, dwordnum) (*WAVERAM_PTR32(base, dwordnum)) #define WAVERAM_READ32(base, dwordnum) (*WAVERAM_PTR32(base, dwordnum))
#define WAVERAM_WRITE32(base, dwordnum, data) do { *WAVERAM_PTR32(base, dwordnum) = (data); } while (0) #define WAVERAM_WRITE32(base, dwordnum, data) do { *WAVERAM_PTR32(base, dwordnum) = (data); } while (0)
#define PIXYX_TO_DWORDNUM(y, x) (((((y) & 0x1ff) << 8) | (((x) & 0x1fe) >> 1)) * 3 + ((x) & 1))
#define DEPTHYX_TO_DWORDNUM(y, x) (PIXYX_TO_DWORDNUM(y, (x) & ~1) + 2)
#define WAVERAM_PTRPIX(base, y, x) WAVERAM_PTR32(base, PIXYX_TO_DWORDNUM(y, x))
#define WAVERAM_READPIX(base, y, x) (*WAVERAM_PTRPIX(base, y, x))
#define WAVERAM_WRITEPIX(base, y, x, color) do { *WAVERAM_PTRPIX(base, y, x) = (color); } while (0)
#define WAVERAM_PTRDEPTH(base, y, x) WAVERAM_PTR16(base, DEPTHYX_TO_DWORDNUM(y, x) * 2 + (x & 1))
#define WAVERAM_READDEPTH(base, y, x) (*WAVERAM_PTRDEPTH(base, y, x))
#define WAVERAM_WRITEDEPTH(base, y, x, color) do { *WAVERAM_PTRDEPTH(base, y, x) = (color); } while (0)
/************************************* /*************************************
* Polygon renderer * Polygon renderer
*************************************/ *************************************/
@ -135,7 +122,7 @@ public:
int m_atlantis; // Used to switch to using IEEE754 floating point format for atlantis int m_atlantis; // Used to switch to using IEEE754 floating point format for atlantis
UINT32 m_zeusbase[0x80]; UINT32 m_zeusbase[0x80];
UINT32 m_renderRegs[0x40]; UINT32 m_renderRegs[0x50];
zeus2_renderer* poly; zeus2_renderer* poly;
@ -145,13 +132,15 @@ public:
float zeus_point[3]; float zeus_point[3];
float zeus_point2[3]; float zeus_point2[3];
UINT32 zeus_texbase; UINT32 zeus_texbase;
UINT32 m_renderMode;
int zeus_quad_size; int zeus_quad_size;
UINT32 m_renderPtr; UINT32 m_renderAddr;
bool m_thegrid;
UINT32 *m_directCmd;
UINT32 *waveram[2]; UINT32 *waveram;
std::unique_ptr<UINT32[]> m_frameColor; std::unique_ptr<UINT32[]> m_frameColor;
std::unique_ptr<UINT16[]> m_frameDepth; std::unique_ptr<UINT16[]> m_frameDepth;
UINT32 m_pal_table[0x100];
emu_timer *int_timer; emu_timer *int_timer;
emu_timer *vblank_timer; emu_timer *vblank_timer;
@ -171,10 +160,11 @@ private:
void zeus2_register_update(offs_t offset, UINT32 oldval, int logit); void zeus2_register_update(offs_t offset, UINT32 oldval, int logit);
int zeus2_fifo_process(const UINT32 *data, int numwords); int zeus2_fifo_process(const UINT32 *data, int numwords);
void zeus2_pointer_write(UINT8 which, UINT32 value, int logit); void zeus2_pointer_write(UINT8 which, UINT32 value, int logit);
void load_pal_table(void *wavePtr, UINT32 ctrl, int logit);
void zeus2_draw_model(UINT32 baseaddr, UINT16 count, int logit); void zeus2_draw_model(UINT32 baseaddr, UINT16 count, int logit);
void log_fifo_command(const UINT32 *data, int numwords, const char *suffix); void log_fifo_command(const UINT32 *data, int numwords, const char *suffix);
void print_fifo_command(const UINT32 *data, int numwords, const char *suffix); void print_fifo_command(const UINT32 *data, int numwords, const char *suffix);
void log_render_info(); void log_render_info(UINT32 texdata);
/************************************* /*************************************
* Member variables * Member variables
*************************************/ *************************************/
@ -188,6 +178,7 @@ private:
int m_yScale; int m_yScale;
#if TRACK_REG_USAGE #if TRACK_REG_USAGE
struct reg_info struct reg_info
{ {
@ -284,12 +275,6 @@ public:
return WAVERAM_BLOCK0(blocknum); return WAVERAM_BLOCK0(blocknum);
} }
inline void *waveram1_ptr_from_expanded_addr(UINT32 addr)
{
UINT32 blocknum = (addr % WAVERAM1_WIDTH) + ((addr >> 16) % WAVERAM1_HEIGHT) * WAVERAM1_WIDTH;
return WAVERAM_BLOCK1(blocknum);
}
#ifdef UNUSED_FUNCTION #ifdef UNUSED_FUNCTION
inline void *waveram0_ptr_from_texture_addr(UINT32 addr, int width) inline void *waveram0_ptr_from_texture_addr(UINT32 addr, int width)
{ {

1
src/mame/drivers/atlantis.cpp
View File

@ -74,7 +74,6 @@
#define IDE_IRQ_NUM MIPS3_IRQ4 #define IDE_IRQ_NUM MIPS3_IRQ4
#define LOG_RTC (0) #define LOG_RTC (0)
#define LOG_RED (0)
#define LOG_PORT (0) #define LOG_PORT (0)
#define LOG_IRQ (0) #define LOG_IRQ (0)

17
src/mame/drivers/midzeus.cpp
View File

@ -31,13 +31,11 @@ The Grid v1.2 10/18/2000
#include "cpu/adsp2100/adsp2100.h" #include "cpu/adsp2100/adsp2100.h"
#include "cpu/pic16c5x/pic16c5x.h" #include "cpu/pic16c5x/pic16c5x.h"
#include "includes/midzeus.h" #include "includes/midzeus.h"
#include "includes/midzeus2.h"
#include "machine/midwayic.h" #include "machine/midwayic.h"
#include "audio/dcs.h" #include "audio/dcs.h"
#include "machine/nvram.h" #include "machine/nvram.h"
#include "crusnexo.lh" #include "crusnexo.lh"
#include "video/zeus2.h"
#define CPU_CLOCK XTAL_60MHz #define CPU_CLOCK XTAL_60MHz
@ -61,6 +59,21 @@ static UINT8 cmos_protected;
static emu_timer *timer[2]; static emu_timer *timer[2];
/*************************************************************************
Driver for Midway Zeus2 games
**************************************************************************/
#include "video/zeus2.h"
class midzeus2_state : public midzeus_state
{
public:
midzeus2_state(const machine_config &mconfig, device_type type, const char *tag)
: midzeus_state(mconfig, type, tag), m_zeus(*this, "zeus2") { }
required_device<zeus2_device> m_zeus;
DECLARE_WRITE_LINE_MEMBER(zeus_irq);
private:
};