Mercurial > sdl-ios-xcode

comparison src/video/directfb/SDL_DirectFB_render.c @ 4568:25b9cd8bdc30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Couriersud to Sam I have done some quick changes and at least the code compiles again. It also works with a number of the test executables with the DFB X11 backend. I hope to find time to get SDLMAME to work with latest SDL1.3 (i.e. rip out multi-keyboard, multi-mice & cursor support) next week to test it further. Regards, André
author Sam Lantinga <slouken@libsdl.org>
date Fri, 23 Jul 2010 21:33:00 -0700
parents f7b03b6838cb
children b196d2758026
comparison
equal deleted inserted replaced
4567:1d7ea8724f4a 4568:25b9cd8bdc30
421 421
422 static int 422 static int
423 DirectFB_ActivateRenderer(SDL_Renderer * renderer) 423 DirectFB_ActivateRenderer(SDL_Renderer * renderer)
424 { 424 {
425 SDL_DFB_RENDERERDATA(renderer); 425 SDL_DFB_RENDERERDATA(renderer);
426 SDL_Window *window = SDL_GetWindowFromID(renderer->window); 426 SDL_Window *window = renderer->window;
427 SDL_DFB_WINDOWDATA(window); 427 SDL_DFB_WINDOWDATA(window);
428 428
429 if (renddata->size_changed || windata->wm_needs_redraw) { 429 if (renddata->size_changed || windata->wm_needs_redraw) {
430 DirectFB_AdjustWindowSurface(window); 430 DirectFB_AdjustWindowSurface(window);
431 } 431 }
443 443
444 static int 444 static int
445 DirectFB_AcquireVidLayer(SDL_Renderer * renderer, SDL_Texture * texture) 445 DirectFB_AcquireVidLayer(SDL_Renderer * renderer, SDL_Texture * texture)
446 { 446 {
447 SDL_DFB_RENDERERDATA(renderer); 447 SDL_DFB_RENDERERDATA(renderer);
448 SDL_Window *window = SDL_GetWindowFromID(renderer->window); 448 SDL_Window *window = renderer->window;
449 SDL_VideoDisplay *display = window->display; 449 SDL_VideoDisplay *display = window->display;
450 SDL_DFB_DEVICEDATA(display->device); 450 SDL_DFB_DEVICEDATA(display->device);
451 DFB_DisplayData *dispdata = (DFB_DisplayData *) display->driverdata; 451 DFB_DisplayData *dispdata = (DFB_DisplayData *) display->driverdata;
452 DirectFB_TextureData *data = texture->driverdata; 452 DirectFB_TextureData *data = texture->driverdata;
453 DFBDisplayLayerConfig layconf; 453 DFBDisplayLayerConfig layconf;
499 } 499 }
500 500
501 static int 501 static int
502 DirectFB_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) 502 DirectFB_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
503 { 503 {
504 SDL_Window *window = SDL_GetWindowFromID(renderer->window); 504 SDL_Window *window = renderer->window;
505 SDL_VideoDisplay *display = window->display; 505 SDL_VideoDisplay *display = window->display;
506 SDL_DFB_DEVICEDATA(display->device); 506 SDL_DFB_DEVICEDATA(display->device);
507 DirectFB_TextureData *data; 507 DirectFB_TextureData *data;
508 DFBResult ret; 508 DFBResult ret;
509 DFBSurfaceDescription dsc; 509 DFBSurfaceDescription dsc;
948 Uint8 alpha = 0xFF; 948 Uint8 alpha = 0xFF;
949 DFBResult ret; 949 DFBResult ret;
950 950
951 if (texturedata->display) { 951 if (texturedata->display) {
952 int px, py; 952 int px, py;
953 SDL_Window *window = SDL_GetWindowFromID(renderer->window); 953 SDL_Window *window = renderer->window;
954 SDL_DFB_WINDOWDATA(window); 954 SDL_DFB_WINDOWDATA(window);
955 SDL_VideoDisplay *display = texturedata->display; 955 SDL_VideoDisplay *display = texturedata->display;
956 DFB_DisplayData *dispdata = (DFB_DisplayData *) display->driverdata; 956 DFB_DisplayData *dispdata = (DFB_DisplayData *) display->driverdata;
957 957
958 SDL_DFB_CHECKERR(dispdata-> 958 SDL_DFB_CHECKERR(dispdata->
1046 1046
1047 static void 1047 static void
1048 DirectFB_RenderPresent(SDL_Renderer * renderer) 1048 DirectFB_RenderPresent(SDL_Renderer * renderer)
1049 { 1049 {
1050 DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata; 1050 DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata;
1051 SDL_Window *window = SDL_GetWindowFromID(renderer->window); 1051 SDL_Window *window = renderer->window;
1052 SDL_DFB_WINDOWDATA(window); 1052 SDL_DFB_WINDOWDATA(window);
1053 1053
1054 DFBRectangle sr; 1054 DFBRectangle sr;
1055 DFBResult ret; 1055 DFBResult ret;
1056 1056