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

zeus2: WIP Fixed waveram0 write. Change conversion to screen coordinates. Add initial blending. (nw)

Browse Source
This commit is contained in:
Ted Green 2017-04-02 17:57:02 -06:00
parent 51f57906fa
commit 773045e758
2 changed files with 720 additions and 697 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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

@ -21,7 +21,7 @@
#define DUMP_WAVE_RAM 0 #define DUMP_WAVE_RAM 0
#define TRACK_REG_USAGE 0 #define TRACK_REG_USAGE 0
#define PRINT_TEX_INFO 0 #define PRINT_TEX_INFO 1
#define WAVERAM0_WIDTH 1024 #define WAVERAM0_WIDTH 1024
#define WAVERAM0_HEIGHT 2048 #define WAVERAM0_HEIGHT 2048
@ -42,13 +42,18 @@ struct zeus2_poly_extra_data
uint16_t transcolor; uint16_t transcolor;
uint16_t texwidth; uint16_t texwidth;
uint16_t color; uint16_t color;
uint32_t alpha; uint32_t srcAlpha;
uint32_t dstAlpha;
uint32_t ctrl_word; uint32_t ctrl_word;
bool texture_alpha;
bool blend_enable; bool blend_enable;
bool depth_min_enable; bool depth_min_enable;
bool depth_test_enable; bool depth_test_enable;
bool depth_write_enable; bool depth_write_enable;
bool depth_clear_enable;
uint8_t(*get_texel)(const void *, int, int, int); uint8_t(*get_texel)(const void *, int, int, int);
uint8_t(*get_alpha)(const void *, int, int, int);
}; };
/************************************* /*************************************
@ -133,8 +138,8 @@ public:
int m_palSize; int m_palSize;
int m_zbufmin; int m_zbufmin;
float zeus_matrix[3][3]; float zeus_matrix[3][3];
float zeus_point[3]; float zeus_trans[4];
float zeus_point2[3]; float zeus_light[3];
uint32_t zeus_texbase; uint32_t zeus_texbase;
int zeus_quad_size; int zeus_quad_size;
@ -145,6 +150,7 @@ public:
uint32_t m_ucode[0x200]; uint32_t m_ucode[0x200];
uint32_t m_curUCodeSrc; uint32_t m_curUCodeSrc;
uint32_t m_curPalTableSrc; uint32_t m_curPalTableSrc;
uint32_t m_texmodeReg;
emu_timer *int_timer; emu_timer *int_timer;
emu_timer *vblank_timer; emu_timer *vblank_timer;
@ -225,8 +231,18 @@ public:
inline uint32_t frame_addr_from_xy(uint32_t x, uint32_t y, bool render) inline uint32_t frame_addr_from_xy(uint32_t x, uint32_t y, bool render)
{ {
uint32_t addr = render ? frame_addr_from_phys_addr(m_renderRegs[0x4] << (15 + m_yScale)) uint32_t addr;
: frame_addr_from_phys_addr((m_zeusbase[0x38] >> 1) << (m_yScale << 1)); if (render) {
// Rendering is y location
addr = m_renderRegs[0x4] << (9 + m_yScale);
}
else {
// y.16:x.16 row/col
// Ignore col for now
addr = m_zeusbase[0x38] >> (16 - 9 - 2 * m_yScale);
}
//uint32_t addr = render ? frame_addr_from_phys_addr(m_renderRegs[0x4] << (15 + m_yScale))
// : frame_addr_from_phys_addr((m_zeusbase[0x38] >> 1) << (m_yScale << 1));
addr += (y << (9 + m_yScale)) + x; addr += (y << (9 + m_yScale)) + x;
return addr; return addr;
} }
@ -280,6 +296,8 @@ public:
if (m_zeusbase[0x5e] & 0x40) if (m_zeusbase[0x5e] & 0x40)
{ {
m_zeusbase[0x51]++; m_zeusbase[0x51]++;
//m_zeusbase[0x51] += (m_zeusbase[0x51] & 0x200) << 7;
//m_zeusbase[0x51] &= ~0xfe00;
m_zeusbase[0x51] += (m_zeusbase[0x51] & 0x200) << 7; m_zeusbase[0x51] += (m_zeusbase[0x51] & 0x200) << 7;
m_zeusbase[0x51] &= ~0xfe00; m_zeusbase[0x51] &= ~0xfe00;
} }
@ -311,7 +329,14 @@ public:
{ {
return ((color & 0x7c00) << 9) | ((color & 0x3e0) << 6) | ((color & 0x8000) >> 5) | ((color & 0x1f) << 3); return ((color & 0x7c00) << 9) | ((color & 0x3e0) << 6) | ((color & 0x8000) >> 5) | ((color & 0x1f) << 3);
} }
inline uint32_t conv_rgb332_to_rgb32(uint8_t color)
{
uint32_t result;
result = ((((color) >> 0) & 0xe0) | (((color) >> 3) & 0x1c) | (((color) >> 6) & 0x03)) << 16;
result |= ((((color) << 3) & 0xe0) | (((color) >> 0) & 0x1c) | (((color) >> 3) & 0x03)) << 8;
result |= ((((color) << 6) & 0xc0) | (((color) << 4) & 0x30) | (((color) << 2) & 0x0c) | (((color) << 0) & 0x03)) << 0;
return result;
}
#ifdef UNUSED_FUNCTION #ifdef UNUSED_FUNCTION
inline void WAVERAM_plot(int y, int x, uint32_t color) inline void WAVERAM_plot(int y, int x, uint32_t color)
{ {
@ -392,7 +417,21 @@ public:
uint32_t byteoffs = (y / 2) * (width * 2) + ((x / 2) << 2) + ((y & 1) << 1) + (x & 1); uint32_t byteoffs = (y / 2) * (width * 2) + ((x / 2) << 2) + ((y & 1) << 1) + (x & 1);
// Only grab RGB value for now // Only grab RGB value for now
byteoffs <<= 1; byteoffs <<= 1;
return WAVERAM_READ8(base, byteoffs); return WAVERAM_READ8(base, byteoffs + 0);
}
static inline uint8_t get_alpha_8bit_2x2_alpha(const void *base, int y, int x, int width)
{
uint32_t byteoffs = (y / 2) * (width * 2) + ((x / 2) << 2) + ((y & 1) << 1) + (x & 1);
// Only grab Alpha value for now
byteoffs <<= 1;
return WAVERAM_READ8(base, byteoffs + 1);
}
// 2x2 block size of r5g5r5 in 64 bits
static inline uint32_t get_rgb555(const void *base, int y, int x, int width)
{
uint32_t wordoffs = (y / 2) * (width * 2) + ((x / 2) << 2) + ((y & 1) << 1) + (x & 1);
uint16_t color = WAVERAM_READ16(base, wordoffs);
return ((color & 0x7c00) << 9) | ((color & 0x3e0) << 6) | ((color & 0x1f) << 3);
} }
}; };