sdl-ios-xcode: src/video/photon/SDL_ph

comparison src/video/photon/SDL_ph_image.c @ 663:8bedd6d61642

Date: Sat, 2 Aug 2003 16:22:51 +0300 From: "Mike Gorchak" Subject: New patches for QNX6 Here my patches for the SDL/QNX: QNXSDL.diff - diff to non-QNX related sources: - updated BUGS file, I think QNX6 is now will be officially supported - configure.in - added shared library support for QNX, and removed dependency between the ALSA and QNX6. - SDL_audio.c - added QNX NTO sound bootstrap insted of ALSA's. - SDL_sysaudio.h - the same. - SDL_nto_audio.c - the same. - SDL_video.c - right now, QNX doesn't offer any method to obtain pointers to the OpenGL functions by function name, so they must be hardcoded in library, otherwise OpenGL will not be supported. - testsprite.c - fixed: do not draw vertical red line if we are in non-double-buffered mode. sdlqnxph.tar.gz - archive of the ./src/video/photon/* . Too many changes in code to make diffs :) : + Added stub for support hide/unhide window event + Added full YUV overlays support. + Added window maximize support. + Added mouse wheel events. + Added support for some specific key codes in Unicode mode (like ESC). + Added more checks to the all memory allocation code. + Added SDL_DOUBLEBUF support in all fullscreen modes. + Added fallback to window mode, if desired fullscreen mode is not supported. + Added stub support for the GL_LoadLibrary and GL_GetProcAddress functions. + Added resizable window support without caption. ! Fixed bug in the Ph_EV_EXPOSE event handler, when rectangles to update is 0 and when width or height of the rectangle is 0. ! Fixed bug in the event handler code. Events has not been passed to the window widget handler. ! Fixed codes for Win keys (Super/Hyper/Menu). ! Fixed memory leak, when deallocation palette. ! Fixed palette emulation code bugs. ! Fixed fullscreen and hwsurface handling. ! Fixed CLOSE button bug. First event was passed to the handler, but second terminated the application. Now all events passed to the application correctly. - Removed all printfs in code, now SDL_SetError used instead of them. - Disabled ToggleFullScreen function. README.QNX - updated README.QNX file. Added much more issues.

author	Sam Lantinga <slouken@libsdl.org>
date	Mon, 04 Aug 2003 00:52:42 +0000
parents	8e3ce997621c
children	04dd6c6d7c30

comparison

equal deleted inserted replaced

-:66c02f83f5bf
+:8bedd6d61642
 #include "SDL_error.h"
 #include "SDL_endian.h"
 #include "SDL_video.h"
 #include "SDL_pixels_c.h"
 #include "SDL_ph_image_c.h"
+#include "SDL_ph_modes_c.h"
-/* Mask values for SDL_ReallocFormat() */
-struct ColourMasks
-{
-Uint32 red;
-Uint32 green;
-Uint32 blue;
-Uint32 alpha;
-Uint32 bpp;
-};
-static const struct ColourMasks *ph_GetColourMasks( int format )
-{
-/* The alpha mask doesn't appear to be needed */
-static const struct ColourMasks phColorMasks[5] = {
-/*  8 bit      */  {0, 0, 0, 0, 8},
-/* 15 bit ARGB */  {0x7C00, 0x03E0, 0x001F, 0x8000, 16},
-/* 16 bit  RGB */  {0xF800, 0x07E0, 0x001F, 0x0000, 16},
-/* 24 bit  RGB */  {0xFF0000, 0x00FF00, 0x0000FF, 0x000000, 24},
-/* 32 bit ARGB */  {0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000, 32},
-};
-switch( format )
-{
-case Pg_IMAGE_PALETTE_BYTE:
-return &phColorMasks[0];
-break;
-case Pg_IMAGE_DIRECT_1555:
-case Pg_IMAGE_DIRECT_555:
-return &phColorMasks[1];
-break;
-case Pg_IMAGE_DIRECT_565:
-return &phColorMasks[2];
-break;
-case Pg_IMAGE_DIRECT_888:
-return &phColorMasks[3];
-break;
-case Pg_IMAGE_DIRECT_8888:
-return &phColorMasks[4];
-break;
-}
-return NULL;
-}
 int ph_SetupImage(_THIS, SDL_Surface *screen)
 {
 PgColor_t* palette=NULL;
-const struct ColourMasks* mask;
 int type=0;
 int bpp;
 bpp=screen->format->BitsPerPixel;
 case 32:{
 type = Pg_IMAGE_DIRECT_8888;
 }
 break;
 default:{
-fprintf(stderr,"ph_SetupImage(): unsupported bpp=%d !\n", bpp);
+SDL_SetError("ph_SetupImage(): unsupported bpp=%d !\n", bpp);
 return -1;
 }
 break;
 }
 /* palette emulation code */
 if ((bpp==8) && (desktoppal==SDLPH_PAL_EMULATE))
 {
 /* creating image palette */
 palette=malloc(_Pg_MAX_PALETTE*sizeof(PgColor_t));
+if (palette==NULL)
+{
+SDL_SetError("ph_SetupImage(): can't allocate memory for palette !\n");
+return -1;
+}
 PgGetPalette(palette);
 /* using shared memory for speed (set last param to 1) */
 if ((SDL_Image = PhCreateImage(NULL, screen->w, screen->h, type, palette, _Pg_MAX_PALETTE, 1)) == NULL)
 {
-fprintf(stderr,"ph_SetupImage(): PhCreateImage failed for bpp=8 !\n");
+SDL_SetError("ph_SetupImage(): PhCreateImage() failed for bpp=8 !\n");
+free(palette);
 return -1;
 }
 }
 else
 {
 /* using shared memory for speed (set last param to 1) */
 if ((SDL_Image = PhCreateImage(NULL, screen->w, screen->h, type, NULL, 0, 1)) == NULL)
 {
-fprintf(stderr,"ph_SetupImage: PhCreateImage failed !\n");
+SDL_SetError("ph_SetupImage(): PhCreateImage() failed for bpp=%d !\n", bpp);
 return -1;
 }
 }
 screen->pixels = SDL_Image->image;
