summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/sdl/drawogl.c
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2011-03-29 15:50:04 +0000
committer Aaron Giles <aaron@aarongiles.com>2011-03-29 15:50:04 +0000
commit2ad50720237fdd19cf5ab45b8cb6bb21119c00b8 (patch)
treedb21eee69668a06abc3f310ebbd51f5dbadf2de7 /src/osd/sdl/drawogl.c
parentb72cf3c5702b749c7bf26383ff05a9ab55022d31 (diff)
BIG update.
Remove redundant machine items from address_space and device_t. Neither machine nor m_machine are directly accessible anymore. Instead a new getter machine() is available which returns a machine reference. So: space->machine->xxx ==> space->machine().xxx device->machine->yyy ==> device->machine().yyy Globally changed all running_machine pointers to running_machine references. Any function/method that takes a running_machine takes it as a required parameter (1 or 2 exceptions). Being consistent here gets rid of a lot of odd &machine or *machine, but it does mean a very large bulk change across the project. Structs which have a running_machine * now have that variable renamed to m_machine, and now have a shiny new machine() method that works like the space and device methods above. Since most of these are things that should eventually be devices anyway, consider this a step in that direction. 98% of the update was done with regex searches. The changes are architected such that the compiler will catch the remaining errors: // find things that use an embedded machine directly and replace // with a machine() getter call S: ->machine-> R: ->machine\(\)\. // do the same if via a reference S: \.machine-> R: \.machine\(\)\. // convert function parameters to running_machine & S: running_machine \*machine([^;]) R: running_machine \&machine\1 // replace machine-> with machine. S: machine-> R: machine\. // replace &machine() with machine() S: \&([()->a-z0-9_]+machine\(\)) R: \1 // sanity check: look for this used as a cast (running_machine &) // and change to this: *(running_machine *)
Diffstat (limited to 'src/osd/sdl/drawogl.c')
-rw-r--r--src/osd/sdl/drawogl.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/osd/sdl/drawogl.c b/src/osd/sdl/drawogl.c
index c2a697e2893..2070b1f62ea 100644
--- a/src/osd/sdl/drawogl.c
+++ b/src/osd/sdl/drawogl.c
@@ -553,7 +553,7 @@ static int drawogl_window_create(sdl_window_info *window, int width, int height)
SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
//Moved into init
- //load_gl_lib(*window->machine);
+ //load_gl_lib(window->machine());
// create the SDL window
@@ -602,7 +602,7 @@ static int drawogl_window_create(sdl_window_info *window, int width, int height)
SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, video_config.waitvsync ? 1 : 0);
#endif
- load_gl_lib(*window->machine);
+ load_gl_lib(window->machine());
// create the SDL surface (which creates the window in windowed mode)
sdl->sdlsurf = SDL_SetVideoMode(width, height,
@@ -1206,7 +1206,7 @@ static int drawogl_window_draw(sdl_window_info *window, UINT32 dc, int update)
// figure out if we're vector
scrnum = is_vector = 0;
- for (screen = window->machine->config().first_screen(); screen != NULL; screen = screen->next_screen())
+ for (screen = window->machine().config().first_screen(); screen != NULL; screen = screen->next_screen())
{
if (scrnum == window->index)
{
@@ -1240,7 +1240,7 @@ static int drawogl_window_draw(sdl_window_info *window, UINT32 dc, int update)
// we're doing nothing 3d, so the Z-buffer is currently not interesting
glDisable(GL_DEPTH_TEST);
- if (window->machine->options().antialias())
+ if (window->machine().options().antialias())
{
// enable antialiasing for lines
glEnable(GL_LINE_SMOOTH);
@@ -2956,7 +2956,7 @@ static void texture_shader_update(sdl_window_info *window, texture_info *texture
scrnum = 0;
container = (render_container *)NULL;
- for (screen_device *screen = window->machine->first_screen(); screen != NULL; screen = screen->next_screen())
+ for (screen_device *screen = window->machine().first_screen(); screen != NULL; screen = screen->next_screen())
{
if (scrnum == window->start_viewscreen)
{
@@ -2972,9 +2972,9 @@ static void texture_shader_update(sdl_window_info *window, texture_info *texture
container->get_user_settings(settings);
//FIXME: Intended behaviour
#if 1
- vid_attributes[0] = window->machine->options().gamma();
- vid_attributes[1] = window->machine->options().contrast();
- vid_attributes[2] = window->machine->options().brightness();
+ vid_attributes[0] = window->machine().options().gamma();
+ vid_attributes[1] = window->machine().options().contrast();
+ vid_attributes[2] = window->machine().options().brightness();
#else
vid_attributes[0] = settings.gamma;
vid_attributes[1] = settings.contrast;