diff options
author | 2019-07-11 09:07:20 +1000 | |
---|---|---|
committer | 2019-07-11 09:07:20 +1000 | |
commit | df99ce2ec0e82020a6fee89f4ffaf7f1468fec31 (patch) | |
tree | f6b1459a7e882047476bf817a410ab44eac3e99a /src/emu/render.cpp | |
parent | 704355279e6b62fa93d80e948073f90eba0032f2 (diff) | |
parent | 5eaac5e857176b56c990f6bb864a1a5c27b6cf6d (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/emu/render.cpp')
-rw-r--r-- | src/emu/render.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/emu/render.cpp b/src/emu/render.cpp index 34d29285162..e896c3748f1 100644 --- a/src/emu/render.cpp +++ b/src/emu/render.cpp @@ -361,7 +361,7 @@ void render_texture::set_bitmap(bitmap_t &bitmap, const rectangle &sbounds, text assert(bitmap.cliprect().contains(sbounds)); // ensure we have a valid palette for palettized modes - if (format == TEXFORMAT_PALETTE16 || format == TEXFORMAT_PALETTEA16) + if (format == TEXFORMAT_PALETTE16) assert(bitmap.palette() != nullptr); // invalidate references to the old bitmap @@ -501,7 +501,6 @@ const rgb_t *render_texture::get_adjusted_palette(render_container &container) switch (m_format) { case TEXFORMAT_PALETTE16: - case TEXFORMAT_PALETTEA16: assert(m_bitmap->palette() != nullptr); @@ -684,7 +683,6 @@ const rgb_t *render_container::bcg_lookup_table(int texformat, palette_t *palett switch (texformat) { case TEXFORMAT_PALETTE16: - case TEXFORMAT_PALETTEA16: if (m_palclient == nullptr) // if adjusted palette hasn't been created yet, create it { m_palclient = std::make_unique<palette_client>(*palette); @@ -2866,7 +2864,7 @@ void render_target::add_clear_and_optimize_primitive_list(render_primitive_list case render_primitive::QUAD: { // stop when we hit an alpha texture - if (PRIMFLAG_GET_TEXFORMAT(prim.flags) == TEXFORMAT_ARGB32 || PRIMFLAG_GET_TEXFORMAT(prim.flags) == TEXFORMAT_PALETTEA16) + if (PRIMFLAG_GET_TEXFORMAT(prim.flags) == TEXFORMAT_ARGB32) goto done; // if this quad can't be cleanly removed from the extents list, we're done |