-screen->pitch = SDL_Image->bpl; /* Recalculated pitch, created by PhCreateImage */
+screen->pitch = SDL_Image->bpl;
-mask = ph_GetColourMasks(type);
-if (mask != NULL)
-{
-SDL_ReallocFormat(screen, mask->bpp, mask->red, mask->green, mask->blue, 0);
-}
 this->UpdateRects = ph_NormalUpdate;
 return 0;
 }
 int ph_SetupOCImage(_THIS, SDL_Surface *screen)
 {
-const struct ColourMasks *mask;
 int type = 0;
 int bpp;
-screen->flags &= ~SDL_DOUBLEBUF;
 OCImage.flags = screen->flags;
 bpp=screen->format->BitsPerPixel;
 /* Determine image type */
 case 32:{
 type = Pg_IMAGE_DIRECT_8888;
 }
 break;
 default:{
-fprintf(stderr,"ph_SetupOCImage(): unsupported bpp=%d !\n", bpp);
+SDL_SetError("ph_SetupOCImage(): unsupported bpp=%d !\n", bpp);
 return -1;
 }
 break;
 }
 * display can be created. */
 OCImage.offscreen_context = PdCreateOffscreenContext(0, screen->w, screen->h, Pg_OSC_MEM_PAGE_ALIGN);
 if (OCImage.offscreen_context == NULL)
 {
-fprintf(stderr, "ph_SetupOCImage(): PdCreateOffscreenContext failed !\n");
+SDL_SetError("ph_SetupOCImage(): PdCreateOffscreenContext() function failed !\n");
 return -1;
 }
