diff options
author | Vas Crabb <vas@vastheman.com> | 2019-10-26 10:40:50 +1100 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2019-10-26 10:40:50 +1100 |
commit | 32868b8e2ae103dd1134ec0596f0966762ac401a (patch) | |
tree | 2245656b8592a3ee94c8959d9a8f64c4690136d0 /src/osd | |
parent | cf3f4b2530770465d4f8f123dde94c7ab7032dd1 (diff) |
srcclean (nw)
Diffstat (limited to 'src/osd')
-rw-r--r-- | src/osd/modules/render/bgfx/chain.h | 2 | ||||
-rw-r--r-- | src/osd/modules/render/bgfx/chainmanager.h | 6 | ||||
-rw-r--r-- | src/osd/modules/render/bgfx/inputpair.cpp | 6 | ||||
-rw-r--r-- | src/osd/modules/render/bgfxutil.cpp | 44 |
4 files changed, 29 insertions, 29 deletions
diff --git a/src/osd/modules/render/bgfx/chain.h b/src/osd/modules/render/bgfx/chain.h index 7dc57171645..856e9ae1fa3 100644 --- a/src/osd/modules/render/bgfx/chain.h +++ b/src/osd/modules/render/bgfx/chain.h @@ -55,7 +55,7 @@ private: std::map<std::string, bgfx_target*> m_target_map; int64_t m_current_time; uint32_t m_screen_index; - bool m_has_converter; + bool m_has_converter; }; #endif // __DRAWBGFX_CHAIN__ diff --git a/src/osd/modules/render/bgfx/chainmanager.h b/src/osd/modules/render/bgfx/chainmanager.h index aa5edbecd39..36a6847455f 100644 --- a/src/osd/modules/render/bgfx/chainmanager.h +++ b/src/osd/modules/render/bgfx/chainmanager.h @@ -144,10 +144,10 @@ private: std::vector<ui::menu_item> m_selection_sliders; std::vector<std::unique_ptr<slider_state>> m_core_sliders; std::vector<int32_t> m_current_chain; - std::vector<bgfx_texture*> m_screen_textures; - std::vector<bgfx_texture*> m_screen_palettes; + std::vector<bgfx_texture*> m_screen_textures; + std::vector<bgfx_texture*> m_screen_palettes; std::vector<bgfx_effect*> m_converters; - std::vector<screen_prim> m_screen_prims; + std::vector<screen_prim> m_screen_prims; std::vector<uint8_t> m_palette_temp; static const uint32_t CHAIN_NONE; diff --git a/src/osd/modules/render/bgfx/inputpair.cpp b/src/osd/modules/render/bgfx/inputpair.cpp index 8d4441ccffe..f6e695a9992 100644 --- a/src/osd/modules/render/bgfx/inputpair.cpp +++ b/src/osd/modules/render/bgfx/inputpair.cpp @@ -50,10 +50,10 @@ void bgfx_input_pair::bind(bgfx_effect *effect, const int32_t screen) const std::string name = m_texture + std::to_string(screen); bgfx_texture_handle_provider* provider = chains().textures().provider(name); - if (!provider) - return; + if (!provider) + return; - bgfx_uniform *tex_size = effect->uniform("u_tex_size" + std::to_string(m_index)); + bgfx_uniform *tex_size = effect->uniform("u_tex_size" + std::to_string(m_index)); if (tex_size && provider) { float values[2] = { float(provider->width()), float(provider->height()) }; diff --git a/src/osd/modules/render/bgfxutil.cpp b/src/osd/modules/render/bgfxutil.cpp index 7114b6008d8..eb847cbdba9 100644 --- a/src/osd/modules/render/bgfxutil.cpp +++ b/src/osd/modules/render/bgfxutil.cpp @@ -41,28 +41,28 @@ const bgfx::Memory* bgfx_util::mame_texture_data_to_bgfx_texture_data(bgfx::Text for (int y = 0; y < height; y++) { - switch (format) - { - case PRIMFLAG_TEXFORMAT(TEXFORMAT_PALETTE16): - copy_util::copyline_palette16(dst, src16, width, palette); - src16 += rowpixels; - break; - case PRIMFLAG_TEXFORMAT(TEXFORMAT_YUY16): - copy_util::copyline_yuy16_to_argb(dst, src16, width, palette, 1); - src16 += rowpixels; - break; - case PRIMFLAG_TEXFORMAT(TEXFORMAT_ARGB32): - copy_util::copyline_argb32(dst, src32, width, palette); - src32 += rowpixels; - break; - case PRIMFLAG_TEXFORMAT(TEXFORMAT_RGB32): - copy_util::copyline_rgb32(dst, src32, width, palette); - src32 += rowpixels; - break; - default: - break; - } - dst += width; + switch (format) + { + case PRIMFLAG_TEXFORMAT(TEXFORMAT_PALETTE16): + copy_util::copyline_palette16(dst, src16, width, palette); + src16 += rowpixels; + break; + case PRIMFLAG_TEXFORMAT(TEXFORMAT_YUY16): + copy_util::copyline_yuy16_to_argb(dst, src16, width, palette, 1); + src16 += rowpixels; + break; + case PRIMFLAG_TEXFORMAT(TEXFORMAT_ARGB32): + copy_util::copyline_argb32(dst, src32, width, palette); + src32 += rowpixels; + break; + case PRIMFLAG_TEXFORMAT(TEXFORMAT_RGB32): + copy_util::copyline_rgb32(dst, src32, width, palette); + src32 += rowpixels; + break; + default: + break; + } + dst += width; } return mem;*/ } |