← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libsdl2/trusty-proposed

« back to all changes in this revision

Viewing changes to src/video/directfb/SDL_DirectFB_render.c

  • Committer: Package Import Robot
  • Author(s): Manuel A. Fernandez Montecelo
  • Date: 2013-12-28 12:31:19 UTC
  • mto: (7.1.3 sid)
  • mto: This revision was merged to the branch mainline in revision 7.
  • Revision ID: package-import@ubuntu.com-20131228123119-wehupm72qsjvh6vz
Tags: upstream-2.0.1+dfsg1
Import upstream version 2.0.1+dfsg1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/video/directfb/SDL_DirectFB_render.c
131
131
      (SDL_BLENDMODE_NONE | SDL_BLENDMODE_MASK | SDL_BLENDMODE_BLEND |
132
132
      SDL_BLENDMODE_ADD | SDL_BLENDMODE_MOD),
133
133
     (SDL_SCALEMODE_NONE | SDL_SCALEMODE_FAST |
134
 
      SDL_SCALEMODE_SLOW | SDL_SCALEMODE_BEST),*/
 
134
      SDL_SCALEMODE_SLOW | SDL_SCALEMODE_BEST), */
135
135
     0,
136
136
     {
137
137
             /* formats filled in later */
167
167
#endif
168
168
} DirectFB_TextureData;
169
169
 
170
 
static __inline__ void
 
170
static SDL_INLINE void
171
171
SDLtoDFBRect(const SDL_Rect * sr, DFBRectangle * dr)
172
172
{
173
173
    dr->x = sr->x;
175
175
    dr->h = sr->h;
176
176
    dr->w = sr->w;
177
177
}
178
 
static __inline__ void
 
178
static SDL_INLINE void
179
179
SDLtoDFBRect_Float(const SDL_FRect * sr, DFBRectangle * dr)
180
180
{
181
181
    dr->x = sr->x;
211
211
#endif
212
212
}
213
213
 
214
 
static inline IDirectFBSurface *get_dfb_surface(SDL_Window *window)
 
214
static SDL_INLINE IDirectFBSurface *get_dfb_surface(SDL_Window *window)
215
215
{
216
216
    SDL_SysWMinfo wm_info;
217
217
    SDL_memset(&wm_info, 0, sizeof(SDL_SysWMinfo));
222
222
    return wm_info.info.dfb.surface;
223
223
}
224
224
 
225
 
static inline IDirectFBWindow *get_dfb_window(SDL_Window *window)
 
225
static SDL_INLINE IDirectFBWindow *get_dfb_window(SDL_Window *window)
226
226
{
227
227
    SDL_SysWMinfo wm_info;
228
228
    SDL_memset(&wm_info, 0, sizeof(SDL_SysWMinfo));
266
266
        case SDL_BLENDMODE_ADD:
267
267
            data->blitFlags = DSBLIT_BLEND_ALPHACHANNEL;
268
268
            data->drawFlags = DSDRAW_BLEND;
269
 
            /* FIXME: SRCALPHA kills performance on radeon ... */
 
269
            /* FIXME: SRCALPHA kills performance on radeon ...
270
270
             * It will be cheaper to copy the surface to a temporary surface and premultiply
271
271
             */
272
272
            if (source && TextureHasAlpha(source))
308
308
        entries[i].r = palette->colors[i].r;
309
309
        entries[i].g = palette->colors[i].g;
310
310
        entries[i].b = palette->colors[i].b;
311
 
        entries[i].a = palette->colors[i].unused;
 
311
        entries[i].a = palette->colors[i].a;
312
312
    }
313
313
    SDL_DFB_CHECKERR(surfpal->SetEntries(surfpal, entries, ncolors, 0));
314
314
    return 0;
326
326
 
327
327
    if (event->event == SDL_WINDOWEVENT_SIZE_CHANGED) {
328
328
        /* Rebind the context to the window area and update matrices */
329
 
        /*SDL_CurrentContext = NULL; */
330
 
        /*data->updateSize = SDL_TRUE; */
 
329
        /* SDL_CurrentContext = NULL; */
 
330
        /* data->updateSize = SDL_TRUE; */
331
331
        renddata->size_changed = SDL_TRUE;
332
332
   }
333
333
}
379
379
 
380
380
    /* FIXME: Yet to be tested */
381
381
    renderer->RenderReadPixels = DirectFB_RenderReadPixels;
382
 
    /*renderer->RenderWritePixels = DirectFB_RenderWritePixels; */
 
382
    /* renderer->RenderWritePixels = DirectFB_RenderWritePixels; */
383
383
 
384
384
    renderer->DestroyTexture = DirectFB_DestroyTexture;
385
385
    renderer->DestroyRenderer = DirectFB_DestroyRenderer;
450
450
    SDL_Window *window = renderer->window;
451
451
    SDL_DFB_WINDOWDATA(window);
452
452
 
453
 
    if (renddata->size_changed /*|| windata->wm_needs_redraw*/) {
 
453
    if (renddata->size_changed /* || windata->wm_needs_redraw */) {
454
454
        renddata->size_changed = SDL_FALSE;
455
455
    }
456
456
}
674
674
            colors[i].r = entries[i].r;
675
675
            colors[i].g = entries[i].g;
676
676
            colors[i].b = entries[i].b;
677
 
            colors[i].unused = SDL_ALPHA_OPAQUE;
 
677
            colors[i].a = SDL_ALPHA_OPAQUE;
678
678
        }
679
679
        return 0;
680
680
    } else {
701
701
{
702
702
    switch (texture->blendMode) {
703
703
    case SDL_BLENDMODE_NONE:
704
 
    /*case SDL_BLENDMODE_MASK: */
 
704
    /* case SDL_BLENDMODE_MASK: */
705
705
    case SDL_BLENDMODE_BLEND:
706
706
    case SDL_BLENDMODE_ADD:
707
707
    case SDL_BLENDMODE_MOD:
717
717
{
718
718
    switch (renderer->blendMode) {
719
719
    case SDL_BLENDMODE_NONE:
720
 
    /*case SDL_BLENDMODE_MASK: */
 
720
    /* case SDL_BLENDMODE_MASK: */
721
721
    case SDL_BLENDMODE_BLEND:
722
722
    case SDL_BLENDMODE_ADD:
723
723
    case SDL_BLENDMODE_MOD:
916
916
 
917
917
    switch (renderer->blendMode) {
918
918
    case SDL_BLENDMODE_NONE:
919
 
    /*case SDL_BLENDMODE_MASK: */
 
919
    /* case SDL_BLENDMODE_MASK: */
920
920
    case SDL_BLENDMODE_BLEND:
921
921
        break;
922
922
    case SDL_BLENDMODE_ADD:
1226
1226
    }
1227
1227
#endif
1228
1228
 
1229
 
    if (data) {
1230
 
        SDL_free(data);
1231
 
    }
 
1229
    SDL_free(data);
1232
1230
    SDL_free(renderer);
1233
1231
}
1234
1232