Previous 15994 Revisions Next

r3531 Monday 10th November, 2008 at 14:17:01 UTC by R. Belmont
[SDLMESS] Sync with latest SDL code - fixes Ubuntu 8.10, YUV output on Macs.
[src/osd/sdl]drawogl.c sdldir.c sdlprefix.h texcopy.c

src/osd/sdl/drawogl.c
r3530r3531
341341static void texcopy_palette16a(texture_info *texture, const render_texinfo *texsource);
342342static void texcopy_rgb15(texture_info *texture, const render_texinfo *texsource);
343343static void texcopy_rgb15_paletted(texture_info *texture, const render_texinfo *texsource);
344#ifndef SDLMAME_MACOSX
345344static void texcopy_yuv16(texture_info *texture, const render_texinfo *texsource);
346345static void texcopy_yuv16_paletted(texture_info *texture, const render_texinfo *texsource);
347#endif
348#ifdef SDLMAME_MACOSX
346#if 0 //def SDLMAME_MACOSX
349347static void texcopy_yuv16_apple(texture_info *texture, const render_texinfo *texsource);
350348static void texcopy_yuv16_paletted_apple(texture_info *texture, const render_texinfo *texsource);
351349#endif
r3530r3531
14391437   { GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, sizeof(UINT32) },    // SDL_TEXFORMAT_ARGB32
14401438   { GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, sizeof(UINT32) },    // SDL_TEXFORMAT_RGB32
14411439   { GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, sizeof(UINT32) },    // SDL_TEXFORMAT_RGB32_PALETTED
1442#ifdef SDLMAME_MACOSX
1440#if 0 //def SDLMAME_MACOSX
14431441   { GL_RGB8, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, sizeof(UINT16) }, // SDL_TEXFORMAT_YUY16
14441442   { GL_RGB8, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, sizeof(UINT16) }, // SDL_TEXFORMAT_YUY16_PALETTED
14451443#else
r3530r3531
14561454   { GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, sizeof(UINT32) },    // SDL_TEXFORMAT_ARGB32
14571455   { GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, sizeof(UINT32) },    // SDL_TEXFORMAT_RGB32
14581456   { GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, sizeof(UINT32) },    // SDL_TEXFORMAT_RGB32_PALETTED
1459#ifdef SDLMAME_MACOSX
1457#if 0 //def SDLMAME_MACOSX
14601458   { GL_RGB8, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, sizeof(UINT16) }, // SDL_TEXFORMAT_YUY16
14611459   { GL_RGB8, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, sizeof(UINT16) }, // SDL_TEXFORMAT_YUY16_PALETTED
14621460#else
r3530r3531
14731471   { GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, sizeof(UINT32) },    // SDL_TEXFORMAT_ARGB32
14741472   { GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, sizeof(UINT32) },    // SDL_TEXFORMAT_RGB32
14751473   { GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, sizeof(UINT32) },    // SDL_TEXFORMAT_RGB32_PALETTED
1476#ifdef SDLMAME_MACOSX
1474#if 0 //def SDLMAME_MACOSX
14771475   { GL_RGB8, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, sizeof(UINT16) }, // SDL_TEXFORMAT_YUY16
14781476   { GL_RGB8, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, sizeof(UINT16) }, // SDL_TEXFORMAT_YUY16_PALETTED
14791477#else
r3530r3531
14901488   texcopy_argb32,
14911489   texcopy_rgb32,
14921490   texcopy_rgb32_paletted,
1493#ifdef SDLMAME_MACOSX
1491#if 0 //def SDLMAME_MACOSX
14941492   texcopy_yuv16_apple,
14951493   texcopy_yuv16_paletted_apple,
14961494#else
r3530r3531
15201518   texcopy_argb32,
15211519   texcopy_rgb32,
15221520   texcopy_rgb32_paletted,
1523#ifdef SDLMAME_MACOSX
1521#if 0 //def SDLMAME_MACOSX
15241522   texcopy_yuv16_apple,
15251523   texcopy_yuv16_paletted_apple,
15261524#else
src/osd/sdl/sdldir.c
r3530r3531
3232
3333#include "osdcore.h"
3434
35#if defined(SDLMAME_WIN32) || defined(SDLMAME_OS2)
36#define PATHSEPCH '\\'
37#define INVPATHSEPCH '/'
38#else
39#define PATHSEPCH '/'
40#define INVPATHSEPCH '\\'
41#endif
42
3543struct _osd_directory
3644{
3745   osd_directory_entry ent;
r3530r3531
96104osd_directory *osd_opendir(const char *dirname)
97105{
98106   osd_directory *dir = NULL;
107   char *tmpstr, *envstr;
108   int i, j;
99109
100110   dir = malloc(sizeof(osd_directory));
101111   if (dir)
r3530r3531
104114      dir->fd = NULL;
105115   }
106116
107   dir->fd = opendir(dirname);
117   tmpstr = malloc(strlen(dirname)+1);
118   strcpy(tmpstr, dirname);
108119
120   if (tmpstr[0] == '$')
121   {
122      char *envval;
123      envstr = malloc(strlen(tmpstr)+1);
124
125      strcpy(envstr, tmpstr);
126
127      i = 0;
128      while (envstr[i] != PATHSEPCH && envstr[i] != 0 && envstr[i] != '.')
129      {
130         i++;
131      }
132
133      envstr[i] = '\0';
134
135      envval = getenv(&envstr[1]);
136      if (envval != NULL)
137      {
138         j = strlen(envval) + strlen(tmpstr) + 1;
139         free(tmpstr);
140         tmpstr = malloc(j);
141   
142         // start with the value of $HOME
143         strcpy(tmpstr, envval);
144         // replace the null with a path separator again
145         envstr[i] = PATHSEPCH;
146         // append it
147         strcat(tmpstr, &envstr[i]);
148      }
149      else
150         fprintf(stderr, "Warning: Environment variable %s not found.\n", envstr);
151      free(envstr);
152   }
153
154   dir->fd = opendir(tmpstr);
155
109156   if (dir && (dir->fd == NULL))
110157   {
111158      free(dir);
112159      dir = NULL;
113160   }
114161
162   if (tmpstr)
163     free(tmpstr);
115164   return dir;
116165}
117166
src/osd/sdl/texcopy.c
r3530r3531
3131#define SDL_TEXFORMAT SDL_TEXFORMAT_RGB15_PALETTED_ARGB1555
3232#include "texcopy.c"
3333
34#ifdef SDLMAME_MACOSX /* native MacOS X composite texture format */
34#if 0 //def SDLMAME_MACOSX /* native MacOS X composite texture format */
3535
3636#define SDL_TEXFORMAT SDL_TEXFORMAT_YUY16
3737#include "texcopy.c"
r3530r3531
4646//  (YUY format is weird and doesn't fit the assumptions of the
4747//   standard macros so we handle it here
4848//============================================================
49#ifndef SDLMAME_MACOSX
49#if 1 //ndef SDLMAME_MACOSX
5050static void texcopy_yuv16(texture_info *texture, const render_texinfo *texsource)
5151{
5252   int x, y;
src/osd/sdl/sdlprefix.h
r3530r3531
3434#define SDLMAME_FREEBSD 1
3535#endif
3636
37// fix for Ubuntu 8.10
38#ifdef _FORTIFY_SOURCE
39#undef _FORTIFY_SOURCE
40#endif
41
3742#endif /* SDLMAME_UNIX */
3843
3944//============================================================

Previous 15994 Revisions Next


© 1998-2018 The MESS Team