← Back to branch summary

~ubuntu-branches/debian/sid/mame/sid

« back to all changes in this revision

Viewing changes to src/mame/video/model2rd.c

  • Committer: Package Import Robot
  • Author(s): Jordi Mallach, Emmanuel Kasper, Jordi Mallach
  • Date: 2012-06-05 20:02:23 UTC
  • mfrom: (0.3.1) (0.1.4)
  • Revision ID: package-import@ubuntu.com-20120605200223-gnlpogjrg6oqe9md
Tags: 0.146-1
[ Emmanuel Kasper ]
* New upstream release
* Drop patch to fix man pages section and patches to link with flac 
  and jpeg system lib: all this has been pushed upstream by Cesare Falco
* Add DM-Upload-Allowed: yes field.

[ Jordi Mallach ]
* Create a "gnu" TARGETOS stanza that defines NO_AFFINITY_NP.
* Stop setting TARGETOS to "unix" in d/rules. It should be autodetected,
  and set to the appropriate value.
* mame_manpage_section.patch: Change mame's manpage section to 6 (games),
  in the TH declaration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mame/video/model2rd.c
66
66
        const UINT16 *colortable_r = (const UINT16 *)&state->m_colorxlat[0x0000/4];
67
67
        const UINT16 *colortable_g = (const UINT16 *)&state->m_colorxlat[0x4000/4];
68
68
        const UINT16 *colortable_b = (const UINT16 *)&state->m_colorxlat[0x8000/4];
69
 
        const UINT16 *lumaram = (const UINT16 *)state->m_lumaram;
70
 
        const UINT16 *palram = (const UINT16 *)state->m_paletteram32;
 
69
        const UINT16 *lumaram = (const UINT16 *)state->m_lumaram.target();
 
70
        const UINT16 *palram = (const UINT16 *)state->m_paletteram32.target();
71
71
        UINT32  lumabase = extra->lumabase;
72
72
        UINT32  color = extra->colorbase;
73
73
        UINT8   luma;
122
122
        const UINT16 *colortable_r = (const UINT16 *)&state->m_colorxlat[0x0000/4];
123
123
        const UINT16 *colortable_g = (const UINT16 *)&state->m_colorxlat[0x4000/4];
124
124
        const UINT16 *colortable_b = (const UINT16 *)&state->m_colorxlat[0x8000/4];
125
 
        const UINT16 *lumaram = (const UINT16 *)state->m_lumaram;
126
 
        const UINT16 *palram = (const UINT16 *)state->m_paletteram32;
 
125
        const UINT16 *lumaram = (const UINT16 *)state->m_lumaram.target();
 
126
        const UINT16 *palram = (const UINT16 *)state->m_paletteram32.target();
127
127
        UINT32  colorbase = extra->colorbase;
128
128
        UINT32  lumabase = extra->lumabase;
129
129
        UINT32  tex_x = extra->texx;