summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/render.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/render.h')
-rw-r--r--src/emu/render.h17
1 files changed, 5 insertions, 12 deletions
diff --git a/src/emu/render.h b/src/emu/render.h
index 6d55c75ada9..df8896b712b 100644
--- a/src/emu/render.h
+++ b/src/emu/render.h
@@ -49,7 +49,6 @@
//#include "osdepend.h"
#include <math.h>
-#include <mutex>
//**************************************************************************
@@ -62,9 +61,7 @@ enum
BLENDMODE_NONE = 0, // no blending
BLENDMODE_ALPHA, // standard alpha blend
BLENDMODE_RGB_MULTIPLY, // apply source alpha to source pix, then multiply RGB values
- BLENDMODE_ADD, // apply source alpha to source pix, then add to destination
-
- BLENDMODE_COUNT
+ BLENDMODE_ADD // apply source alpha to source pix, then add to destination
};
@@ -107,9 +104,6 @@ const UINT32 PRIMFLAG_TYPE_MASK = 3 << PRIMFLAG_TYPE_SHIFT;
const UINT32 PRIMFLAG_TYPE_LINE = 0 << PRIMFLAG_TYPE_SHIFT;
const UINT32 PRIMFLAG_TYPE_QUAD = 1 << PRIMFLAG_TYPE_SHIFT;
-const int PRIMFLAG_PACKABLE_SHIFT = 21;
-const UINT32 PRIMFLAG_PACKABLE = 1 << PRIMFLAG_PACKABLE_SHIFT;
-
//**************************************************************************
// MACROS
//**************************************************************************
@@ -328,7 +322,6 @@ public:
// getters
render_primitive *next() const { return m_next; }
- bool packable(const INT32 pack_size) const { return (flags & PRIMFLAG_PACKABLE) && texture.base != nullptr && texture.width <= pack_size && texture.height <= pack_size; }
// reset to prepare for re-use
void reset();
@@ -365,8 +358,8 @@ public:
render_primitive *first() const { return m_primlist.first(); }
// lock management
- void acquire_lock() { m_lock.lock(); }
- void release_lock() { m_lock.unlock(); }
+ void acquire_lock() { osd_lock_acquire(m_lock); }
+ void release_lock() { osd_lock_release(m_lock); }
// reference management
void add_reference(void *refptr);
@@ -395,7 +388,7 @@ private:
fixed_allocator<render_primitive> m_primitive_allocator;// allocator for primitives
fixed_allocator<reference> m_reference_allocator; // allocator for references
- std::recursive_mutex m_lock; // lock to protect list accesses
+ osd_lock * m_lock; // lock to protect list accesses
};
@@ -436,7 +429,7 @@ public:
private:
// internal helpers
- void get_scaled(UINT32 dwidth, UINT32 dheight, render_texinfo &texinfo, render_primitive_list &primlist, UINT32 flags = 0);
+ void get_scaled(UINT32 dwidth, UINT32 dheight, render_texinfo &texinfo, render_primitive_list &primlist);
const rgb_t *get_adjusted_palette(render_container &container);
static const int MAX_TEXTURE_SCALES = 16;