-/* If the bit depth of the context is different than was requested,
+screen->pitch = OCImage.offscreen_context->pitch;
-* these values need to be updated accordingly.  SDL will
-* allocate a shadow surface if it needs to. */
+OCImage.dc_ptr = (unsigned char *) PdGetOffscreenContextPtr(OCImage.offscreen_context);
-mask = ph_GetColourMasks(OCImage.offscreen_context->format);
-if (mask != NULL)
+if (OCImage.dc_ptr == NULL)
 {
-SDL_ReallocFormat(screen, mask->bpp, mask->red, mask->green, mask->blue, 0);
+SDL_SetError("ph_SetupOCImage(): PdGetOffscreenContextPtr function failed !\n");
+PhDCRelease(OCImage.offscreen_context);
-if (mask->bpp > 8)
-{
-screen->flags &= ~SDL_HWPALETTE;
-}
-}
-screen->pitch = OCImage.offscreen_context->pitch; /* Recalculated pitch */
-OCImage.dc_ptr.ptr8 = (unsigned char *) PdGetOffscreenContextPtr(OCImage.offscreen_context);
-if (OCImage.dc_ptr.ptr8 == NULL)
-{
-fprintf(stderr, "ph_SetupOCImage(): PdGetOffscreenContextPtr failed !\n");
 return -1;
 }
