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

zeus2: Added texture lookup for RGB555 direct color type. (nw)

Browse Source
This commit is contained in:
Ted Green 2017-04-03 07:22:17 -06:00
parent 6f5cef10c3
commit 2dbbb19a49
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1284,7 +1284,6 @@ void zeus2_device::zeus2_draw_model(uint32_t baseaddr, uint16_t count, int logit
{ {
int countneeded = 2; int countneeded = 2;
uint8_t cmd; uint8_t cmd;
// uint8_t 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);
@ -1292,7 +1291,6 @@ void zeus2_device::zeus2_draw_model(uint32_t baseaddr, uint16_t 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;
// subCmd = (databuffer[1] >> 24) & 0xfc;
if ((cmd == 0x38) || (cmd == 0x2d)) { if ((cmd == 0x38) || (cmd == 0x2d)) {
countneeded = zeus_quad_size; countneeded = zeus_quad_size;
@ -1643,6 +1641,7 @@ void zeus2_renderer::zeus2_draw_quad(const uint32_t *databuffer, uint32_t texdat
extra.transcolor = 0; // (texmode & 0x100) ? 0 : 0x100; extra.transcolor = 0; // (texmode & 0x100) ? 0 : 0x100;
extra.texbase = WAVERAM_BLOCK0_EXT(m_state->zeus_texbase); extra.texbase = WAVERAM_BLOCK0_EXT(m_state->zeus_texbase);
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_renderRegs[0x14] & 0x008000);
extra.depth_write_enable = true; // (m_state->m_renderRegs[0x14] & 0x004000); extra.depth_write_enable = true; // (m_state->m_renderRegs[0x14] & 0x004000);
extra.depth_clear_enable = false; // (m_state->m_renderRegs[0x14] & 0x001000); extra.depth_clear_enable = false; // (m_state->m_renderRegs[0x14] & 0x001000);
// 021e0e = blend with texture alpha, 020202 blend src / dst alpha // 021e0e = blend with texture alpha, 020202 blend src / dst alpha
@ -1650,6 +1649,7 @@ void zeus2_renderer::zeus2_draw_quad(const uint32_t *databuffer, uint32_t texdat
extra.srcAlpha = m_state->m_renderRegs[0x0c]; extra.srcAlpha = m_state->m_renderRegs[0x0c];
extra.dstAlpha = m_state->m_renderRegs[0x0d]; extra.dstAlpha = m_state->m_renderRegs[0x0d];
extra.texture_alpha = false; extra.texture_alpha = false;
extra.texture_rgb555 = false;
switch (texmode & 0x3) { switch (texmode & 0x3) {
case 0: case 0:
extra.get_texel = m_state->get_texel_4bit_2x2; extra.get_texel = m_state->get_texel_4bit_2x2;
@ -1660,7 +1660,7 @@ void zeus2_renderer::zeus2_draw_quad(const uint32_t *databuffer, uint32_t texdat
break; break;
case 2: case 2:
// Seems to select texture with embedded alpha // Seems to select texture with embedded alpha
if (1) { if (texmode & 0x80) {
// Texel , Alpha // Texel , Alpha
extra.get_texel = m_state->get_texel_8bit_2x2_alpha; extra.get_texel = m_state->get_texel_8bit_2x2_alpha;
extra.texture_alpha = true; extra.texture_alpha = true;
@ -1668,6 +1668,9 @@ void zeus2_renderer::zeus2_draw_quad(const uint32_t *databuffer, uint32_t texdat
extra.depth_test_enable = false; extra.depth_test_enable = false;
extra.depth_write_enable = false; extra.depth_write_enable = false;
} }
else {
extra.texture_rgb555 = true;
}
break; break;
default: default:
m_state->logerror("unknown texel type"); m_state->logerror("unknown texel type");
@ -1734,8 +1737,13 @@ void zeus2_renderer::render_poly_8bit(int32_t scanline, const extent_t& extent,
int v0 = (curv >> 8);// &255; int v0 = (curv >> 8);// &255;
int u1 = (u0 + 1); int u1 = (u0 + 1);
int v1 = (v0 + 1); int v1 = (v0 + 1);
if (object.texture_rgb555) {
// Rendering for textures with direct color
rgb_t srcColor = m_state->get_rgb555(texbase, v0, u0, texwidth);
colorptr[x] = srcColor;
}
else if (object.texture_alpha) {
// Rendering for textures with embedded alpha // Rendering for textures with embedded alpha
if (object.texture_alpha) {
// To bilinear filter or not to bilinear filter // To bilinear filter or not to bilinear filter
if (0) { if (0) {
// Add rounding // Add rounding

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

@ -46,6 +46,7 @@ struct zeus2_poly_extra_data
uint32_t dstAlpha; uint32_t dstAlpha;
uint32_t ctrl_word; uint32_t ctrl_word;
bool texture_alpha; bool texture_alpha;
bool texture_rgb555;
bool blend_enable; bool blend_enable;
bool depth_min_enable; bool depth_min_enable;
bool depth_test_enable; bool depth_test_enable;