summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/render/draw13.cpp
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2015-12-13 11:23:55 +0100
committer ImJezze <jezze@gmx.net>2015-12-13 11:23:55 +0100
commit4e580a77b9da9b78aba1fec8e44b1de5a4a14aaf (patch)
treedf0e1d28daa79b9151088498a933cd1fc37c9c07 /src/osd/modules/render/draw13.cpp
parent1cda42b22e591965ee69561fcf52272bd991b3b2 (diff)
parent14d5966a379e9783ba724750a5f84a72af62cadc (diff)
Merge pull request #9 from mamedev/master
Sync to base master
Diffstat (limited to 'src/osd/modules/render/draw13.cpp')
-rw-r--r--src/osd/modules/render/draw13.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/osd/modules/render/draw13.cpp b/src/osd/modules/render/draw13.cpp
index 79540bfd624..f357d567e71 100644
--- a/src/osd/modules/render/draw13.cpp
+++ b/src/osd/modules/render/draw13.cpp
@@ -174,11 +174,11 @@ public:
}
}
- /* virtual */ int create();
- /* virtual */ int draw(const int update);
- /* virtual */ int xy_to_render_target(const int x, const int y, int *xt, int *yt);
- /* virtual */ void destroy();
- /* virtual */ render_primitive_list *get_primitives()
+ /* virtual */ int create() override;
+ /* virtual */ int draw(const int update) override;
+ /* virtual */ int xy_to_render_target(const int x, const int y, int *xt, int *yt) override;
+ /* virtual */ void destroy() override;
+ /* virtual */ render_primitive_list *get_primitives() override
{
osd_dim nd = window().blit_surface_size();
if (nd != m_blit_dim)
@@ -260,7 +260,7 @@ static void drawsdl2_exit(void);
// STATIC VARIABLES
//============================================================
-#define BM_ALL (-1)
+#define BM_ALL (UINT32_MAX)
//( SDL_BLENDMODE_MASK | SDL_BLENDMODE_BLEND | SDL_BLENDMODE_ADD | SDL_BLENDMODE_MOD)
#define ENTRY(a,b,f) { SDL_TEXFORMAT_ ## a, SDL_PIXELFORMAT_ ## b, &texcopy_ ## f, BM_ALL, #a, #b, 0, 0, 0, 0}
@@ -354,17 +354,17 @@ static bool blit_info_initialized = false;
//============================================================
-INLINE float round_nearest(float f)
+static inline float round_nearest(float f)
{
return floor(f + 0.5f);
}
-INLINE HashT texture_compute_hash(const render_texinfo &texture, const UINT32 flags)
+static inline HashT texture_compute_hash(const render_texinfo &texture, const UINT32 flags)
{
return (HashT)texture.base ^ (flags & (PRIMFLAG_BLENDMODE_MASK | PRIMFLAG_TEXFORMAT_MASK));
}
-INLINE SDL_BlendMode map_blendmode(const int blendmode)
+static inline SDL_BlendMode map_blendmode(const int blendmode)
{
switch (blendmode)
{
@@ -382,7 +382,7 @@ INLINE SDL_BlendMode map_blendmode(const int blendmode)
return SDL_BLENDMODE_NONE;
}
-INLINE void set_coloralphamode(SDL_Texture *texture_id, const render_color *color)
+static inline void set_coloralphamode(SDL_Texture *texture_id, const render_color *color)
{
UINT32 sr = (UINT32)(255.0f * color->r);
UINT32 sg = (UINT32)(255.0f * color->g);