pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Date: Wed, 26 Nov 2008 19:50:31 +0100

Browse source 
From: Couriersud
Subject: LPGL and closed-source license / Re: [Bug 607] Texture palette not up

Permission granted to release code under both LPGL and closed-source
commercial license.

Please find attached a minor patch fixing vsync handling in the directfb
driver and containing a small update to README.directfb

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403252
This commit is contained in:
Sam Lantinga 2008-11-26 21:59:35 +00:00
parent 4757b1339c
commit 84ebed84ce
2 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
README.DirectFB
View file

@ -27,6 +27,15 @@ make
sudo make install INSTALL_DIR=/usr/local/dfb_GL sudo make install INSTALL_DIR=/usr/local/dfb_GL
------------------------ ------------------------
/etc/directfbrc
This file should contain the following two lines to make
your joystick work:
------------------------
disable-module=joystick
disable-module=linux_input
------------------------
To run the SDL - testprograms: To run the SDL - testprograms:
export SDL_VIDEODRIVER=directfb export SDL_VIDEODRIVER=directfb
@ -39,7 +48,14 @@ To use hardware accelerated YUV-overlays for YUV-textures, use:
export SDL_DIRECTFB_YUV_DIRECT=1 export SDL_DIRECTFB_YUV_DIRECT=1
This is disabled by default. It will only support one concurrent This is disabled by default. It will only support one
overlay and may behave strange if not used with SDL_CreateYUvOverlay YUV texture, namely the first. Every other YUV texture will be
from SDLcompat.c. rendered in software.
In addition, you may use
export SDL_DIRECTFB_YUV_UNDERLAY=1
to make the YUV texture an underlay. This will make the cursor to
be shown.

10
src/video/directfb/SDL_DirectFB_render.c
View file

@ -87,7 +87,8 @@ SDL_RenderDriver DirectFB_RenderDriver = {
"directfb", "directfb",
(SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTCOPY | (SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTCOPY |
SDL_RENDERER_PRESENTFLIP2 | SDL_RENDERER_PRESENTFLIP3 | SDL_RENDERER_PRESENTFLIP2 | SDL_RENDERER_PRESENTFLIP3 |
SDL_RENDERER_PRESENTDISCARD | SDL_RENDERER_ACCELERATED), SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_PRESENTDISCARD |
SDL_RENDERER_ACCELERATED),
(SDL_TEXTUREMODULATE_NONE | SDL_TEXTUREMODULATE_COLOR | (SDL_TEXTUREMODULATE_NONE | SDL_TEXTUREMODULATE_COLOR |
SDL_TEXTUREMODULATE_ALPHA), SDL_TEXTUREMODULATE_ALPHA),
(SDL_TEXTUREBLENDMODE_NONE | SDL_TEXTUREBLENDMODE_MASK | (SDL_TEXTUREBLENDMODE_NONE | SDL_TEXTUREBLENDMODE_MASK |
@ -231,9 +232,10 @@ DirectFB_CreateRenderer(SDL_Window * window, Uint32 flags)
data->flipflags = DSFLIP_PIPELINE | DSFLIP_BLIT; data->flipflags = DSFLIP_PIPELINE | DSFLIP_BLIT;
if (flags & SDL_RENDERER_PRESENTVSYNC) { if (flags & SDL_RENDERER_PRESENTVSYNC) {
data->flipflags = DSFLIP_ONSYNC; data->flipflags |= DSFLIP_WAITFORSYNC;
renderer->info.flags |= SDL_RENDERER_PRESENTVSYNC; renderer->info.flags |= SDL_RENDERER_PRESENTVSYNC;
} } else
data->flipflags |= DSFLIP_ONSYNC;
SDL_DFB_CHECKERR(data->surface->GetCapabilities(data->surface, &scaps)); SDL_DFB_CHECKERR(data->surface->GetCapabilities(data->surface, &scaps));
if (scaps & DSCAPS_DOUBLE) if (scaps & DSCAPS_DOUBLE)
@ -863,7 +865,7 @@ DirectFB_RenderPresent(SDL_Renderer * renderer)
/* Send the data to the display */ /* Send the data to the display */
SDL_DFB_CHECKERR(data->surface-> SDL_DFB_CHECKERR(data->surface->
Flip(data->surface, NULL, 0 * data->flipflags)); Flip(data->surface, NULL, data->flipflags));
return; return;
error: error: