sdl-ios-xcode: src/SDL_compat.c comparison

comparison src/SDL_compat.c @ 2222:926294b2bb4e

Emphasized the separation between SDL_Surface and SDL_Texture - SDL_Surface is a system memory representation of pixel data - SDL_Texture is a video memory representation of pixel data The concept of SDL_Surface with SDL_HWSURFACE is no longer used. Separated SDL_Texture types by usage rather than memory type - SDL_TEXTUREACCESS_STATIC is for rarely changed pixel data, can be placed in video memory. - SDL_TEXTUREACCESS_STREAMING is for frequently changing pixel data, usually placed in system memory or AGP memory. Optimized the SDL_compat usage of the OpenGL renderer by only using one copy of the framebuffer instead of two.

author	Sam Lantinga <slouken@libsdl.org>
date	Sat, 11 Aug 2007 20:54:31 +0000
parents	98e76ba7d5a4
children	0e70b4b8cf84

comparison

equal deleted inserted replaced

-:1d75c38e1e5c
+:926294b2bb4e
 *x = (mode.w - w) / 2;
 *y = (mode.h - h) / 2;
 }
 }
+static SDL_Surface *
+CreateVideoSurface(SDL_TextureID textureID)
+{
+SDL_Surface *surface;
+Uint32 format;
+int w, h;
+int bpp;
+Uint32 Rmask, Gmask, Bmask, Amask;
+void *pixels;
+int pitch;
+if (SDL_QueryTexture(textureID, &format, NULL, &w, &h) < 0) {
+return NULL;
+}
+if (!SDL_PixelFormatEnumToMasks
+(format, &bpp, &Rmask, &Gmask, &Bmask, &Amask)) {
+SDL_SetError("Unknown texture format");
+return NULL;
+}
+if (SDL_QueryTexturePixels(textureID, &pixels, &pitch) == 0) {
+surface =
+SDL_CreateRGBSurfaceFrom(pixels, w, h, bpp, pitch, Rmask, Gmask,
+Bmask, Amask);
+} else {
+surface =
+SDL_CreateRGBSurface(0, w, h, bpp, Rmask, Gmask, Bmask, Amask);
+}
+return surface;
+}
 SDL_Surface *
 SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags)
 {
 SDL_DisplayMode desktop_mode;
 SDL_DisplayMode mode;
 if (SDL_CreateRenderer
 (SDL_VideoWindow, -1,
 SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTDISCARD) < 0) {
 return NULL;
 }
-SDL_GetRenderDriverInfo(-1, &SDL_VideoRendererInfo);
+SDL_GetRendererInfo(&SDL_VideoRendererInfo);
 /* Create a texture for the screen surface */
 SDL_VideoTexture =
-SDL_CreateTexture(desired_format, SDL_TEXTUREACCESS_LOCAL, width,
+SDL_CreateTexture(desired_format, SDL_TEXTUREACCESS_STREAMING, width,
 height);
 if (!SDL_VideoTexture) {
 SDL_VideoTexture =
-SDL_CreateTexture(SDL_PIXELFORMAT_RGB888, SDL_TEXTUREACCESS_LOCAL,
+SDL_CreateTexture(SDL_PIXELFORMAT_RGB888,
-width, height);
+SDL_TEXTUREACCESS_STREAMING, width, height);
 }
 if (!SDL_VideoTexture) {
 return NULL;
 }
 /* Create the screen surface */
-SDL_VideoSurface = SDL_CreateRGBSurfaceFromTexture(SDL_VideoTexture);
+SDL_VideoSurface = CreateVideoSurface(SDL_VideoTexture);
 if (!SDL_VideoSurface) {
 return NULL;
 }
 SDL_VideoSurface->flags |= surface_flags;
 SDL_VideoSurface->format->palette->colors, 0,
 SDL_VideoSurface->format->palette->ncolors);
 }
 /* Create a shadow surface if necessary */
