summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/rendersw.c
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2009-02-28 22:10:06 +0000
committer Aaron Giles <aaron@aarongiles.com>2009-02-28 22:10:06 +0000
commite2757c60d2fa5e74909eff1e7a48ce5841ad47e5 (patch)
treeb30bddf750ef14f54e147b8d214d693af27f5d33 /src/emu/rendersw.c
parent42004cf3baf9c0307775c43096df36c1d5884bf4 (diff)
Modified the makefile to support experimental optional C++
compilation: - new option CPP_COMPILE to trigger this (off by default) - split CFLAGS into common, C-only, and C++-only flags - when enabled, CPP_COMPILE causes 'pp' to be appended to the target name NOTE THAT THE SYSTEM CANNOT ACTUALLY BE COMPILED THIS WAY YET. IT IS JUST AN EXPERIMENT. Modified lib.mak to always build zlib/expat as C regardless of CPP_COMPILE. Modified windows.mak to fix warnings with MAXOPT=1, and to leverage the new CFLAGs definitions. Modified vconv.c to do appropriate conversions for new C++ options. Updated sources so that libutil, libocore (Windows), and libosd (Windows) can be cleanly compiled as C or C++. This was mostly adding some casts against void *. Fixed a few more general obvious problems at random locations in the source: - device->class is now device->devclass - TYPES_COMPATIBLE uses typeid() when compiled for C++ - some functions with reserved names ('xor' in particular) were renamed - nested enums and structs were pulled out into separate definitions (under C++ these would need to be scoped to be referenced) - TOKEN_VALUE cannot use .field=x initialization in C++ :(
Diffstat (limited to 'src/emu/rendersw.c')
-rw-r--r--src/emu/rendersw.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/emu/rendersw.c b/src/emu/rendersw.c
index 54576d34507..e4cea22028c 100644
--- a/src/emu/rendersw.c
+++ b/src/emu/rendersw.c
@@ -201,7 +201,7 @@ INLINE UINT32 get_texel_palette16_nearest(const render_texinfo *texture, INT32 c
INLINE UINT32 get_texel_palette16_bilinear(const render_texinfo *texture, INT32 curu, INT32 curv)
{
- const UINT16 *texbase = texture->base;
+ const UINT16 *texbase = (const UINT16 *)texture->base;
rgb_t pix00, pix01, pix10, pix11;
INT32 u0, u1, v0, v1;
@@ -245,7 +245,7 @@ INLINE UINT32 get_texel_palette16a_nearest(const render_texinfo *texture, INT32
INLINE UINT32 get_texel_palette16a_bilinear(const render_texinfo *texture, INT32 curu, INT32 curv)
{
- const UINT16 *texbase = texture->base;
+ const UINT16 *texbase = (const UINT16 *)texture->base;
rgb_t pix00, pix01, pix10, pix11;
INT32 u0, u1, v0, v1;
@@ -288,7 +288,7 @@ INLINE UINT32 get_texel_rgb15_nearest(const render_texinfo *texture, INT32 curu,
INLINE UINT32 get_texel_rgb15_bilinear(const render_texinfo *texture, INT32 curu, INT32 curv)
{
- const UINT16 *texbase = texture->base;
+ const UINT16 *texbase = (const UINT16 *)texture->base;
rgb_t pix00, pix01, pix10, pix11, filtered;
INT32 u0, u1, v0, v1;
@@ -337,7 +337,7 @@ INLINE UINT32 get_texel_yuy16_nearest(const render_texinfo *texture, INT32 curu,
INLINE UINT32 get_texel_yuy16_bilinear(const render_texinfo *texture, INT32 curu, INT32 curv)
{
- const UINT16 *texbase = texture->base;
+ const UINT16 *texbase = (const UINT16 *)texture->base;
rgb_t pix00, pix01, pix10, pix11;
INT32 u0, u1, v0, v1;
@@ -406,7 +406,7 @@ INLINE UINT32 get_texel_rgb32_nearest(const render_texinfo *texture, INT32 curu,
INLINE UINT32 get_texel_rgb32_bilinear(const render_texinfo *texture, INT32 curu, INT32 curv)
{
- const UINT32 *texbase = texture->base;
+ const UINT32 *texbase = (const UINT32 *)texture->base;
rgb_t pix00, pix01, pix10, pix11;
INT32 u0, u1, v0, v1;
@@ -450,7 +450,7 @@ INLINE UINT32 get_texel_argb32_nearest(const render_texinfo *texture, INT32 curu
INLINE UINT32 get_texel_argb32_bilinear(const render_texinfo *texture, INT32 curu, INT32 curv)
{
- const UINT32 *texbase = texture->base;
+ const UINT32 *texbase = (const UINT32 *)texture->base;
rgb_t pix00, pix01, pix10, pix11;
INT32 u0, u1, v0, v1;