- Removes video_data from running_machine

- Private state screen information now hangs off the public one, instead of the other way around
- Combines video_global and video_private into a single structure

src/emu/mame.c

@@ -1485,7 +1485,6 @@ static void prepare_machine(running_machine *machine)
 
 	/* reset the global MAME data and clear the other privates */
 	memset(machine->mame_data, 0, sizeof(*machine->mame_data));
-	machine->video_data = NULL;
 	machine->palette_data = NULL;
 	machine->streams_data = NULL;
 

src/emu/mame.h

@@ -162,7 +162,6 @@ typedef void (*output_callback_func)(void *param, const char *format, va_list ar
 
 /* forward type declarations */
 typedef struct _mame_private mame_private;
-typedef struct _video_private video_private;
 typedef struct _palette_private palette_private;
 typedef struct _streams_private streams_private;
 typedef struct _devices_private devices_private;
@@ -205,7 +204,6 @@ struct _running_machine
 
 	/* internal core information */
 	mame_private *			mame_data;			/* internal data from mame.c */
-	video_private *			video_data;			/* internal data from video.c */
 	palette_private *		palette_data;		/* internal data from palette.c */
 	streams_private *		streams_data;		/* internal data from streams.c */
 	devices_private *		devices_data;		/* internal data from devices.c */

src/emu/video.h

@@ -70,6 +70,7 @@ struct _screen_state
 	attoseconds_t	refresh;					/* refresh period */
 	attoseconds_t	vblank;						/* duration of a VBLANK */
 	bitmap_format	format;						/* bitmap format */
+	void *			private_data;				/* pointer to the private data structure */
 };