-if (((bpp != SDL_VideoSurface->format->BitsPerPixel)
+if ((bpp != SDL_VideoSurface->format->BitsPerPixel)
-&& !(flags & SDL_ANYFORMAT))
+&& !(flags & SDL_ANYFORMAT)) {
-|| ((SDL_VideoSurface->flags & SDL_HWSURFACE)
+SDL_ShadowSurface =
-&& !(flags & SDL_HWSURFACE))) {
+SDL_CreateRGBSurface(0, width, height, bpp, 0, 0, 0, 0);
-if ((bpp == SDL_VideoSurface->format->BitsPerPixel)
-|| (flags & SDL_ANYFORMAT)) {
-SDL_ShadowSurface =
-SDL_CreateRGBSurface(0, width, height,
-SDL_VideoSurface->format->BitsPerPixel,
-SDL_VideoSurface->format->Rmask,
-SDL_VideoSurface->format->Gmask,
-SDL_VideoSurface->format->Bmask,
-SDL_VideoSurface->format->Amask);
-} else {
-SDL_ShadowSurface =
-SDL_CreateRGBSurface(0, width, height, bpp, 0, 0, 0, 0);
-}
 if (!SDL_ShadowSurface) {
 return NULL;
 }
 SDL_ShadowSurface->flags |= surface_flags;
 /* We have no other optimised formats right now. When/if a new
 optimised alpha format is written, add the converter here */
 break;
 }
 format = SDL_AllocFormat(32, rmask, gmask, bmask, amask);
-flags = SDL_PublicSurface->flags & SDL_HWSURFACE;
+flags = surface->flags & (SDL_SRCALPHA | SDL_RLEACCELOK);
-flags |= surface->flags & (SDL_SRCALPHA | SDL_RLEACCELOK);
 converted = SDL_ConvertSurface(surface, format, flags);
 SDL_FreeFormat(format);
 return converted;
 }
 /* Fall through to video surface update */
 screen = SDL_VideoSurface;
 }
 if (screen == SDL_VideoSurface) {
+if (screen->flags & SDL_PREALLOC) {
+/* The surface memory is maintained by the renderer */
+SDL_DirtyTexture(SDL_VideoTexture, numrects, rects);
+} else {
+/* The surface memory needs to be copied to texture */
+void *pixels;
+int pitch = screen->pitch;
+int psize = screen->format->BytesPerPixel;
+for (i = 0; i < numrects; ++i) {
+const SDL_Rect *rect = &rects[i];
+void *pixels =
+(Uint8 *) screen->pixels + rect->y * pitch +
+rect->x * psize;
+SDL_UpdateTexture(SDL_VideoTexture, rect, pixels, pitch);
+}
+}
 if (SDL_VideoRendererInfo.flags & SDL_RENDERER_PRESENTCOPY) {
 for (i = 0; i < numrects; ++i) {
 SDL_RenderCopy(SDL_VideoTexture, &rects[i], &rects[i]);
 }
 } else {
 /* Unlock the screen and update if necessary */
 if (SDL_MUSTLOCK(screen)) {
 SDL_UnlockSurface(screen);
 }
-if ((screen->flags & SDL_SCREEN_SURFACE) &&
+if (screen->flags & SDL_SCREEN_SURFACE) {
-!(screen->flags & SDL_HWSURFACE)) {
 SDL_VideoDevice *_this = SDL_GetVideoDevice();
 SDL_Window *window;
 SDL_Rect area;
 window = SDL_GetWindowFromSurface(screen);
 /* Unlock the screen and update if necessary */
 if (SDL_MUSTLOCK(screen)) {
 SDL_UnlockSurface(screen);
 }
-if ((screen->flags & SDL_SCREEN_SURFACE) &&
+if (screen->flags & SDL_SCREEN_SURFACE) {
-!(screen->flags & SDL_HWSURFACE)) {
 SDL_VideoDevice *_this = SDL_GetVideoDevice();
 SDL_Window *window;
 SDL_Rect area;
 window = SDL_GetWindowFromSurface(screen);
 overlay->pitches[0] = overlay->w * 2;
 break;
 }
 overlay->hwdata->textureID =
-SDL_CreateTexture(texture_format, SDL_TEXTUREACCESS_LOCAL, w, h);
+SDL_CreateTexture(texture_format, SDL_TEXTUREACCESS_STREAMING, w, h);
 if (!overlay->hwdata->textureID) {
 SDL_FreeYUVOverlay(overlay);
 return NULL;
 }

Mercurial > sdl-ios-xcode

comparison src/SDL_compat.c @ 2222:926294b2bb4e