sdl-ios-xcode: src/video/directfb/SDL_DirectFB

comparison src/video/directfb/SDL_DirectFB_render.c @ 4636:b196d2758026

Couriersud to Sam Hi Sam, 20100815_1.diff contains updates for the directfb driver: - more documentation, mainly on software OpenGL in README.directfb - Revised error handling leading to leaner code - Improved/fixed OpenGL handling of multiple contexts. - Made the built-in simple window manager handle OpenGL windows. - Rewrote pixelformat mapping - this was quite ugly before. Well, all software GL, but working :-)

author	Sam Lantinga <slouken@libsdl.org>
date	Mon, 16 Aug 2010 09:04:55 -0700
parents	25b9cd8bdc30
children	aa8888658021

comparison

equal deleted inserted replaced

-:0a07d002f10b
+:b196d2758026
 static void DirectFB_UnlockTexture(SDL_Renderer * renderer,
 SDL_Texture * texture);
 static void DirectFB_DirtyTexture(SDL_Renderer * renderer,
 SDL_Texture * texture, int numrects,
 const SDL_Rect * rects);
+static int DirectFB_SetDrawBlendMode(SDL_Renderer * renderer);
 static int DirectFB_RenderDrawPoints(SDL_Renderer * renderer,
 const SDL_Point * points, int count);
 static int DirectFB_RenderDrawLines(SDL_Renderer * renderer,
 const SDL_Point * points, int count);
 static int DirectFB_RenderDrawRects(SDL_Renderer * renderer,
 switch (blendMode) {
 case SDL_BLENDMODE_NONE:
 /**< No blending */
 data->blitFlags = DSBLIT_NOFX;
 data->drawFlags = DSDRAW_NOFX;
-destsurf->SetSrcBlendFunction(destsurf, DSBF_ONE);
+SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_ONE));
-destsurf->SetDstBlendFunction(destsurf, DSBF_ZERO);
+SDL_DFB_CHECK(destsurf->SetDstBlendFunction(destsurf, DSBF_ZERO));
 break;
 case SDL_BLENDMODE_MASK:
 data->blitFlags = DSBLIT_BLEND_ALPHACHANNEL;
 data->drawFlags = DSDRAW_BLEND;
-destsurf->SetSrcBlendFunction(destsurf, DSBF_SRCALPHA);
+SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_SRCALPHA));
-destsurf->SetDstBlendFunction(destsurf, DSBF_INVSRCALPHA);
+SDL_DFB_CHECK(destsurf->SetDstBlendFunction(destsurf, DSBF_INVSRCALPHA));
 break;
 case SDL_BLENDMODE_BLEND:
 data->blitFlags = DSBLIT_BLEND_ALPHACHANNEL;
 data->drawFlags = DSDRAW_BLEND;
-destsurf->SetSrcBlendFunction(destsurf, DSBF_SRCALPHA);
+SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_SRCALPHA));
-destsurf->SetDstBlendFunction(destsurf, DSBF_INVSRCALPHA);
+SDL_DFB_CHECK(destsurf->SetDstBlendFunction(destsurf, DSBF_INVSRCALPHA));
 break;
 case SDL_BLENDMODE_ADD:
 data->blitFlags = DSBLIT_BLEND_ALPHACHANNEL;
 data->drawFlags = DSDRAW_BLEND;
 // FIXME: SRCALPHA kills performance on radeon ...
 // It will be cheaper to copy the surface to
 // a temporay surface and premultiply
 if (source && TextureHasAlpha(source))
-destsurf->SetSrcBlendFunction(destsurf, DSBF_SRCALPHA);
+SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_SRCALPHA));
 else
-destsurf->SetSrcBlendFunction(destsurf, DSBF_ONE);
+SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_ONE));
-destsurf->SetDstBlendFunction(destsurf, DSBF_ONE);
+SDL_DFB_CHECK(destsurf->SetDstBlendFunction(destsurf, DSBF_ONE));
 break;
 case SDL_BLENDMODE_MOD:
 data->blitFlags = DSBLIT_BLEND_ALPHACHANNEL;
 data->drawFlags = DSDRAW_BLEND;