-OCImage.FrameData0 = OCImage.dc_ptr.ptr8;
+OCImage.FrameData0 = OCImage.dc_ptr;
 OCImage.CurrentFrameData = OCImage.FrameData0;
 OCImage.current = 0;
 PhDCSetCurrent(OCImage.offscreen_context);
 return 0;
 }
 int ph_SetupFullScreenImage(_THIS, SDL_Surface* screen)
 {
-const struct ColourMasks *mask;
-screen->flags &= ~SDL_DOUBLEBUF;
 OCImage.flags = screen->flags;
+/* Begin direct mode */
+if (!ph_EnterFullScreen(this, screen))
+{
+return -1;
+}
+/* store palette for fullscreen */
+if ((screen->format->BitsPerPixel==8) && (desktopbpp!=8))
+{
+PgGetPalette(savedpal);
+PgGetPalette(syspalph);
+}
 OCImage.offscreen_context = PdCreateOffscreenContext(0, 0, 0, Pg_OSC_MAIN_DISPLAY);
 if (OCImage.offscreen_context == NULL)
 {
-fprintf(stderr, "ph_SetupFullScreenImage(): PdCreateOffscreenContext failed !\n");
+SDL_SetError("ph_SetupFullScreenImage(): PdCreateOffscreenContext() function failed !\n");
 return -1;
 }
-/* If the bit depth of the context is different than was requested,
+if ((screen->flags & SDL_DOUBLEBUF) == SDL_DOUBLEBUF)
-* these values need to be updated accordingly.  SDL will
+{
-* allocate a shadow surface if it needs to. */
+OCImage.offscreen_backcontext = PdDupOffscreenContext(OCImage.offscreen_context, Pg_OSC_CRTC_SAFE);
-mask = ph_GetColourMasks(OCImage.offscreen_context->format);
+if (OCImage.offscreen_backcontext == NULL)
-if (mask != NULL)
+{
-{
+SDL_SetError("ph_SetupFullScreenImage(): PdCreateOffscreenContext(back) function failed !\n");
-SDL_ReallocFormat(screen, mask->bpp, mask->red, mask->green, mask->blue, 0);
+return -1;
+}
-if (mask->bpp > 8)
+}
-{
-screen->flags &= ~SDL_HWPALETTE;
+OCImage.FrameData0 = (unsigned char *)PdGetOffscreenContextPtr(OCImage.offscreen_context);
-}
+if (OCImage.FrameData0 == NULL)
-}
+{
+SDL_SetError("ph_SetupFullScreenImage(): PdGetOffscreenContextPtr() function failed !\n");
-screen->pitch = OCImage.offscreen_context->pitch; /* Recalculated pitch */
+ph_DestroyImage(this, screen);
-OCImage.dc_ptr.ptr8 = (unsigned char *)PdGetOffscreenContextPtr(OCImage.offscreen_context);
-if (OCImage.dc_ptr.ptr8 == NULL)
-{
-fprintf(stderr, "ph_SetupOCImage(): PdGetOffscreenContextPtr failed !\n");
 return -1;
 }
-/* wait for hw */
+if ((screen->flags & SDL_DOUBLEBUF) == SDL_DOUBLEBUF)
+{
+OCImage.FrameData1 = (unsigned char *)PdGetOffscreenContextPtr(OCImage.offscreen_backcontext);
+if (OCImage.FrameData1 == NULL)
+{
+SDL_SetError("ph_SetupFullScreenImage(back): PdGetOffscreenContextPtr() function failed !\n");
+ph_DestroyImage(this, screen);
+return -1;
+}
+}
+/* wait for the hardware */
 PgWaitHWIdle();
-OCImage.FrameData0 = OCImage.dc_ptr.ptr8;
+if ((screen->flags & SDL_DOUBLEBUF) == SDL_DOUBLEBUF)
-OCImage.CurrentFrameData = OCImage.FrameData0;
+{
-OCImage.current = 0;
+OCImage.current = 1;
+PhDCSetCurrent(OCImage.offscreen_backcontext);
-PhDCSetCurrent(OCImage.offscreen_context);
+screen->pitch = OCImage.offscreen_backcontext->pitch;
+screen->pixels = OCImage.FrameData1;
-screen->pixels = OCImage.CurrentFrameData;
+PgSwapDisplay(OCImage.offscreen_context, 0);
+}
-this->UpdateRects = ph_OCUpdate;
+else
+{
+OCImage.current = 0;
+PhDCSetCurrent(OCImage.offscreen_context);
+screen->pitch = OCImage.offscreen_context->pitch;
+screen->pixels = OCImage.FrameData0;
+}
+this->UpdateRects = ph_OCDCUpdate;
 return 0;
 }
 void ph_DestroyImage(_THIS, SDL_Surface *screen)
 {
+if (currently_fullscreen)
+{
+/* if we right now in 8bpp fullscreen we must release palette */
+if ((screen->format->BitsPerPixel==8) && (desktopbpp!=8))
+{
+PgSetPalette(syspalph, 0, -1, 0, 0, 0);
+PgSetPalette(savedpal, 0, 0, _Pg_MAX_PALETTE, Pg_PALSET_GLOBAL | Pg_PALSET_FORCE_EXPOSE, 0);
+PgFlush();
+}
+ph_LeaveFullScreen(this);
+}
 if (OCImage.offscreen_context != NULL)
 {
 PhDCRelease(OCImage.offscreen_context);
 OCImage.offscreen_context = NULL;
 OCImage.FrameData0 = NULL;
+}
+if (OCImage.offscreen_backcontext != NULL)
+{
+PhDCRelease(OCImage.offscreen_backcontext);
+OCImage.offscreen_backcontext = NULL;
 OCImage.FrameData1 = NULL;
 }
+OCImage.CurrentFrameData = NULL;
 if (SDL_Image)
 {
 /* if palette allocated, free it */
 if (SDL_Image->palette)
 return ph_SetupOpenGLImage(this, screen);
 }
 return ph_SetupImage(this, screen);
 }
 int ph_AllocHWSurface(_THIS, SDL_Surface *surface)
 {
 return(-1);
 }
 void ph_FreeHWSurface(_THIS, SDL_Surface *surface)
 {
 return;
 }
