diff options
Diffstat (limited to 'src/osd/modules/render')
-rw-r--r-- | src/osd/modules/render/bgfxutil.cpp | 3 | ||||
-rw-r--r-- | src/osd/modules/render/copyutil.h | 9 | ||||
-rw-r--r-- | src/osd/modules/render/d3d/d3dcomm.h | 1 | ||||
-rw-r--r-- | src/osd/modules/render/draw13.cpp | 3 | ||||
-rw-r--r-- | src/osd/modules/render/drawd3d.cpp | 21 | ||||
-rw-r--r-- | src/osd/modules/render/drawogl.cpp | 31 |
6 files changed, 1 insertions, 67 deletions
diff --git a/src/osd/modules/render/bgfxutil.cpp b/src/osd/modules/render/bgfxutil.cpp index cbf2428d61f..5ba76cbd2a1 100644 --- a/src/osd/modules/render/bgfxutil.cpp +++ b/src/osd/modules/render/bgfxutil.cpp @@ -31,9 +31,6 @@ const bgfx::Memory* bgfx_util::mame_texture_data_to_bgfx_texture_data(uint32_t f case PRIMFLAG_TEXFORMAT(TEXFORMAT_PALETTE16): copy_util::copyline_palette16(dst_line, src_line16, width, palette); break; - case PRIMFLAG_TEXFORMAT(TEXFORMAT_PALETTEA16): - copy_util::copyline_palettea16(dst_line, src_line16, width, palette); - break; case PRIMFLAG_TEXFORMAT(TEXFORMAT_YUY16): copy_util::copyline_yuy16_to_argb(dst_line, src_line16, width, palette, 1); break; diff --git a/src/osd/modules/render/copyutil.h b/src/osd/modules/render/copyutil.h index 81a880555cd..715fcba0dca 100644 --- a/src/osd/modules/render/copyutil.h +++ b/src/osd/modules/render/copyutil.h @@ -24,15 +24,6 @@ public: } } - static inline void copyline_palettea16(uint32_t *dst, const uint16_t *src, int width, const rgb_t *palette) - { - for (int x = 0; x < width; x++) - { - rgb_t srcpixel = palette[*src++]; - *dst++ = (srcpixel.a() << 24) | (srcpixel.b() << 16) | (srcpixel.g() << 8) | srcpixel.r(); - } - } - static inline void copyline_rgb32(uint32_t *dst, const uint32_t *src, int width, const rgb_t *palette) { int x; diff --git a/src/osd/modules/render/d3d/d3dcomm.h b/src/osd/modules/render/d3d/d3dcomm.h index 95dcac48ca7..d576c5e7d0c 100644 --- a/src/osd/modules/render/d3d/d3dcomm.h +++ b/src/osd/modules/render/d3d/d3dcomm.h @@ -144,7 +144,6 @@ private: void compute_size_subroutine(int texwidth, int texheight, int* p_width, int* p_height); inline void copyline_palette16(uint32_t *dst, const uint16_t *src, int width, const rgb_t *palette, int xborderpix); - inline void copyline_palettea16(uint32_t *dst, const uint16_t *src, int width, const rgb_t *palette, int xborderpix); inline void copyline_rgb32(uint32_t *dst, const uint32_t *src, int width, const rgb_t *palette, int xborderpix); inline void copyline_argb32(uint32_t *dst, const uint32_t *src, int width, const rgb_t *palette, int xborderpix); inline void copyline_yuy16_to_yuy2(uint16_t *dst, const uint16_t *src, int width, const rgb_t *palette); diff --git a/src/osd/modules/render/draw13.cpp b/src/osd/modules/render/draw13.cpp index 9282c35e9b4..f99ebf70601 100644 --- a/src/osd/modules/render/draw13.cpp +++ b/src/osd/modules/render/draw13.cpp @@ -705,9 +705,6 @@ texture_info::texture_info(renderer_sdl2 *renderer, const render_texinfo &texsou case TEXFORMAT_PALETTE16: m_format = SDL_TEXFORMAT_PALETTE16; break; - case TEXFORMAT_PALETTEA16: - m_format = SDL_TEXFORMAT_PALETTE16A; - break; case TEXFORMAT_YUY16: m_format = texsource.palette ? SDL_TEXFORMAT_YUY16_PALETTED : SDL_TEXFORMAT_YUY16; break; diff --git a/src/osd/modules/render/drawd3d.cpp b/src/osd/modules/render/drawd3d.cpp index 2336536d084..b986ed2c782 100644 --- a/src/osd/modules/render/drawd3d.cpp +++ b/src/osd/modules/render/drawd3d.cpp @@ -2012,7 +2012,7 @@ texture_info::texture_info(d3d_texture_manager *manager, const render_texinfo* t { format = m_texture_manager->get_yuv_format(); } - else if (PRIMFLAG_GET_TEXFORMAT(flags) == TEXFORMAT_ARGB32 || PRIMFLAG_GET_TEXFORMAT(flags) == TEXFORMAT_PALETTEA16) + else if (PRIMFLAG_GET_TEXFORMAT(flags) == TEXFORMAT_ARGB32) { format = D3DFMT_A8R8G8B8; } @@ -2231,21 +2231,6 @@ inline void texture_info::copyline_palette16(uint32_t *dst, const uint16_t *src, //============================================================ -// copyline_palettea16 -//============================================================ - -inline void texture_info::copyline_palettea16(uint32_t *dst, const uint16_t *src, int width, const rgb_t *palette, int xborderpix) -{ - if (xborderpix) - *dst++ = palette[*src]; - for (int x = 0; x < width; x++) - *dst++ = palette[*src++]; - if (xborderpix) - *dst++ = palette[*--src]; -} - - -//============================================================ // copyline_rgb32 //============================================================ @@ -2458,10 +2443,6 @@ void texture_info::set_data(const render_texinfo *texsource, uint32_t flags) copyline_palette16((uint32_t *)dst, (uint16_t *)texsource->base + srcy * texsource->rowpixels, texsource->width, texsource->palette, m_xborderpix); break; - case TEXFORMAT_PALETTEA16: - copyline_palettea16((uint32_t *)dst, (uint16_t *)texsource->base + srcy * texsource->rowpixels, texsource->width, texsource->palette, m_xborderpix); - break; - case TEXFORMAT_RGB32: copyline_rgb32((uint32_t *)dst, (uint32_t *)texsource->base + srcy * texsource->rowpixels, texsource->width, texsource->palette, m_xborderpix); break; diff --git a/src/osd/modules/render/drawogl.cpp b/src/osd/modules/render/drawogl.cpp index 95345878cfd..6c1cb405316 100644 --- a/src/osd/modules/render/drawogl.cpp +++ b/src/osd/modules/render/drawogl.cpp @@ -1908,9 +1908,6 @@ ogl_texture_info *renderer_ogl::texture_create(const render_texinfo *texsource, case TEXFORMAT_PALETTE16: texture->format = SDL_TEXFORMAT_PALETTE16; break; - case TEXFORMAT_PALETTEA16: - texture->format = SDL_TEXFORMAT_PALETTE16A; - break; case TEXFORMAT_YUY16: if (texsource->palette != nullptr) texture->format = SDL_TEXFORMAT_YUY16_PALETTED; @@ -2067,30 +2064,6 @@ static inline void copyline_palette16(uint32_t *dst, const uint16_t *src, int wi //============================================================ -// copyline_palettea16 -//============================================================ - -static inline void copyline_palettea16(uint32_t *dst, const uint16_t *src, int width, const rgb_t *palette, int xborderpix, int xprescale) -{ - int x; - - assert(xborderpix == 0 || xborderpix == 1); - if (xborderpix) - *dst++ = palette[*src]; - for (x = 0; x < width; x++) - { - int srcpix = *src++; - uint32_t dstval = palette[srcpix]; - for (int x2 = 0; x2 < xprescale; x2++) - *dst++ = dstval; - } - if (xborderpix) - *dst++ = palette[*--src]; -} - - - -//============================================================ // copyline_rgb32 //============================================================ @@ -2359,10 +2332,6 @@ static void texture_set_data(ogl_texture_info *texture, const render_texinfo *te copyline_palette16((uint32_t *)dst, (uint16_t *)texsource->base + y * texsource->rowpixels, texsource->width, texsource->palette, texture->borderpix, texture->xprescale); break; - case TEXFORMAT_PALETTEA16: - copyline_palettea16((uint32_t *)dst, (uint16_t *)texsource->base + y * texsource->rowpixels, texsource->width, texsource->palette, texture->borderpix, texture->xprescale); - break; - case TEXFORMAT_RGB32: copyline_rgb32((uint32_t *)dst, (uint32_t *)texsource->base + y * texsource->rowpixels, texsource->width, texsource->palette, texture->borderpix, texture->xprescale); break; |