Mercurial > sdl-ios-xcode

diff src/video/win32/SDL_ceddrawrender.c @ 3685:64ce267332c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance.
author Sam Lantinga <slouken@libsdl.org>
date Thu, 21 Jan 2010 06:21:52 +0000
parents 83518f8fcd61
children f7b03b6838cb
line wrap: on
line diff
--- a/src/video/win32/SDL_ceddrawrender.c	Thu Jan 21 05:49:41 2010 +0000
+++ b/src/video/win32/SDL_ceddrawrender.c	Thu Jan 21 06:21:52 2010 +0000
@@ -391,7 +391,7 @@
 {
     SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
     SDL_RendererInfo *info = &DDRAW_RenderDriver.info;
-    SDL_DisplayMode *mode = &SDL_CurrentDisplay.desktop_mode;
+    SDL_DisplayMode *mode = &SDL_CurrentDisplay->desktop_mode;
 
     if (data->ddraw) {
         int i;
@@ -437,7 +437,7 @@
 SDL_Renderer *
 DDRAW_CreateRenderer(SDL_Window * window, Uint32 flags)
 {
-    SDL_VideoDisplay *display = SDL_GetDisplayFromWindow(window);
+    SDL_VideoDisplay *display = window->display;
     SDL_VideoData *videodata = (SDL_VideoData *) display->device->driverdata;
     SDL_WindowData *windowdata = (SDL_WindowData *) window->driverdata;
     SDL_Renderer *renderer;
@@ -479,7 +479,7 @@
     renderer->DestroyTexture = DDRAW_DestroyTexture;
     renderer->DestroyRenderer = DDRAW_DestroyRenderer;
     renderer->info = DDRAW_RenderDriver.info;
-    renderer->window = window->id;
+    renderer->window = window;
     renderer->driverdata = data;
 
     renderer->info.flags = SDL_RENDERER_ACCELERATED;
@@ -568,8 +568,8 @@
 {
     //TODO implement
     /*D3D_RenderData *data = (D3D_RenderData *) renderer->driverdata;
-       SDL_Window *window = SDL_GetWindowFromID(renderer->window);
-       SDL_VideoDisplay *display = SDL_GetDisplayFromWindow(window);
+       SDL_Window *window = renderer->window;
+       SDL_VideoDisplay *display = window->display;
 
        data->pparams.BackBufferWidth = window->w;
        data->pparams.BackBufferHeight = window->h;
@@ -587,8 +587,8 @@
 DDRAW_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
 {
     DDRAW_RenderData *renderdata = (DDRAW_RenderData *) renderer->driverdata;
-    SDL_Window *window = SDL_GetWindowFromID(renderer->window);
-    SDL_VideoDisplay *display = SDL_GetDisplayFromWindow(window);
+    SDL_Window *window = renderer->window;
+    SDL_VideoDisplay *display = window->display;
     Uint32 display_format = display->current_mode.format;
     DDRAW_TextureData *data;
     DDSURFACEDESC ddsd;