-int ph_FlipHWSurface(_THIS, SDL_Surface *surface)
+int ph_FlipHWSurface(_THIS, SDL_Surface *screen)
 {
-return(0);
+PhArea_t area;
+area.pos.x=0;
+area.pos.y=0;
+area.size.w=screen->w;
+area.size.h=screen->h;
+if ((screen->flags & SDL_FULLSCREEN) == SDL_FULLSCREEN)
+{
+if (OCImage.current==0)
+{
+PgSwapDisplay(OCImage.offscreen_context, 0);
+OCImage.current=1;
+screen->pitch = OCImage.offscreen_backcontext->pitch;
+screen->pixels = OCImage.FrameData1;
+//            memcpy(OCImage.FrameData1, OCImage.FrameData0, OCImage.offscreen_context->shared_size);
+PgContextBlitArea(OCImage.offscreen_context, &area, OCImage.offscreen_backcontext, &area);
+PhDCSetCurrent(OCImage.offscreen_backcontext);
+PgFlush();
+}
+else
+{
+PgSwapDisplay(OCImage.offscreen_backcontext, 0);
+OCImage.current=0;
+screen->pitch = OCImage.offscreen_context->pitch;
+screen->pixels = OCImage.FrameData0;
+//            memcpy(OCImage.FrameData0, OCImage.FrameData1, OCImage.offscreen_context->shared_size);
+PgContextBlitArea(OCImage.offscreen_backcontext, &area, OCImage.offscreen_context, &area);
+PhDCSetCurrent(OCImage.offscreen_context);
+PgFlush();
+}
+}
+return 0;
 }
 int ph_LockHWSurface(_THIS, SDL_Surface *surface)
 {
 return(0);
 int i;
 for (i=0; i<numrects; ++i)
 {
 	if (rects[i].w==0) /* Clipped? */
+{
+continue;
+}
+	if (rects[i].h==0) /* Clipped? */
 {
 continue;
 }
 ph_pos.x = rects[i].x;
 ph_rect.lr.x = rects[i].x + rects[i].w;
 ph_rect.lr.y = rects[i].y + rects[i].h;
 if (PgDrawPhImageRectmx(&ph_pos, SDL_Image, &ph_rect, 0) < 0)
 {
-fprintf(stderr,"ph_NormalUpdate(): PgDrawPhImageRectmx failed !\n");
+SDL_SetError("ph_NormalUpdate(): PgDrawPhImageRectmx failed !\n");
 }
 }
 if (PgFlush() < 0)
 {
-	fprintf(stderr,"ph_NormalUpdate(): PgFlush failed.\n");
+	SDL_SetError("ph_NormalUpdate(): PgFlush failed.\n");
 }
 }
 void ph_OCUpdate(_THIS, int numrects, SDL_Rect *rects)
 {
 PgWaitHWIdle();
 for (i=0; i<numrects; ++i)
 {
 if (rects[i].w == 0)  /* Clipped? */
+{
+continue;
+}
+if (rects[i].h == 0)  /* Clipped? */
 {
 continue;
 }
 src_rect.pos.x=rects[i].x;
 PgContextBlitArea(OCImage.offscreen_context, &src_rect, NULL, &dest_rect);
 }
 if (PgFlush() < 0)
 {
-fprintf(stderr,"ph_OCUpdate(): PgFlush failed.\n");
+SDL_SetError("ph_OCUpdate(): PgFlush failed.\n");
 }
+}
-/* later used to toggling double buffer */
-if (OCImage.current == 0)
+void ph_OCDCUpdate(_THIS, int numrects, SDL_Rect *rects)
 {
-OCImage.CurrentFrameData = OCImage.FrameData0;
+PgWaitHWIdle();
-}
-else
+if (PgFlush() < 0)
 {
-OCImage.CurrentFrameData = OCImage.FrameData1;
+SDL_SetError("ph_OCDCUpdate(): PgFlush failed.\n");
 }
 }

Mercurial > sdl-ios-xcode

comparison src/video/photon/SDL_ph_image.c @ 663:8bedd6d61642