Date: Fri, 15 Aug 2003 09:13:59 +0300
From: "Mike Gorchak"
Subject: Patches for tests and QNX6
1) graywin - added support for the gray gradient in the 15/16 bpp modes. Added SDL_VIDEOEXPOSE event handling.
2) testalpha - added support for the gray gradient in the 15/16 bpp modes.
3) testbitmap - added support for the gray gradient in the 8/15/16 bpp modes.
--- a/test/graywin.c Sat Aug 23 23:12:19 2003 +0000
+++ b/test/graywin.c Sat Aug 23 23:18:49 2003 +0000
@@ -20,6 +20,7 @@
static unsigned int seeded = 0;
SDL_Rect area;
Uint32 color;
+ Uint32 randc;
/* Seed the random number generator */
if ( seeded == 0 ) {
@@ -32,7 +33,16 @@
area.h = (rand()%height);
area.x = X-(area.w/2);
area.y = Y-(area.h/2);
- color = (rand()%NUM_COLORS);
+ randc = (rand()%NUM_COLORS);
+
+ if (screen->format->BytesPerPixel==1)
+ {
+ color = randc;
+ }
+ else
+ {
+ color = SDL_MapRGB(screen->format, randc, randc, randc);
+ }
/* Do it! */
SDL_FillRect(screen, &area, color);
@@ -43,12 +53,60 @@
}
}
+void DrawBackground(SDL_Surface *screen)
+{
+ int i, j, k;
+ Uint8 *buffer;
+ Uint16 *buffer16;
+ Uint16 color;
+ Uint8 gradient;
+
+ /* Set the surface pixels and refresh! */
+ /* Use two loops in case the surface is double-buffered (both sides) */
+
+ for ( j=0; j<2; ++j ) {
+ if ( SDL_LockSurface(screen) < 0 ) {
+ fprintf(stderr, "Couldn't lock display surface: %s\n",
+ SDL_GetError());
+ return;
+ }
+ buffer = (Uint8 *)screen->pixels;
+
+ if (screen->format->BytesPerPixel!=2) {
+ for ( i=0; i<screen->h; ++i ) {
+ memset(buffer,(i*(NUM_COLORS-1))/screen->h, screen->w * screen->format->BytesPerPixel);
+ buffer += screen->pitch;
+ }
+ }
+ else
+ {
+ for ( i=0; i<screen->h; ++i ) {
+ gradient=((i*(NUM_COLORS-1))/screen->h);
+ color = SDL_MapRGB(screen->format, gradient, gradient, gradient);
+ buffer16=(Uint16*)buffer;
+ for (k=0; k<screen->w; k++)
+ {
+ *(buffer16+k)=color;
+ }
+ buffer += screen->pitch;
+ }
+ }
+
+ SDL_UnlockSurface(screen);
+ if ( screen->flags & SDL_DOUBLEBUF ) {
+ SDL_Flip(screen);
+ } else {
+ SDL_UpdateRect(screen, 0, 0, 0, 0);
+ break;
+ }
+ }
+}
+
SDL_Surface *CreateScreen(Uint16 w, Uint16 h, Uint8 bpp, Uint32 flags)
{
SDL_Surface *screen;
int i;
SDL_Color palette[NUM_COLORS];
- Uint8 *buffer;
/* Set the video mode */
screen = SDL_SetVideoMode(w, h, bpp, flags);
@@ -60,33 +118,14 @@
fprintf(stderr, "Screen is in %s mode\n",
(screen->flags & SDL_FULLSCREEN) ? "fullscreen" : "windowed");
- /* Set a gray colormap, reverse order from white to black */
- for ( i=0; i<NUM_COLORS; ++i ) {
- palette[i].r = (NUM_COLORS-1)-i * (256 / NUM_COLORS);
- palette[i].g = (NUM_COLORS-1)-i * (256 / NUM_COLORS);
- palette[i].b = (NUM_COLORS-1)-i * (256 / NUM_COLORS);
- }
- SDL_SetColors(screen, palette, 0, NUM_COLORS);
-
- /* Set the surface pixels and refresh! */
- /* Use two loops in case the surface is double-buffered (both sides) */
- for ( i=0; i<2; ++i ) {
- if ( SDL_LockSurface(screen) < 0 ) {
- fprintf(stderr, "Couldn't lock display surface: %s\n",
- SDL_GetError());
- return(NULL);
+ if (bpp==8) {
+ /* Set a gray colormap, reverse order from white to black */
+ for ( i=0; i<NUM_COLORS; ++i ) {
+ palette[i].r = (NUM_COLORS-1)-i * (256 / NUM_COLORS);
+ palette[i].g = (NUM_COLORS-1)-i * (256 / NUM_COLORS);
+ palette[i].b = (NUM_COLORS-1)-i * (256 / NUM_COLORS);
}
- buffer = (Uint8 *)screen->pixels;
- for ( i=0; i<screen->h; ++i ) {
- memset(buffer,(i*(NUM_COLORS-1))/screen->h, screen->w * screen->format->BytesPerPixel);
- buffer += screen->pitch;
- }
- SDL_UnlockSurface(screen);
- if ( screen->flags & SDL_DOUBLEBUF ) {
- SDL_Flip(screen);
- } else {
- SDL_UpdateRect(screen, 0, 0, 0, 0);
- }
+ SDL_SetColors(screen, palette, 0, NUM_COLORS);
}
return(screen);
@@ -151,6 +190,8 @@
if ( screen == NULL ) {
exit(2);
}
+
+ DrawBackground(screen);
/* Wait for a keystroke */
done = 0;
@@ -182,12 +223,16 @@
"Couldn't toggle fullscreen mode\n");
done = 1;
}
+ DrawBackground(screen);
break;
}
/* Any other key quits the application... */
case SDL_QUIT:
done = 1;
break;
+ case SDL_VIDEOEXPOSE:
+ DrawBackground(screen);
+ break;
default:
break;
}
--- a/test/testalpha.c Sat Aug 23 23:12:19 2003 +0000
+++ b/test/testalpha.c Sat Aug 23 23:18:49 2003 +0000
@@ -279,11 +279,15 @@
Uint8 video_bpp;
Uint32 videoflags;
Uint8 *buffer;
- int i, done;
+ int i, k, done;
SDL_Event event;
SDL_Surface *light;
int mouse_pressed;
Uint32 ticks, lastticks;
+ Uint16 *buffer16;
+ Uint16 color;
+ Uint8 gradient;
+
/* Initialize SDL */
if ( SDL_Init(SDL_INIT_VIDEO) < 0 ) {
@@ -298,12 +302,17 @@
video_bpp = info->vfmt->BitsPerPixel;
} else {
video_bpp = 16;
+ fprintf(stderr, "forced 16 bpp mode\n");
}
videoflags = SDL_SWSURFACE;
while ( argc > 1 ) {
--argc;
if ( strcmp(argv[argc-1], "-bpp") == 0 ) {
video_bpp = atoi(argv[argc]);
+ if (video_bpp<=8) {
+ video_bpp=16;
+ fprintf(stderr, "forced 16 bpp mode\n");
+ }
--argc;
} else
if ( strcmp(argv[argc], "-hw") == 0 ) {
@@ -336,10 +345,26 @@
exit(2);
}
buffer=(Uint8 *)screen->pixels;
- for ( i=0; i<screen->h; ++i ) {
- memset(buffer,(i*255)/screen->h, screen->pitch);
- buffer += screen->pitch;
+ if (screen->format->BytesPerPixel!=2) {
+ for ( i=0; i<screen->h; ++i ) {
+ memset(buffer,(i*255)/screen->h, screen->pitch);
+ buffer += screen->pitch;
+ }
}
+ else
+ {
+ for ( i=0; i<screen->h; ++i ) {
+ gradient=((i*255)/screen->h);
+ color = SDL_MapRGB(screen->format, gradient, gradient, gradient);
+ buffer16=(Uint16*)buffer;
+ for (k=0; k<screen->w; k++)
+ {
+ *(buffer16+k)=color;
+ }
+ buffer += screen->pitch;
+ }
+ }
+
SDL_UnlockSurface(screen);
SDL_UpdateRect(screen, 0, 0, 0, 0);
--- a/test/testbitmap.c Sat Aug 23 23:12:19 2003 +0000
+++ b/test/testbitmap.c Sat Aug 23 23:18:49 2003 +0000
@@ -50,8 +50,13 @@
Uint8 video_bpp;
Uint32 videoflags;
Uint8 *buffer;
- int i, done;
+ int i, k, done;
SDL_Event event;
+ Uint16 *buffer16;
+ Uint16 color;
+ Uint8 gradient;
+ SDL_Color palette[256];
+
/* Initialize SDL */
if ( SDL_Init(SDL_INIT_VIDEO) < 0 ) {
@@ -91,6 +96,16 @@
exit(2);
}
+ if (video_bpp==8) {
+ /* Set a gray colormap, reverse order from white to black */
+ for ( i=0; i<256; ++i ) {
+ palette[i].r = 255-i;
+ palette[i].g = 255-i;
+ palette[i].b = 255-i;
+ }
+ SDL_SetColors(screen, palette, 0, 256);
+ }
+
/* Set the surface pixels and refresh! */
if ( SDL_LockSurface(screen) < 0 ) {
fprintf(stderr, "Couldn't lock the display surface: %s\n",
@@ -98,10 +113,25 @@
exit(2);
}
buffer=(Uint8 *)screen->pixels;
- for ( i=0; i<screen->h; ++i ) {
- memset(buffer,(i*255)/screen->h, screen->pitch);
- buffer += screen->pitch;
- }
+ if (screen->format->BytesPerPixel!=2) {
+ for ( i=0; i<screen->h; ++i ) {
+ memset(buffer,(i*255)/screen->h, screen->pitch);
+ buffer += screen->pitch;
+ }
+ }
+ else
+ {
+ for ( i=0; i<screen->h; ++i ) {
+ gradient=((i*255)/screen->h);
+ color = SDL_MapRGB(screen->format, gradient, gradient, gradient);
+ buffer16=(Uint16*)buffer;
+ for (k=0; k<screen->w; k++)
+ {
+ *(buffer16+k)=color;
+ }
+ buffer += screen->pitch;
+ }
+ }
SDL_UnlockSurface(screen);
SDL_UpdateRect(screen, 0, 0, 0, 0);