summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/render/drawbgfx.h
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2016-03-02 21:49:49 +0100
committer ImJezze <jezze@gmx.net>2016-03-02 21:49:49 +0100
commit9fe9f6d93e672bcd926f9e7461774bc9cc22e094 (patch)
tree3911b611dd010a4108b90fb8b8c82116eec21117 /src/osd/modules/render/drawbgfx.h
parentdbdf21ee465acadf3e643d62d6bedfcc297ada85 (diff)
parent1914702e6fae052668df5b068a502bca57c9a3b0 (diff)
Merge remote-tracking branch 'refs/remotes/mamedev/master'
# Resolved Conflicts: # src/osd/modules/render/d3d/d3dhlsl.cpp # src/osd/windows/winmain.cpp
Diffstat (limited to 'src/osd/modules/render/drawbgfx.h')
-rw-r--r--src/osd/modules/render/drawbgfx.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/osd/modules/render/drawbgfx.h b/src/osd/modules/render/drawbgfx.h
index 924ee0add29..62e00dd7d1d 100644
--- a/src/osd/modules/render/drawbgfx.h
+++ b/src/osd/modules/render/drawbgfx.h
@@ -14,9 +14,11 @@ class texture_manager;
class target_manager;
class shader_manager;
class effect_manager;
+class chain_manager;
class bgfx_texture;
class bgfx_effect;
class bgfx_target;
+class bgfx_chain;
/* sdl_info is the information about SDL for the current screen */
class renderer_bgfx : public osd_renderer
@@ -107,8 +109,11 @@ private:
target_manager* m_targets;
shader_manager* m_shaders;
effect_manager* m_effects;
+ chain_manager* m_chains;
+
bgfx_effect* m_gui_effect[4];
bgfx_effect* m_screen_effect[4];
+ //bgfx_chain* m_screen_chain[4];
std::map<UINT32, rectangle_packer::packed_rectangle> m_hash_to_entry;
std::vector<rectangle_packer::packable_rectangle> m_texinfo;
@@ -117,9 +122,9 @@ private:
uint32_t m_width[16];
uint32_t m_height[16];
uint32_t m_white[16*16];
- enum : uint16_t { CACHE_SIZE = 1024 };
- enum : uint32_t { PACKABLE_SIZE = 128 };
- enum : UINT32 { WHITE_HASH = 0x87654321 };
+ static const uint16_t CACHE_SIZE;
+ static const uint32_t PACKABLE_SIZE;
+ static const uint32_t WHITE_HASH;
static bool s_window_set;
};