-destsurf->SetSrcBlendFunction(destsurf, DSBF_DESTCOLOR);
+SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_DESTCOLOR));
-destsurf->SetDstBlendFunction(destsurf, DSBF_ZERO);
+SDL_DFB_CHECK(destsurf->SetDstBlendFunction(destsurf, DSBF_ZERO));
 break;
 }
 data->lastBlendMode = blendMode;
 }
 }
 #if USE_DISPLAY_PALETTE
 DirectFB_RenderData *data = (DirectFB_RenderData *) userdata;
 SDL_DFB_WINDOWSURFACE(data->window);
 IDirectFBPalette *surfpal;
-int ret;
 int i;
 int ncolors;
 DFBColor entries[256];
 SDL_DFB_CHECKERR(destsurf->GetPalette(destsurf, &surfpal));
 {
 SDL_DFB_WINDOWDATA(window);
 SDL_VideoDisplay *display = window->display;
 SDL_Renderer *renderer = NULL;
 DirectFB_RenderData *data = NULL;
-DFBResult ret;
 DFBSurfaceCapabilities scaps;
 char *p;
 SDL_DFB_CALLOC(renderer, 1, sizeof(*renderer));
 SDL_DFB_CALLOC(data, 1, sizeof(*data));
 renderer->LockTexture = DirectFB_LockTexture;
 renderer->UnlockTexture = DirectFB_UnlockTexture;
 renderer->DirtyTexture = DirectFB_DirtyTexture;
 renderer->RenderDrawPoints = DirectFB_RenderDrawPoints;
 renderer->RenderDrawLines = DirectFB_RenderDrawLines;
+/* SetDrawColor - no needed */
+renderer->SetDrawBlendMode = DirectFB_SetDrawBlendMode;
 renderer->RenderFillRects = DirectFB_RenderFillRects;
 renderer->RenderDrawRects = DirectFB_RenderDrawRects;
+/* RenderDrawEllipse - no reference implementation yet */
+/* RenderFillEllipse - no reference implementation yet */
 renderer->RenderCopy = DirectFB_RenderCopy;
 renderer->RenderPresent = DirectFB_RenderPresent;
+/* RenderReadPixels is difficult to implement */
+/* RenderWritePixels is difficult to implement */
 renderer->DestroyTexture = DirectFB_DestroyTexture;
 renderer->DestroyRenderer = DirectFB_DestroyRenderer;
 renderer->info = DirectFB_RenderDriver.info;
 renderer->window = window;      /* SDL window */
 renderer->driverdata = data;
 data->window = window;
 data->flipflags = DSFLIP_PIPELINE | DSFLIP_BLIT;
 if (flags & SDL_RENDERER_PRESENTVSYNC) {
-data->flipflags |= DSFLIP_WAITFORSYNC;
+data->flipflags |= DSFLIP_WAITFORSYNC | DSFLIP_ONSYNC;
 renderer->info.flags |= SDL_RENDERER_PRESENTVSYNC;
 } else
 data->flipflags |= DSFLIP_ONSYNC;
 SDL_DFB_CHECKERR(windata->surface->
 return DSPF_UNKNOWN;
 case SDL_PIXELFORMAT_INDEX1MSB:
 return DSPF_UNKNOWN;
 case SDL_PIXELFORMAT_INDEX4MSB:
 return DSPF_UNKNOWN;
+#if (DFB_VERSION_ATLEAST(1,2,0))
 case SDL_PIXELFORMAT_RGB444:
-#if (DFB_VERSION_ATLEAST(1,2,0))
 return DSPF_RGB444;
-#else
-return DSPF_UNKNOWN;
 #endif
 case SDL_PIXELFORMAT_BGR24:
 return DSPF_UNKNOWN;
 case SDL_PIXELFORMAT_BGR888:
 return DSPF_UNKNOWN;
 SDL_DFB_RENDERERDATA(renderer);
 SDL_Window *window = renderer->window;
 SDL_DFB_WINDOWDATA(window);
 if (renddata->size_changed || windata->wm_needs_redraw) {
-DirectFB_AdjustWindowSurface(window);
+//        DirectFB_AdjustWindowSurface(window);
 }
 return 0;
 }
 static int
 SDL_VideoDisplay *display = window->display;
 SDL_DFB_DEVICEDATA(display->device);
 DFB_DisplayData *dispdata = (DFB_DisplayData *) display->driverdata;
 DirectFB_TextureData *data = texture->driverdata;
 DFBDisplayLayerConfig layconf;
-int ret;
+DFBResult ret;
 if (renddata->isyuvdirect && (dispdata->vidID >= 0)
 && (!dispdata->vidIDinuse)
 && SDL_ISPIXELFORMAT_FOURCC(data->format)) {
 layconf.flags =
 SDL_DFB_CHECKERR(dispdata->
 vidlayer->SetCooperativeLevel(dispdata->vidlayer,
 DLSCL_EXCLUSIVE));
 if (devdata->use_yuv_underlays) {
-ret = dispdata->vidlayer->SetLevel(dispdata->vidlayer, -1);
+ret = SDL_DFB_CHECK(dispdata->vidlayer->SetLevel(dispdata->vidlayer, -1));
 if (ret != DFB_OK)
 SDL_DFB_DEBUG("Underlay Setlevel not supported\n");
 }
 SDL_DFB_CHECKERR(dispdata->
 vidlayer->SetConfiguration(dispdata->vidlayer,
 {
 SDL_Window *window = renderer->window;
 SDL_VideoDisplay *display = window->display;
 SDL_DFB_DEVICEDATA(display->device);
 DirectFB_TextureData *data;
-DFBResult ret;
 DFBSurfaceDescription dsc;
 DFBSurfacePixelFormat pixelformat;
 SDL_DFB_CALLOC(data, 1, sizeof(*data));
 texture->driverdata = data;
 SDL_Texture * texture,
 const SDL_Color * colors, int firstcolor,
 int ncolors)
 {
 DirectFB_TextureData *data = (DirectFB_TextureData *) texture->driverdata;
-DFBResult ret;
 if (SDL_ISPIXELFORMAT_INDEXED(data->format)
 && !SDL_ISPIXELFORMAT_FOURCC(data->format)) {
 DFBColor entries[256];
 int i;
 DirectFB_GetTexturePalette(SDL_Renderer * renderer,
 SDL_Texture * texture, SDL_Color * colors,
 int firstcolor, int ncolors)
 {
 DirectFB_TextureData *data = (DirectFB_TextureData *) texture->driverdata;
-DFBResult ret;
 if (SDL_ISPIXELFORMAT_INDEXED(data->format)
 && !SDL_ISPIXELFORMAT_FOURCC(data->format)) {
 DFBColor entries[256];
 int i;
 case SDL_BLENDMODE_MOD:
 return 0;
 default:
 SDL_Unsupported();
 texture->blendMode = SDL_BLENDMODE_NONE;
+return -1;
+}
+}
+static int
+DirectFB_SetDrawBlendMode(SDL_Renderer * renderer)
+{
+switch (renderer->blendMode) {
+case SDL_BLENDMODE_NONE:
+case SDL_BLENDMODE_MASK:
+case SDL_BLENDMODE_BLEND:
+case SDL_BLENDMODE_ADD:
+case SDL_BLENDMODE_MOD:
+return 0;
+default:
+SDL_Unsupported();
+renderer->blendMode = SDL_BLENDMODE_NONE;
 return -1;
 }
 }
 static int
 static int
 DirectFB_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
 const SDL_Rect * rect, const void *pixels, int pitch)
 {
 DirectFB_TextureData *data = (DirectFB_TextureData *) texture->driverdata;
-DFBResult ret;
 Uint8 *dpixels;
 int dpitch;
 Uint8 *src, *dst;
 int row;
 size_t length;
 const SDL_Rect * rect, int markDirty,
 void **pixels, int *pitch)
 {
 DirectFB_TextureData *texturedata =
 (DirectFB_TextureData *) texture->driverdata;
-DFBResult ret;
 if (markDirty) {
 SDL_AddDirtyRect(&texturedata->dirty, rect);
 }
 {
 DirectFB_TextureData *texturedata =
 (DirectFB_TextureData *) texture->driverdata;
 if (texturedata->display) {
-texturedata->surface->Unlock(texturedata->surface);
+SDL_DFB_CHECK(texturedata->surface->Unlock(texturedata->surface));
 texturedata->pixels = NULL;
 }
 }
 static void
 PrepareDraw(SDL_Renderer * renderer)
 {
 DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata;
 SDL_DFB_WINDOWSURFACE(data->window);
-DFBResult ret;
 Uint8 r, g, b, a;
 r = renderer->r;
 g = renderer->g;
 b = renderer->b;
 static int DirectFB_RenderDrawPoints(SDL_Renderer * renderer,
 const SDL_Point * points, int count)
 {
 DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata;
 SDL_DFB_WINDOWSURFACE(data->window);
-DFBResult ret;
 int i;
 PrepareDraw(renderer);
 for (i=0; i < count; i++)
 	SDL_DFB_CHECKERR(destsurf->DrawLine(destsurf, points[i].x, points[i].y, points[i].x, points[i].y));
 static int DirectFB_RenderDrawLines(SDL_Renderer * renderer,
 const SDL_Point * points, int count)
 {
 DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata;
 SDL_DFB_WINDOWSURFACE(data->window);
-DFBResult ret;
 int i;
 PrepareDraw(renderer);
 /* Use antialiasing when available */
 #if (DFB_VERSION_ATLEAST(1,2,0))
 static int
 DirectFB_RenderDrawRects(SDL_Renderer * renderer, const SDL_Rect ** rects, int count)
 {
 DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata;
 SDL_DFB_WINDOWSURFACE(data->window);
-DFBResult ret;
 int i;
 PrepareDraw(renderer);
 for (i=0; i<count; i++)
 static int
 DirectFB_RenderFillRects(SDL_Renderer * renderer, const SDL_Rect ** rects, int count)
 {
 DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata;
 SDL_DFB_WINDOWSURFACE(data->window);
-DFBResult ret;
 int i;
 PrepareDraw(renderer);
 for (i=0; i<count; i++)
 DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata;
 SDL_DFB_WINDOWSURFACE(data->window);
 DirectFB_TextureData *texturedata =
 (DirectFB_TextureData *) texture->driverdata;
 Uint8 alpha = 0xFF;
-DFBResult ret;
 if (texturedata->display) {
 int px, py;
 SDL_Window *window = renderer->window;
 SDL_DFB_WINDOWDATA(window);
 SDL_DFB_CHECKERR(dispdata->
 vidlayer->SetSourceRectangle(dispdata->vidlayer,
 srcrect->x, srcrect->y,
 srcrect->w,
 srcrect->h));
-windata->window->GetPosition(windata->window, &px, &py);
+SDL_DFB_CHECK(windata->window->GetPosition(windata->window, &px, &py));
 px += windata->client.x;
 py += windata->client.y;
 SDL_DFB_CHECKERR(dispdata->
 vidlayer->SetScreenRectangle(dispdata->vidlayer,
 px + dstrect->x,
 DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata;
 SDL_Window *window = renderer->window;
 SDL_DFB_WINDOWDATA(window);
 DFBRectangle sr;
-DFBResult ret;
 sr.x = 0;
 sr.y = 0;
 sr.w = window->w;
 sr.h = window->h;
 SDL_DFB_RELEASE(data->surface);
 if (data->display) {
 DFB_DisplayData *dispdata =
 (DFB_DisplayData *) data->display->driverdata;
 dispdata->vidIDinuse = 0;
-dispdata->vidlayer->SetCooperativeLevel(dispdata->vidlayer,
+/* FIXME: Shouldn't we reset the cooperative level */
-DLSCL_ADMINISTRATIVE);
+SDL_DFB_CHECK(dispdata->vidlayer->SetCooperativeLevel(dispdata->vidlayer,
+DLSCL_ADMINISTRATIVE));
 SDL_DFB_RELEASE(dispdata->vidlayer);
 }
 SDL_FreeDirtyRects(&data->dirty);
 SDL_DFB_FREE(data->pixels);
 SDL_free(data);

Mercurial > sdl-ios-xcode

comparison src/video/directfb/SDL_DirectFB_render.c @ 4636:b196d2758026