diff options
author | 2019-07-20 12:31:21 +1000 | |
---|---|---|
committer | 2019-07-20 12:31:21 +1000 | |
commit | d2926fa02cef5bf728eac74c9e5586aced02a80b (patch) | |
tree | 820d62305954ff68c7c8bb87c8a08d1b7ce4b2c3 /src/mame/video/jedi.cpp | |
parent | 24c462dbdb4ed2992af2f8767bf9c56979e7f1be (diff) | |
parent | 68139508715a0375e657add4197582271ef446ec (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/emu/digfx.h
Diffstat (limited to 'src/mame/video/jedi.cpp')
-rw-r--r-- | src/mame/video/jedi.cpp | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/src/mame/video/jedi.cpp b/src/mame/video/jedi.cpp index c9d9261c7bf..ea68c645413 100644 --- a/src/mame/video/jedi.cpp +++ b/src/mame/video/jedi.cpp @@ -41,12 +41,12 @@ void jedi_state::video_start() u8 *dest = srcdata; for (int c = 0; c < gx0->elements(); c++) { - const u16 *c0base = gx0->get_data(c); + const u8 *c0base = gx0->get_data(c); // loop over height for (int y = 0; y < gx0->height(); y++) { - const u16 *c0 = c0base; + const u8 *c0 = c0base; for (int x = 0; x < gx0->width(); x++) { @@ -59,35 +59,6 @@ void jedi_state::video_start() gx0->set_raw_layout(srcdata, gx0->width(), gx0->height(), gx0->elements(), 8 * gx0->width(), 8 * gx0->width() * gx0->height()); gx0->set_granularity(1); - - /* the text layer pixel determines pen address bits A8 and A9 */ - gfx_element *gx1 = m_gfxdecode->gfx(0); - - // allocate memory for the assembled data - u16 *srcdata16 = auto_alloc_array(machine(), u16, gx1->elements() * gx1->width() * gx1->height()); - - // loop over elements - u16 *dest16 = srcdata16; - for (int c = 0; c < gx1->elements(); c++) - { - const u16 *c1base = gx1->get_data(c); - - // loop over height - for (int y = 0; y < gx1->height(); y++) - { - const u16 *c1 = c1base; - - for (int x = 0; x < gx1->width(); x++) - { - const u16 pix = (*c1++ & 0x3); - *dest16++ = pix << 8; - } - c1base += gx1->rowbytes(); - } - } - - gx1->set_raw_layout(srcdata16, gx1->width(), gx1->height(), gx1->elements(), 16 * gx1->width(), 16 * gx1->width() * gx1->height()); - gx1->set_granularity(1); #endif /* register for saving */ |