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

Corrected framebuffer creation problem

Browse source
This commit is contained in:
Nathan Heisey 2011-07-25 13:47:19 +00:00
parent ee8ee9d166
commit 96dd15dd3d
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/video/bwindow/SDL_bmodes.cc
View file

@ -228,13 +228,19 @@ int BE_CreateWindowFramebuffer(_THIS, SDL_Window * window,
/* Create a copy of the pixel buffer if it doesn't recycle */ /* Create a copy of the pixel buffer if it doesn't recycle */
*pixels = bwin->GetWindowFramebuffer(); *pixels = bwin->GetWindowFramebuffer();
if( bwin->CanTrashWindowBuffer() ) { printf(__FILE__": %d; window frame buffer make\n", __LINE__);
if( bwin->CanTrashWindowBuffer() || (*pixels) == NULL) {
if( (*pixels) != NULL ) { if( (*pixels) != NULL ) {
SDL_free(*pixels); SDL_free(*pixels);
} }
*pixels = SDL_calloc((*pitch) * bwin->GetFbHeight() * *pixels = SDL_calloc((*pitch) * bwin->GetFbHeight() *
bwin->GetBytesPerPx(), sizeof(uint8)); bwin->GetBytesPerPx(), sizeof(uint8));
bwin->SetWindowFramebuffer((uint8*)(*pixels)); bwin->SetWindowFramebuffer((uint8*)(*pixels));
if(*pixels) {
printf(__FILE__": %d; Success!\n", __LINE__);
} else {
printf(__FILE__": %d; FAIL!\n", __LINE__);
}
} }
bwin->UnlockBuffer(); bwin->UnlockBuffer();
@ -269,6 +275,7 @@ int BE_UpdateWindowFramebuffer(_THIS, SDL_Window * window,
/* Blit each clipping rectangle */ /* Blit each clipping rectangle */
bscreen.WaitForRetrace(); bscreen.WaitForRetrace();
for(i = 0; i < numClips; ++i) { for(i = 0; i < numClips; ++i) {
clipping_rect rc = clips[i];
/* Get addresses of the start of each clipping rectangle */ /* Get addresses of the start of each clipping rectangle */
int32 width = clips[i].right - clips[i].left + 1; int32 width = clips[i].right - clips[i].left + 1;
int32 height = clips[i].bottom - clips[i].top + 1; int32 height = clips[i].bottom - clips[i].top + 1;
@ -276,7 +283,7 @@ int BE_UpdateWindowFramebuffer(_THIS, SDL_Window * window,
clips[i].top * bufferPitch + clips[i].left * BPP; clips[i].top * bufferPitch + clips[i].left * BPP;
windowpx = windowBaseAddress + windowpx = windowBaseAddress +
clips[i].top * windowPitch + clips[i].left * BPP - windowSub; clips[i].top * windowPitch + clips[i].left * BPP - windowSub;
printf(__FILE__": %d\n\twindowpx = 0x%x\n\tbufferpx = 0x%x\n\twindowPitch = %i\n\tbufferPitch = %i\n", __LINE__, windowpx, bufferpx, windowPitch, bufferPitch);
/* Copy each row of pixels from the window buffer into the frame /* Copy each row of pixels from the window buffer into the frame
buffer */ buffer */
for(y = 0; y < height; ++y) for(y = 0; y < height; ++y)