glide3x, tests: applied warning and build fixes from glide2x tree.

This commit is contained in:
sezero
2018-08-23 00:28:02 +03:00
parent f2e22ecf56
commit 2ab9b505eb
181 changed files with 830 additions and 925 deletions

View File

@@ -32,11 +32,6 @@ static const char name[] = "display";
static const char purpose[] = "display a 16 bit frame buffer (565 format) dump out";
static const char usage[] = "-n <frames> -r <res> -s srcimage -t testimage";
static const char *renderBufferString[] = {
"GR_BUFFER_FRONTBUFFER",
"GR_BUFFER_BACKBUFFER "
};
static const char *sourceFormatString[] = {
"GR_LFB_SRC_FMT_565 ",
"GR_LFB_SRC_FMT_555 ",
@@ -61,7 +56,8 @@ static void imageConvert( void *dst,
GrLfbSrcFmt_t format,
FxU32 *bpp );
void main( int argc, char **argv) {
int main( int argc, char **argv)
{
char match;
char **remArgs;
int rv;
@@ -77,7 +73,7 @@ void main( int argc, char **argv) {
LFB_Img src, dst, diff;
FxBool txtdisplay = FXTRUE;
void *image;
void *image = NULL;
FxU32 bpp;
GrLfbSrcFmt_t sourceFormat;
@@ -89,13 +85,13 @@ void main( int argc, char **argv) {
dstfname[0] = 0;
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrst", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrst", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -161,8 +157,8 @@ void main( int argc, char **argv) {
/* readng the LFB file header */
fread(&src.signature, 4, 1, fp);
if (src.signature != IMAGE_SRLE) {
printf("%s file type incorrect\n");
return;
printf("%s file type incorrect\n", srcfname);
return -1;
}
fread(&src.width, 2, 1, fp);
fread(&src.height, 2, 1, fp);
@@ -195,8 +191,8 @@ void main( int argc, char **argv) {
/* readng the LFB file header */
fread(&dst.signature, 4, 1, fp);
if (dst.signature != IMAGE_SRLE) {
printf("%s file type incorrect\n");
return;
printf("%s file type incorrect\n", dstfname);
return -1;
}
fread(&dst.width, 2, 1, fp);
fread(&dst.height, 2, 1, fp);
@@ -214,6 +210,7 @@ void main( int argc, char **argv) {
}
}
diff.data = NULL;
diff.width = 0;
diff.height = 0;
@@ -259,7 +256,7 @@ void main( int argc, char **argv) {
}
if ( ( imageWidth > (FxU32)scrWidth ) ||
( imageHeight > (FxU32)scrHeight ) )
return;
return -1;
while( frames-- ) {
@@ -351,7 +348,7 @@ void main( int argc, char **argv) {
if (srcfname[0] && dstfname[0])
free(diff.data);
free(image);
return;
return 0;
}

View File

@@ -27,7 +27,7 @@ static const char name[] = "sbench";
static const char purpose[] = "benchmark grDrawVertexArray for gouraud shaded triangle";
static const char usage[] = "-n <frames> -r <res> -d <filename> -l <primitive type> -v <vertex array size> -t <triangel size> -p -a";
char *Usage(void)
void Usage(void)
{
printf (" -l <type> => primitive type\n");
printf (" => 0 point\n");
@@ -41,7 +41,6 @@ char *Usage(void)
printf (" -t <size> => triangle size\n");
printf (" -p => packed color\n");
printf (" -a => antialiased\n");
return NULL;
}
void
@@ -65,7 +64,7 @@ setVertexXyzRgbaSt( FxFloat *v, FxFloat x, FxFloat y, FxFloat z,
*(v+GR_VERTEX_TOW_TMU1_OFFSET) = t * 1.f;
}
void
int
main( int argc, char **argv)
{
char
@@ -105,14 +104,14 @@ main( int argc, char **argv)
FxU32 wrange[2];
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, args, &match, &remArgs ) ) {
while((rv = tlGetOpt(argc, argv, args, &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
Usage();
return;
return -1;
}
switch( match ) {
case 'n':
@@ -427,10 +426,5 @@ main( int argc, char **argv)
}
grGlideShutdown();
return;
return 0;
} /* main */

View File

@@ -23,7 +23,7 @@ static const char name[] = "test00";
static const char purpose[] = "Clear screen to blue";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void
int
main( int argc, char **argv)
{
char match;
@@ -43,13 +43,13 @@ main( int argc, char **argv)
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -118,6 +118,6 @@ main( int argc, char **argv)
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -24,7 +24,7 @@ static const char name[] = "test01";
static const char purpose[] = "draws a diagonal line of points from top-left to bottom-right";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void
int
main( int argc, char **argv) {
char match;
char **remArgs;
@@ -43,13 +43,13 @@ main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -138,7 +138,7 @@ main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -24,7 +24,7 @@ static const char name[] = "test02";
static const char purpose[] = "draws a parabolic envelope of lines";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -141,7 +141,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -24,7 +24,7 @@ static const char name[] = "test03";
static const char purpose[] = "draws gouraud shaded lines";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -136,7 +136,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -24,7 +24,7 @@ static const char name[] = "test04";
static const char purpose[] = "draws gouraud shaded triangle";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -140,7 +140,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -24,7 +24,7 @@ static const char name[] = "test04";
static const char purpose[] = "draws gouraud shaded triangle";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -141,7 +141,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -24,7 +24,7 @@ static const char name[] = "test05";
static const char purpose[] = "renders two interpenetrating triangles with z-buffering";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void
int
main( int argc, char **argv)
{
char match;
@@ -44,13 +44,13 @@ main( int argc, char **argv)
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -174,7 +174,7 @@ main( int argc, char **argv)
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -24,7 +24,7 @@ static const char name[] = "test06";
static const char purpose[] = "renders two interpenetrating triangles with w-buffering";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -172,7 +172,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -24,7 +24,7 @@ static const char name[] = "test07";
static const char purpose[] = "alpha blending test";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -41,13 +41,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -153,7 +153,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -24,7 +24,7 @@ static const char name[] = "test08";
static const char purpose[] = "fogging";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -43,13 +43,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -158,7 +158,7 @@ void main( int argc, char **argv) {
grGlideShutdown();
free(fogtable);
return;
return 0;
}

View File

@@ -26,7 +26,7 @@ static const char purpose[] = "chromakey and chromarange - render a red and blue
" triangle but chromakey one out";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -48,13 +48,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -190,7 +190,7 @@ void main( int argc, char **argv) {
cnt = strcspn(filename, ".");
strncpy(fname, filename, cnt);
fname[cnt] = 0;
sprintf(tmp,"_%d\0", subframe);
sprintf(tmp,"_%d", subframe);
strcat(fname, tmp);
strcat(fname, filename+cnt);
if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -230,7 +230,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -26,7 +26,7 @@ static const char purpose[] = "culling test - render a red and blue"
", blue negative";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -46,13 +46,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -154,7 +154,7 @@ void main( int argc, char **argv) {
cnt = strcspn(filename, ".");
strncpy(fname, filename, cnt);
fname[cnt] = 0;
sprintf(tmp,"_%d\0", subframe);
sprintf(tmp,"_%d", subframe);
strcat(fname, tmp);
strcat(fname, filename+cnt);
if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -187,7 +187,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -27,7 +27,7 @@ static const char usage[] = "-n <frames> -r <res>";
static int rRandom(int s, int e);
static unsigned int iRandom (unsigned int maxr);
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -47,13 +47,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return 0;
}
switch( match ) {
case 'n':
@@ -138,7 +138,7 @@ void main( int argc, char **argv) {
if ( tlScaleX(1.0f) < 64.0 ||
tlScaleY(1.0f) < 64.0 )
return;
return -1;
/* generate random start position */
startX = (int)rRandom( 64, (int)tlScaleX(1.0f) - 65 );
@@ -213,7 +213,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}
static unsigned int randx = 1;

View File

@@ -59,7 +59,7 @@ static const char *pixPipeString[] = {
"PIXELPIPE ENABLED "
};
void
int
main( int argc, char **argv)
{
char match;
@@ -87,13 +87,13 @@ main( int argc, char **argv)
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -109,7 +109,7 @@ main( int argc, char **argv)
if ( resolution == GR_RESOLUTION_NONE ) {
tlErrorMessage( "Error!: Frontbuffer rendering not supported in a window\n" );
return;
return -1;
}
tlSetScreen( scrWidth, scrHeight );
@@ -326,7 +326,7 @@ main( int argc, char **argv)
}
grGlideShutdown();
return;
return 0;
} /* main */

View File

@@ -25,7 +25,7 @@ static const char name[] = "test13";
static const char purpose[] = "iterated alpha test - blue triangle fades towards one vertex\n";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -160,5 +160,5 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -25,7 +25,7 @@ static const char purpose[] = "depth bias test: vary depth bias \n"
"over time with two interpenetrating triangles";
static const char usage[] = "-n <frames> -r <res>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -44,13 +44,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -171,5 +171,5 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -24,7 +24,7 @@ static const char name[] = "test15";
static const char purpose[] = "clip rectangle testing - clip rectangle travels around screen";
static const char usage[] = "-n <frames> -r <res>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -204,5 +204,5 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -25,7 +25,7 @@ static const char name[] = "test16";
static const char purpose[] = "test grShamelessPlug and grSplash";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -43,13 +43,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -191,5 +191,5 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -45,7 +45,7 @@ const char *textureModeNames[] = {
"(ITRGB * TEXTURE)+WHITE SPECULAR"
};
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -62,13 +62,13 @@ void main( int argc, char **argv) {
FxU32 zrange[2];
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -285,7 +285,7 @@ void main( int argc, char **argv) {
cnt = strcspn(filename, ".");
strncpy(fname, filename, cnt);
fname[cnt] = 0;
sprintf(tmp,"_%d\0", subframe);
sprintf(tmp,"_%d", subframe);
strcat(fname, tmp);
strcat(fname, filename+cnt);
if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -313,5 +313,5 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -25,7 +25,7 @@ static const char name[] = "test18";
static const char purpose[] = "alpha texture test";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -45,13 +45,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -246,5 +246,5 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -52,7 +52,7 @@ static int loadTexture( const char *filename,
void *table );
static GrTexTable_t texTableType( GrTextureFormat_t format );
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -75,13 +75,13 @@ void main( int argc, char **argv) {
strcpy(texfilename, "miro.3df");
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrdt", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrdt", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -296,7 +296,7 @@ void main( int argc, char **argv) {
cnt = strcspn(filename, ".");
strncpy(fname, filename, cnt);
fname[cnt] = 0;
sprintf(tmp,"_%d\0", subframe);
sprintf(tmp,"_%d", subframe);
strcat(fname, tmp);
strcat(fname, filename+cnt);
if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -350,7 +350,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -27,7 +27,7 @@ static const char usage[] = "-n <frames> -r <res>";
typedef enum { DISABLE, NEAREST, TRILINEAR } MipMapMode;
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -49,13 +49,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -304,7 +304,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -26,7 +26,7 @@ static const char usage[] = "-n <frames> -r <res>";
typedef enum { LIGHTMAP, SPECULAR, DETAIL } Mode;
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -54,13 +54,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -356,7 +356,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -24,7 +24,7 @@ static const char name[] = "test22";
static const char purpose[] = "fog with multi-pass texturing";
static const char usage[] = "-n <frames> -r <res>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -51,13 +51,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -295,7 +295,7 @@ void main( int argc, char **argv) {
grGlideShutdown();
free(fogtable);
return;
return 0;
}

View File

@@ -29,7 +29,7 @@ static unsigned int iRandom (unsigned int maxr);
typedef enum { NORMAL, ANTIALIASED } Mode;
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -55,13 +55,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -233,7 +233,7 @@ void main( int argc, char **argv) {
grGlideShutdown();
free(fogtable);
return;
return 0;
}
static unsigned int randx = 1;

View File

@@ -29,7 +29,7 @@ static unsigned int iRandom (unsigned int maxr);
typedef enum { NORMAL, ANTIALIASED } Mode;
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -54,13 +54,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -232,7 +232,7 @@ void main( int argc, char **argv) {
grGlideShutdown();
free(fogtable);
return;
return 0;
}
static unsigned int randx = 1;

View File

@@ -152,7 +152,7 @@ static int screenFulls[] = {
#define NFRAMES 20
#define NVERTS 3
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -175,7 +175,7 @@ void main( int argc, char **argv) {
y_angle = 0.0f; /* rotation amount */
int
firstTime; /* Used for performance calculations */
firstTime = 1; /* Used for performance calculations */
FxBool
plugging = FXFALSE, /* Show shameless plug */
@@ -196,7 +196,7 @@ void main( int argc, char **argv) {
swapDelay = 1, /* Arg to grBufferSwap */
trisDrawn, /* # triangles drawn */
trisProcessed, /* # triangles through pipeline */
lastFrame, /* Number of last frame we did perf stats */
lastFrame = 0, /* Number of last frame we did perf stats */
frameNum = 0L; /* id of each frame drawn */
GrCullMode_t
@@ -231,13 +231,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrbtea", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrbtea", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -872,4 +872,5 @@ void main( int argc, char **argv) {
break;
}
grGlideShutdown();
return 0;
}

View File

@@ -24,11 +24,6 @@ static const char name[] = "test26";
static const char purpose[] = "tests grLfbWriteRegion, and grLfbReadRegion";
static const char usage[] = "-n <frames> -r <res>";
static const char *renderBufferString[] = {
"GR_BUFFER_FRONTBUFFER",
"GR_BUFFER_BACKBUFFER "
};
static const char *sourceFormatString[] = {
"GR_LFB_SRC_FMT_565 ",
"GR_LFB_SRC_FMT_555 ",
@@ -53,7 +48,7 @@ static void imageConvert( void *dst,
GrLfbSrcFmt_t format,
FxU32 *bpp );
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -78,13 +73,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -144,7 +139,7 @@ void main( int argc, char **argv) {
(int) scrWidth, (int) scrHeight);
tlErrorMessage(errMsg);
return;
return -1;
}
sourceFormat = GR_LFB_SRC_FMT_565;
@@ -228,7 +223,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -25,7 +25,7 @@ static const char usage[] = "-n <frames> -r <res>";
static int rRandom(int s, int e);
static unsigned int iRandom (unsigned int maxr);
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -44,13 +44,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "Nnr", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "Nnr", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -157,7 +157,7 @@ doNothing:
}
grGlideShutdown();
return;
return 0;
}
static unsigned int randx = 1;

View File

@@ -79,7 +79,7 @@ static const char name[] = "test28";
static const char purpose[] = "planar polygon test";
static const char usage[] = "-n <frames> -r <res>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -101,13 +101,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -215,5 +215,5 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -30,7 +30,7 @@ static const char usage[] = "\t-d <screen dump filename>\n"
"\t-s [force single texturing]\n";
void main(int argc, char **argv) {
int main(int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -58,13 +58,13 @@ void main(int argc, char **argv) {
assert(hwconfig = tlVoodooType());
/* Process Command Line Arguments */
while(rv = tlGetOpt(argc, argv, "dlmnprs", &match, &remArgs)) {
while ((rv = tlGetOpt(argc, argv, "dlmnprs", &match, &remArgs)) != 0) {
if (rv == -1) {
printf("Unrecognized command line argument\n");
printf("%s %s\n", name, usage);
printf("Available resolutions:\n%s\n",
tlGetResolutionList());
return;
return -1;
}
switch(match) {
case 'd':
@@ -358,4 +358,5 @@ void main(int argc, char **argv) {
__errExit:
grGlideShutdown();
return 0;
}

View File

@@ -128,7 +128,7 @@ main(int argc, char **argv) {
char **remArgs;
int rv;
while(rv = tlGetOpt(argc, argv, "ndv", &match, &remArgs)) {
while((rv = tlGetOpt(argc, argv, "ndv", &match, &remArgs)) != 0) {
if(rv == -1) {
printf("Unrecognized command line argument\n");
printf("%s %s\n", name, usage);

View File

@@ -46,7 +46,7 @@ static void doHelp( void ) {
tlConClear();
}
void
int
main( int argc, char **argv)
{
char
@@ -80,13 +80,13 @@ main( int argc, char **argv)
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, args, &match, &remArgs ) ) {
while((rv = tlGetOpt(argc, argv, args, &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -379,7 +379,7 @@ main( int argc, char **argv)
}
grGlideShutdown();
return;
return 0;
} /* main */

View File

@@ -46,7 +46,7 @@ static void doHelp( void ) {
tlConClear();
}
void
int
main( int argc, char **argv)
{
char
@@ -86,13 +86,13 @@ main( int argc, char **argv)
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, args, &match, &remArgs ) ) {
while((rv = tlGetOpt(argc, argv, args, &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -493,7 +493,7 @@ main( int argc, char **argv)
}
grGlideShutdown();
return;
return 0;
} /* main */

View File

@@ -27,7 +27,7 @@ static const char name[] = "test33";
static const char purpose[] = "draws gouraud shaded triangle strip and fan with grDrawVertexArray(GR_TRIANGLE_STRIP(FAN)_CONTINUE";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -51,13 +51,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
goto _quit;
}
switch( match ) {
case 'n':
@@ -181,15 +181,15 @@ void main( int argc, char **argv) {
printf( "Cannot open %s\n", filename);
scrgrab = FXFALSE;
}
if ( tlKbHit() ) goto exit;
if ( tlKbHit() ) goto _quit;
}
}
}
tlSleep( 1 );
exit:
_quit:
grGlideShutdown();
return;
return 0;
}

View File

@@ -35,7 +35,7 @@ static const char name[] = "test34";
static const char purpose[] = "fogging with table/fogcoord";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -65,13 +65,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -120,7 +120,7 @@ void main( int argc, char **argv) {
if (!extstr) {
printf( "FOGCOORD is not supported in %s\n", grGetString(GR_HARDWARE) );
grGlideShutdown();
return;
return -1;
}
if (!strncmp(extstr, "FOGCOORD", 8)) {
fogext = FXTRUE;
@@ -297,7 +297,7 @@ void main( int argc, char **argv) {
grGlideShutdown();
free(fogtable);
return;
return 0;
}

View File

@@ -24,7 +24,7 @@ static const char name[] = "test35";
static const char purpose[] = "texture chromarange";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -35,7 +35,6 @@ void main( int argc, char **argv) {
int frames = -1;
FxBool scrgrab = FXFALSE;
char filename[256];
int ftsize = 0;
TlTexture baseTexture;
unsigned int baseTextureAddr;
@@ -55,13 +54,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -125,7 +124,7 @@ void main( int argc, char **argv) {
*/
extension = grGetString(GR_EXTENSION);
if (extstr = strstr(extension, "CHROMARANGE")) {
if ((extstr = strstr(extension, "CHROMARANGE")) != NULL) {
if (!strncmp(extstr, "CHROMARANGE", 11)) {
grTexChromaModeExt = grGetProcAddress("grTexChromaModeExt");
grTexChromaRangeExt = grGetProcAddress("grTexChromaRangeExt");
@@ -304,5 +303,5 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -17,8 +17,6 @@
#include "tlib.h"
int hwconfig;
static const char *version;
static const char *extension;
static const char name[] = "test36";
static const char purpose[] = "screen resolutions";
@@ -26,7 +24,7 @@ static const char usage[] = "-p show passed, -n no progress";
static const char status[] = "-\\|/";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
FxBool bShowPassed = FXFALSE;
FxBool bNoProgress = FXFALSE;
GrResolution resTemplate;
@@ -35,7 +33,7 @@ void main( int argc, char **argv) {
iFailures = 0, iStatusAt = 0,
viewport[4];
GrContext_t context;
unsigned int hWndMain = tlGethWnd();
unsigned long hWndMain = tlGethWnd();
printf ( "Test36 - Glide resolution checker. All output goes to the console.\n\n" );
tlGetCH ();
@@ -103,7 +101,7 @@ void main( int argc, char **argv) {
printf ( "Press any key.\n" );
tlGetCH ();
return;
return 0;
}

View File

@@ -50,24 +50,20 @@
#define CORRECT_GR_VIEWPORT_WIDTH 640
#define CORRECT_GR_VIEWPORT_HEIGHT 480
void TestGet(char * getvalstr, int getval, int memcount , int * memval, int * failures);
void TestGet(char * getvalstr, int getval, int memcount , FxI32 * memval, int * failures);
void TestGetString(char * getvalstr, int getval, int * failures);
int hwconfig;
static const char *version;
static const char *extension;
extern unsigned int hWndMain;
void
int
main( int argc, char **argv)
{
GrScreenResolution_t resolution = GR_RESOLUTION_640x480;
float scrWidth = 640.0f;
float scrHeight = 480.0f;
int val4[4];
int * histbuffer;
int histsize;
FxI32 val4[4];
FxI32 * histbuffer;
FxI32 histsize;
const char * str;
int ret;
int i;
@@ -83,7 +79,7 @@ main( int argc, char **argv)
/* Process Command Line Arguments */
tlSetScreen( scrWidth, scrHeight );
version = grGetString( GR_VERSION );
str = grGetString( GR_VERSION );
printf("Test 37 - grGet() Stress Test. All output goes to the Console.\n\n");
tlGetCH ();
@@ -245,10 +241,10 @@ main( int argc, char **argv)
ret = grGet(GR_NUM_SWAP_HISTORY_BUFFER, sizeof(histsize), &histsize );
if(ret==sizeof(histsize)) {
histbuffer = malloc(histsize*sizeof(int));
histbuffer = malloc(histsize*sizeof(FxI32));
ret = grGet(GR_SWAP_HISTORY, histsize*sizeof(int), histbuffer );
if(ret==(int)(histsize*sizeof(int)))
ret = grGet(GR_SWAP_HISTORY, histsize*sizeof(FxI32), histbuffer );
if(ret==(int)(histsize*sizeof(FxI32)))
printf("Success(%d) - ",ret);
else {
printf("Failed (%d) - ", ret);
@@ -260,7 +256,7 @@ main( int argc, char **argv)
for(i=0;i<histsize;i++) {
printf("%d ", histbuffer[i]);
}
printf("\n", histbuffer[i]);
printf("\n");
free(histbuffer);
} else {
printf("GR_NUM_SWAP_HISTORY_BUFFER failed, so unable to call GR_SWAP_HISTORY\n");
@@ -316,12 +312,12 @@ main( int argc, char **argv)
__errExit:
grGlideShutdown();
return;
return 0;
} /* main */
void
TestGet(char * getvalstr, int getval, int memcount , int * memval, int * failures)
TestGet(char * getvalstr, int getval, int memcount , FxI32 * memval, int * failures)
{
int ret;
int i;
@@ -332,7 +328,7 @@ TestGet(char * getvalstr, int getval, int memcount , int * memval, int * failure
for(i=0;i<4;i++) /*Clear Memory to some unique Pattern*/
memval[i] =0xdeadbeef;
ret = grGet(getval, memcount*sizeof(int), memval ); /*Do the Get*/
ret = grGet(getval, memcount*sizeof(FxI32), memval ); /*Do the Get*/
for(i=0;i<memcount;i++)
/*if pattern still exists, then we have a problem*/
@@ -340,7 +336,7 @@ TestGet(char * getvalstr, int getval, int memcount , int * memval, int * failure
correct=FXFALSE;
/* if Number of bytes returned is wrong, then we have a problem*/
if(ret!=(int)(memcount*sizeof(int)))
if(ret!=(int)(memcount*sizeof(FxI32)))
correct=FXFALSE;
if(correct) /*print the results*/

View File

@@ -39,9 +39,7 @@ static const char name[] = "test38";
static const char purpose[] = "Test the guGammaCorrectionRGB(..) function.";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
extern unsigned int hWndMain;
void main( int argc, char **argv)
int main( int argc, char **argv)
{
char match;
char **remArgs;
@@ -65,13 +63,13 @@ void main( int argc, char **argv)
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return 0;
}
switch( match ) {
case 'n':
@@ -195,6 +193,6 @@ void main( int argc, char **argv)
__errExit:
grGlideShutdown();
return;
return 0;
}

View File

@@ -58,7 +58,6 @@ main(int argc, char **argv)
FxU32 wrange[2];
FxU32
multiBaseMode = 0,
minTexSize = 1,
maxTexSize = 256;
@@ -78,7 +77,7 @@ main(int argc, char **argv)
exit(-1);
}
/* Process Command Line Arguments */
while(rv = tlGetOpt(argc, argv, "dmnrx", &match, &remArgs)) {
while((rv = tlGetOpt(argc, argv, "dmnrx", &match, &remArgs)) != 0) {
if (rv == -1) {
printf("Unrecognized command line argument\n");
printf("%s %s\n", name, usage);
@@ -369,9 +368,6 @@ main(int argc, char **argv)
tlConOutput("Press a key to quit\n");
while(frames-- && tlOkToRender()) {
static float
curOOW = 1.0f;
if (hwconfig == TL_VOODOORUSH) {
tlGetDimsByConst(resolution,
&scrWidth,

View File

@@ -32,11 +32,6 @@ static const char name[] = "display";
static const char purpose[] = "display a 16 bit frame buffer (565 format) dump out";
static const char usage[] = "-n <frames> -r <res> -s srcimage -t testimage";
static const char *renderBufferString[] = {
"GR_BUFFER_FRONTBUFFER",
"GR_BUFFER_BACKBUFFER "
};
static const char *sourceFormatString[] = {
"GR_LFB_SRC_FMT_565 ",
"GR_LFB_SRC_FMT_555 ",
@@ -61,7 +56,8 @@ static void imageConvert( void *dst,
GrLfbSrcFmt_t format,
FxU32 *bpp );
void main( int argc, char **argv) {
int main( int argc, char **argv)
{
char match;
char **remArgs;
int rv;
@@ -77,7 +73,7 @@ void main( int argc, char **argv) {
LFB_Img src, dst, diff;
FxBool txtdisplay = FXTRUE;
void *image;
void *image = NULL;
FxU32 bpp;
GrLfbSrcFmt_t sourceFormat;
@@ -89,13 +85,13 @@ void main( int argc, char **argv) {
dstfname[0] = 0;
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrst", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrst", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -161,8 +157,8 @@ void main( int argc, char **argv) {
/* readng the LFB file header */
fread(&src.signature, 4, 1, fp);
if (src.signature != IMAGE_SRLE) {
printf("%s file type incorrect\n");
return;
printf("%s file type incorrect\n", srcfname);
return -1;
}
fread(&src.width, 2, 1, fp);
fread(&src.height, 2, 1, fp);
@@ -195,8 +191,8 @@ void main( int argc, char **argv) {
/* readng the LFB file header */
fread(&dst.signature, 4, 1, fp);
if (dst.signature != IMAGE_SRLE) {
printf("%s file type incorrect\n");
return;
printf("%s file type incorrect\n", dstfname);
return -1;
}
fread(&dst.width, 2, 1, fp);
fread(&dst.height, 2, 1, fp);
@@ -214,6 +210,7 @@ void main( int argc, char **argv) {
}
}
diff.data = NULL;
diff.width = 0;
diff.height = 0;
@@ -259,7 +256,7 @@ void main( int argc, char **argv) {
}
if ( ( imageWidth > (FxU32)scrWidth ) ||
( imageHeight > (FxU32)scrHeight ) )
return;
return -1;
while( frames-- ) {
@@ -351,7 +348,7 @@ void main( int argc, char **argv) {
if (srcfname[0] && dstfname[0])
free(diff.data);
free(image);
return;
return 0;
}

View File

@@ -27,7 +27,7 @@ static const char name[] = "sbench";
static const char purpose[] = "benchmark grDrawVertexArray for gouraud shaded triangle";
static const char usage[] = "-n <frames> -r <res> -d <filename> -l <primitive type> -v <vertex array size> -t <triangel size> -p -a";
char *Usage(void)
void Usage(void)
{
printf (" -l <type> => primitive type\n");
printf (" => 0 point\n");
@@ -41,7 +41,6 @@ char *Usage(void)
printf (" -t <size> => triangle size\n");
printf (" -p => packed color\n");
printf (" -a => antialiased\n");
return NULL;
}
void
@@ -65,7 +64,7 @@ setVertexXyzRgbaSt( FxFloat *v, FxFloat x, FxFloat y, FxFloat z,
*(v+GR_VERTEX_TOW_TMU1_OFFSET) = t * 1.f;
}
void
int
main( int argc, char **argv)
{
char
@@ -105,14 +104,14 @@ main( int argc, char **argv)
FxU32 wrange[2];
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, args, &match, &remArgs ) ) {
while((rv = tlGetOpt(argc, argv, args, &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
Usage();
return;
return -1;
}
switch( match ) {
case 'n':
@@ -427,10 +426,5 @@ main( int argc, char **argv)
}
grGlideShutdown();
return;
return 0;
} /* main */

View File

@@ -23,7 +23,7 @@ static const char name[] = "test00";
static const char purpose[] = "Clear screen to blue";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void
int
main( int argc, char **argv)
{
char match;
@@ -43,13 +43,13 @@ main( int argc, char **argv)
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -118,6 +118,6 @@ main( int argc, char **argv)
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -24,7 +24,7 @@ static const char name[] = "test01";
static const char purpose[] = "draws a diagonal line of points from top-left to bottom-right";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void
int
main( int argc, char **argv) {
char match;
char **remArgs;
@@ -43,13 +43,13 @@ main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -138,7 +138,7 @@ main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -24,7 +24,7 @@ static const char name[] = "test02";
static const char purpose[] = "draws a parabolic envelope of lines";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -141,7 +141,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -24,7 +24,7 @@ static const char name[] = "test03";
static const char purpose[] = "draws gouraud shaded lines";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -136,7 +136,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -24,7 +24,7 @@ static const char name[] = "test04";
static const char purpose[] = "draws gouraud shaded triangle";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -140,7 +140,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -24,7 +24,7 @@ static const char name[] = "test04";
static const char purpose[] = "draws gouraud shaded triangle";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -141,7 +141,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -24,7 +24,7 @@ static const char name[] = "test05";
static const char purpose[] = "renders two interpenetrating triangles with z-buffering";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void
int
main( int argc, char **argv)
{
char match;
@@ -44,13 +44,13 @@ main( int argc, char **argv)
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -174,7 +174,7 @@ main( int argc, char **argv)
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -24,7 +24,7 @@ static const char name[] = "test06";
static const char purpose[] = "renders two interpenetrating triangles with w-buffering";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -172,7 +172,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -24,7 +24,7 @@ static const char name[] = "test07";
static const char purpose[] = "alpha blending test";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -41,13 +41,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -153,7 +153,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -24,7 +24,7 @@ static const char name[] = "test08";
static const char purpose[] = "fogging";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -43,13 +43,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -158,7 +158,7 @@ void main( int argc, char **argv) {
grGlideShutdown();
free(fogtable);
return;
return 0;
}

View File

@@ -26,7 +26,7 @@ static const char purpose[] = "chromakey and chromarange - render a red and blue
" triangle but chromakey one out";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -48,13 +48,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -190,7 +190,7 @@ void main( int argc, char **argv) {
cnt = strcspn(filename, ".");
strncpy(fname, filename, cnt);
fname[cnt] = 0;
sprintf(tmp,"_%d\0", subframe);
sprintf(tmp,"_%d", subframe);
strcat(fname, tmp);
strcat(fname, filename+cnt);
if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -230,7 +230,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -26,7 +26,7 @@ static const char purpose[] = "culling test - render a red and blue"
", blue negative";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -46,13 +46,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -154,7 +154,7 @@ void main( int argc, char **argv) {
cnt = strcspn(filename, ".");
strncpy(fname, filename, cnt);
fname[cnt] = 0;
sprintf(tmp,"_%d\0", subframe);
sprintf(tmp,"_%d", subframe);
strcat(fname, tmp);
strcat(fname, filename+cnt);
if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -187,7 +187,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -27,7 +27,7 @@ static const char usage[] = "-n <frames> -r <res>";
static int rRandom(int s, int e);
static unsigned int iRandom (unsigned int maxr);
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -47,13 +47,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -138,7 +138,7 @@ void main( int argc, char **argv) {
if ( tlScaleX(1.0f) < 64.0 ||
tlScaleY(1.0f) < 64.0 )
return;
return -1;
/* generate random start position */
startX = (int)rRandom( 64, (int)tlScaleX(1.0f) - 65 );
@@ -213,7 +213,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}
static unsigned long randx = 1;

View File

@@ -59,7 +59,7 @@ static const char *pixPipeString[] = {
"PIXELPIPE ENABLED "
};
void
int
main( int argc, char **argv)
{
char match;
@@ -87,13 +87,13 @@ main( int argc, char **argv)
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -109,7 +109,7 @@ main( int argc, char **argv)
if ( resolution == GR_RESOLUTION_NONE ) {
tlErrorMessage( "Error!: Frontbuffer rendering not supported in a window\n" );
return;
return -1;
}
tlSetScreen( scrWidth, scrHeight );
@@ -326,7 +326,7 @@ main( int argc, char **argv)
}
grGlideShutdown();
return;
return 0;
} /* main */

View File

@@ -25,7 +25,7 @@ static const char name[] = "test13";
static const char purpose[] = "iterated alpha test - blue triangle fades towards one vertex\n";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -160,5 +160,5 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -25,7 +25,7 @@ static const char purpose[] = "depth bias test: vary depth bias \n"
"over time with two interpenetrating triangles";
static const char usage[] = "-n <frames> -r <res>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -44,13 +44,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -171,5 +171,5 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -24,7 +24,7 @@ static const char name[] = "test15";
static const char purpose[] = "clip rectangle testing - clip rectangle travels around screen";
static const char usage[] = "-n <frames> -r <res>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -204,5 +204,5 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -25,7 +25,7 @@ static const char name[] = "test16";
static const char purpose[] = "test grShamelessPlug and grSplash";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -43,13 +43,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -191,5 +191,5 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -45,7 +45,7 @@ const char *textureModeNames[] = {
"(ITRGB * TEXTURE)+WHITE SPECULAR"
};
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -62,13 +62,13 @@ void main( int argc, char **argv) {
FxU32 zrange[2];
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -285,7 +285,7 @@ void main( int argc, char **argv) {
cnt = strcspn(filename, ".");
strncpy(fname, filename, cnt);
fname[cnt] = 0;
sprintf(tmp,"_%d\0", subframe);
sprintf(tmp,"_%d", subframe);
strcat(fname, tmp);
strcat(fname, filename+cnt);
if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -313,5 +313,5 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -25,7 +25,7 @@ static const char name[] = "test18";
static const char purpose[] = "alpha texture test";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -45,13 +45,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -246,5 +246,5 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -52,7 +52,7 @@ static int loadTexture( const char *filename,
void *table );
static GrTexTable_t texTableType( GrTextureFormat_t format );
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -75,13 +75,13 @@ void main( int argc, char **argv) {
strcpy(texfilename, "miro.3df");
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrdt", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrdt", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -296,7 +296,7 @@ void main( int argc, char **argv) {
cnt = strcspn(filename, ".");
strncpy(fname, filename, cnt);
fname[cnt] = 0;
sprintf(tmp,"_%d\0", subframe);
sprintf(tmp,"_%d", subframe);
strcat(fname, tmp);
strcat(fname, filename+cnt);
if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -350,7 +350,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -27,7 +27,7 @@ static const char usage[] = "-n <frames> -r <res>";
typedef enum { DISABLE, NEAREST, TRILINEAR } MipMapMode;
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -49,13 +49,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -304,7 +304,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -26,7 +26,7 @@ static const char usage[] = "-n <frames> -r <res>";
typedef enum { LIGHTMAP, SPECULAR, DETAIL } Mode;
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -54,13 +54,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -356,7 +356,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -24,7 +24,7 @@ static const char name[] = "test22";
static const char purpose[] = "fog with multi-pass texturing";
static const char usage[] = "-n <frames> -r <res>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -51,13 +51,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -295,7 +295,7 @@ void main( int argc, char **argv) {
grGlideShutdown();
free(fogtable);
return;
return 0;
}

View File

@@ -29,7 +29,7 @@ static unsigned int iRandom (unsigned int maxr);
typedef enum { NORMAL, ANTIALIASED } Mode;
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -55,13 +55,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -233,7 +233,7 @@ void main( int argc, char **argv) {
grGlideShutdown();
free(fogtable);
return;
return 0;
}
static unsigned long randx = 1;

View File

@@ -29,7 +29,7 @@ static unsigned int iRandom (unsigned int maxr);
typedef enum { NORMAL, ANTIALIASED } Mode;
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -54,13 +54,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -232,7 +232,7 @@ void main( int argc, char **argv) {
grGlideShutdown();
free(fogtable);
return;
return 0;
}
static unsigned long randx = 1;

View File

@@ -152,7 +152,7 @@ static int screenFulls[] = {
#define NFRAMES 20
#define NVERTS 3
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -175,7 +175,7 @@ void main( int argc, char **argv) {
y_angle = 0.0f; /* rotation amount */
int
firstTime; /* Used for performance calculations */
firstTime = 1; /* Used for performance calculations */
FxBool
plugging = FXFALSE, /* Show shameless plug */
@@ -196,7 +196,7 @@ void main( int argc, char **argv) {
swapDelay = 1, /* Arg to grBufferSwap */
trisDrawn, /* # triangles drawn */
trisProcessed, /* # triangles through pipeline */
lastFrame, /* Number of last frame we did perf stats */
lastFrame = 0, /* Number of last frame we did perf stats */
frameNum = 0L; /* id of each frame drawn */
GrCullMode_t
@@ -231,13 +231,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrbtea", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrbtea", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -872,4 +872,5 @@ void main( int argc, char **argv) {
break;
}
grGlideShutdown();
return 0;
}

View File

@@ -24,11 +24,6 @@ static const char name[] = "test26";
static const char purpose[] = "tests grLfbWriteRegion, and grLfbReadRegion";
static const char usage[] = "-n <frames> -r <res>";
static const char *renderBufferString[] = {
"GR_BUFFER_FRONTBUFFER",
"GR_BUFFER_BACKBUFFER "
};
static const char *sourceFormatString[] = {
"GR_LFB_SRC_FMT_565 ",
"GR_LFB_SRC_FMT_555 ",
@@ -53,7 +48,7 @@ static void imageConvert( void *dst,
GrLfbSrcFmt_t format,
FxU32 *bpp );
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -78,13 +73,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -144,7 +139,7 @@ void main( int argc, char **argv) {
(int) scrWidth, (int) scrHeight);
tlErrorMessage(errMsg);
return;
return -1;
}
sourceFormat = GR_LFB_SRC_FMT_565;
@@ -228,7 +223,7 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -25,7 +25,7 @@ static const char usage[] = "-n <frames> -r <res>";
static int rRandom(int s, int e);
static unsigned int iRandom (unsigned int maxr);
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -44,13 +44,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "Nnr", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "Nnr", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -157,7 +157,7 @@ doNothing:
}
grGlideShutdown();
return;
return 0;
}
static unsigned long randx = 1;

View File

@@ -79,7 +79,7 @@ static const char name[] = "test28";
static const char purpose[] = "planar polygon test";
static const char usage[] = "-n <frames> -r <res>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -101,13 +101,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -215,5 +215,5 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -30,7 +30,7 @@ static const char usage[] = "\t-d <screen dump filename>\n"
"\t-s [force single texturing]\n";
void main(int argc, char **argv) {
int main(int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -58,13 +58,13 @@ void main(int argc, char **argv) {
assert(hwconfig = tlVoodooType());
/* Process Command Line Arguments */
while(rv = tlGetOpt(argc, argv, "dlmnprs", &match, &remArgs)) {
while ((rv = tlGetOpt(argc, argv, "dlmnprs", &match, &remArgs)) != 0) {
if (rv == -1) {
printf("Unrecognized command line argument\n");
printf("%s %s\n", name, usage);
printf("Available resolutions:\n%s\n",
tlGetResolutionList());
return;
return -1;
}
switch(match) {
case 'd':
@@ -358,4 +358,5 @@ void main(int argc, char **argv) {
__errExit:
grGlideShutdown();
return 0;
}

View File

@@ -128,7 +128,7 @@ main(int argc, char **argv) {
char **remArgs;
int rv;
while(rv = tlGetOpt(argc, argv, "ndv", &match, &remArgs)) {
while((rv = tlGetOpt(argc, argv, "ndv", &match, &remArgs)) != 0) {
if(rv == -1) {
printf("Unrecognized command line argument\n");
printf("%s %s\n", name, usage);

View File

@@ -46,7 +46,7 @@ static void doHelp( void ) {
tlConClear();
}
void
int
main( int argc, char **argv)
{
char
@@ -80,13 +80,13 @@ main( int argc, char **argv)
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, args, &match, &remArgs ) ) {
while((rv = tlGetOpt(argc, argv, args, &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -379,7 +379,7 @@ main( int argc, char **argv)
}
grGlideShutdown();
return;
return 0;
} /* main */

View File

@@ -46,7 +46,7 @@ static void doHelp( void ) {
tlConClear();
}
void
int
main( int argc, char **argv)
{
char
@@ -86,13 +86,13 @@ main( int argc, char **argv)
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, args, &match, &remArgs ) ) {
while((rv = tlGetOpt(argc, argv, args, &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -493,7 +493,7 @@ main( int argc, char **argv)
}
grGlideShutdown();
return;
return 0;
} /* main */

View File

@@ -27,7 +27,7 @@ static const char name[] = "test33";
static const char purpose[] = "draws gouraud shaded triangle strip and fan with grDrawVertexArray(GR_TRIANGLE_STRIP(FAN)_CONTINUE";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -51,13 +51,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
goto _quit;
}
switch( match ) {
case 'n':
@@ -181,15 +181,15 @@ void main( int argc, char **argv) {
printf( "Cannot open %s\n", filename);
scrgrab = FXFALSE;
}
if ( tlKbHit() ) goto exit;
if ( tlKbHit() ) goto _quit;
}
}
}
tlSleep( 1 );
exit:
_quit:
grGlideShutdown();
return;
return 0;
}

View File

@@ -35,7 +35,7 @@ static const char name[] = "test34";
static const char purpose[] = "fogging with table/fogcoord";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -65,13 +65,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -120,7 +120,7 @@ void main( int argc, char **argv) {
if (!extstr) {
printf( "FOGCOORD is not supported in %s\n", grGetString(GR_HARDWARE) );
grGlideShutdown();
return;
return -1;
}
if (!strncmp(extstr, "FOGCOORD", 8)) {
fogext = FXTRUE;
@@ -297,7 +297,7 @@ void main( int argc, char **argv) {
grGlideShutdown();
free(fogtable);
return;
return 0;
}

View File

@@ -24,7 +24,7 @@ static const char name[] = "test35";
static const char purpose[] = "texture chromarange";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -35,7 +35,6 @@ void main( int argc, char **argv) {
int frames = -1;
FxBool scrgrab = FXFALSE;
char filename[256];
int ftsize = 0;
TlTexture baseTexture;
unsigned long baseTextureAddr;
@@ -55,13 +54,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -125,7 +124,7 @@ void main( int argc, char **argv) {
*/
extension = grGetString(GR_EXTENSION);
if (extstr = strstr(extension, "CHROMARANGE")) {
if ((extstr = strstr(extension, "CHROMARANGE")) != NULL) {
if (!strncmp(extstr, "CHROMARANGE", 11)) {
grTexChromaModeExt = grGetProcAddress("grTexChromaModeExt");
grTexChromaRangeExt = grGetProcAddress("grTexChromaRangeExt");
@@ -304,5 +303,5 @@ void main( int argc, char **argv) {
}
grGlideShutdown();
return;
return 0;
}

View File

@@ -17,8 +17,6 @@
#include "tlib.h"
int hwconfig;
static const char *version;
static const char *extension;
static const char name[] = "test36";
static const char purpose[] = "screen resolutions";
@@ -26,7 +24,7 @@ static const char usage[] = "-p show passed, -n no progress";
static const char status[] = "-\\|/";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
FxBool bShowPassed = FXFALSE;
FxBool bNoProgress = FXFALSE;
GrResolution resTemplate;
@@ -103,7 +101,7 @@ void main( int argc, char **argv) {
printf ( "Press any key.\n" );
tlGetCH ();
return;
return 0;
}

View File

@@ -50,24 +50,20 @@
#define CORRECT_GR_VIEWPORT_WIDTH 640
#define CORRECT_GR_VIEWPORT_HEIGHT 480
void TestGet(char * getvalstr, int getval, int memcount , long * memval, int * failures);
void TestGet(char * getvalstr, int getval, int memcount , FxI32 * memval, int * failures);
void TestGetString(char * getvalstr, int getval, int * failures);
int hwconfig;
static const char *version;
static const char *extension;
extern unsigned long hWndMain;
void
int
main( int argc, char **argv)
{
GrScreenResolution_t resolution = GR_RESOLUTION_640x480;
float scrWidth = 640.0f;
float scrHeight = 480.0f;
long val4[4];
long * histbuffer;
long histsize;
FxI32 val4[4];
FxI32 * histbuffer;
FxI32 histsize;
const char * str;
int ret;
int i;
@@ -83,7 +79,7 @@ main( int argc, char **argv)
/* Process Command Line Arguments */
tlSetScreen( scrWidth, scrHeight );
version = grGetString( GR_VERSION );
str = grGetString( GR_VERSION );
printf("Test 37 - grGet() Stress Test. All output goes to the Console.\n\n");
tlGetCH ();
@@ -245,10 +241,10 @@ main( int argc, char **argv)
ret = grGet(GR_NUM_SWAP_HISTORY_BUFFER, sizeof(histsize), &histsize );
if(ret==sizeof(histsize)) {
histbuffer = malloc(histsize*sizeof(long));
histbuffer = malloc(histsize*sizeof(FxI32));
ret = grGet(GR_SWAP_HISTORY, histsize*sizeof(long), histbuffer );
if(ret==(int)(histsize*sizeof(long)))
ret = grGet(GR_SWAP_HISTORY, histsize*sizeof(FxI32), histbuffer );
if(ret==(int)(histsize*sizeof(FxI32)))
printf("Success(%d) - ",ret);
else {
printf("Failed (%d) - ", ret);
@@ -260,7 +256,7 @@ main( int argc, char **argv)
for(i=0;i<histsize;i++) {
printf("%d ", histbuffer[i]);
}
printf("\n", histbuffer[i]);
printf("\n");
free(histbuffer);
} else {
printf("GR_NUM_SWAP_HISTORY_BUFFER failed, so unable to call GR_SWAP_HISTORY\n");
@@ -316,12 +312,12 @@ main( int argc, char **argv)
__errExit:
grGlideShutdown();
return;
return 0;
} /* main */
void
TestGet(char * getvalstr, int getval, int memcount , long * memval, int * failures)
TestGet(char * getvalstr, int getval, int memcount , FxI32 * memval, int * failures)
{
int ret;
int i;
@@ -332,7 +328,7 @@ TestGet(char * getvalstr, int getval, int memcount , long * memval, int * failur
for(i=0;i<4;i++) /*Clear Memory to some unique Pattern*/
memval[i] =0xdeadbeef;
ret = grGet(getval, memcount*sizeof(long), memval ); /*Do the Get*/
ret = grGet(getval, memcount*sizeof(FxI32), memval ); /*Do the Get*/
for(i=0;i<memcount;i++)
/*if pattern still exists, then we have a problem*/
@@ -340,7 +336,7 @@ TestGet(char * getvalstr, int getval, int memcount , long * memval, int * failur
correct=FXFALSE;
/* if Number of bytes returned is wrong, then we have a problem*/
if(ret!=(int)(memcount*sizeof(long)))
if(ret!=(int)(memcount*sizeof(FxI32)))
correct=FXFALSE;
if(correct) /*print the results*/

View File

@@ -39,9 +39,7 @@ static const char name[] = "test38";
static const char purpose[] = "Test the guGammaCorrectionRGB(..) function.";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
extern unsigned long hWndMain;
void main( int argc, char **argv)
int main( int argc, char **argv)
{
char match;
char **remArgs;
@@ -65,13 +63,13 @@ void main( int argc, char **argv)
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -195,6 +193,6 @@ void main( int argc, char **argv)
__errExit:
grGlideShutdown();
return;
return 0;
}

View File

@@ -58,7 +58,6 @@ main(int argc, char **argv)
FxU32 wrange[2];
FxU32
multiBaseMode = 0,
minTexSize = 1,
maxTexSize = 256;
@@ -78,7 +77,7 @@ main(int argc, char **argv)
exit(-1);
}
/* Process Command Line Arguments */
while(rv = tlGetOpt(argc, argv, "dmnrx", &match, &remArgs)) {
while((rv = tlGetOpt(argc, argv, "dmnrx", &match, &remArgs)) != 0) {
if (rv == -1) {
printf("Unrecognized command line argument\n");
printf("%s %s\n", name, usage);
@@ -369,9 +368,6 @@ main(int argc, char **argv)
tlConOutput("Press a key to quit\n");
while(frames-- && tlOkToRender()) {
static float
curOOW = 1.0f;
if (hwconfig == TL_VOODOORUSH) {
tlGetDimsByConst(resolution,
&scrWidth,

View File

@@ -48,11 +48,6 @@ static const char name[] = "display";
static const char purpose[] = "display a 16 bit frame buffer (565 format) dump out";
static const char usage[] = "-n <frames> -r <res> -s srcimage -t testimage";
static const char *renderBufferString[] = {
"GR_BUFFER_FRONTBUFFER",
"GR_BUFFER_BACKBUFFER "
};
static const char *sourceFormatString[] = {
"GR_LFB_SRC_FMT_565 ",
"GR_LFB_SRC_FMT_555 ",
@@ -77,7 +72,8 @@ static void imageConvert( void *dst,
GrLfbSrcFmt_t format,
FxU32 *bpp );
void main( int argc, char **argv) {
int main( int argc, char **argv)
{
char match;
char **remArgs;
int rv;
@@ -93,7 +89,7 @@ void main( int argc, char **argv) {
LFB_Img src, dst, diff;
FxBool txtdisplay = FXTRUE;
void *image;
void *image = NULL;
FxU32 bpp;
GrLfbSrcFmt_t sourceFormat;
@@ -105,13 +101,13 @@ void main( int argc, char **argv) {
dstfname[0] = 0;
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrst", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrst", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -177,8 +173,8 @@ void main( int argc, char **argv) {
/* readng the LFB file header */
fread(&src.signature, 4, 1, fp);
if (src.signature != IMAGE_SRLE) {
printf("%s file type incorrect\n");
return;
printf("%s file type incorrect\n", srcfname);
return -1;
}
fread(&src.width, 2, 1, fp);
fread(&src.height, 2, 1, fp);
@@ -211,8 +207,8 @@ void main( int argc, char **argv) {
/* readng the LFB file header */
fread(&dst.signature, 4, 1, fp);
if (dst.signature != IMAGE_SRLE) {
printf("%s file type incorrect\n");
return;
printf("%s file type incorrect\n", dstfname);
return -1;
}
fread(&dst.width, 2, 1, fp);
fread(&dst.height, 2, 1, fp);
@@ -230,6 +226,7 @@ void main( int argc, char **argv) {
}
}
diff.data = NULL;
diff.width = 0;
diff.height = 0;
@@ -275,7 +272,7 @@ void main( int argc, char **argv) {
}
if ( ( imageWidth > (FxU32)scrWidth ) ||
( imageHeight > (FxU32)scrHeight ) )
return;
return -1;
while( frames-- ) {
@@ -367,7 +364,7 @@ void main( int argc, char **argv) {
if (srcfname[0] && dstfname[0])
free(diff.data);
free(image);
return;
return 0;
}

View File

@@ -41,7 +41,7 @@ static const char name[] = "sbench";
static const char purpose[] = "benchmark grDrawVertexArray for gouraud shaded triangle";
static const char usage[] = "-n <frames> -r <res> -d <filename> -l <primitive type> -v <vertex array size> -t <triangel size> -p -a";
char *Usage(void)
void Usage(void)
{
printf (" -l <type> => primitive type\n");
printf (" => 0 point\n");
@@ -55,7 +55,6 @@ char *Usage(void)
printf (" -t <size> => triangle size\n");
printf (" -p => packed color\n");
printf (" -a => antialiased\n");
return NULL;
}
void
@@ -79,7 +78,7 @@ setVertexXyzRgbaSt( FxFloat *v, FxFloat x, FxFloat y, FxFloat z,
*(v+GR_VERTEX_TOW_TMU1_OFFSET) = t * 1.f;
}
void
int
main( int argc, char **argv)
{
char
@@ -119,14 +118,14 @@ main( int argc, char **argv)
FxU32 wrange[2];
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, args, &match, &remArgs ) ) {
while((rv = tlGetOpt(argc, argv, args, &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
Usage();
return;
return -1;
}
switch( match ) {
case 'n':
@@ -441,10 +440,5 @@ main( int argc, char **argv)
}
grGlideShutdown();
return;
return 0;
} /* main */

View File

@@ -40,7 +40,7 @@ static const char name[] = "test00";
static const char purpose[] = "Clear screen to blue";
static const char usage[] = "-n <frames> -r <res> -d <filename> -p <pixel format>";
void
int
main( int argc, char **argv)
{
char match;
@@ -62,13 +62,13 @@ main( int argc, char **argv)
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrdp", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrdp", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -159,6 +159,6 @@ main( int argc, char **argv)
__errExit:
grGlideShutdown();
return;
return 0;
}

View File

@@ -40,7 +40,7 @@ static const char name[] = "test01";
static const char purpose[] = "draws a diagonal line of points from top-left to bottom-right";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void
int
main( int argc, char **argv) {
char match;
char **remArgs;
@@ -60,13 +60,13 @@ main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -160,7 +160,7 @@ main( int argc, char **argv) {
__errExit:
grGlideShutdown();
return;
return 0;
}

View File

@@ -41,7 +41,7 @@ static const char name[] = "test02";
static const char purpose[] = "draws a parabolic envelope of lines";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -60,13 +60,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -164,7 +164,7 @@ void main( int argc, char **argv) {
__errExit:
grGlideShutdown();
return;
return 0;
}

View File

@@ -40,7 +40,7 @@ static const char name[] = "test03";
static const char purpose[] = "draws gouraud shaded lines";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -59,13 +59,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -158,7 +158,7 @@ void main( int argc, char **argv) {
__errExit:
grGlideShutdown();
return;
return 0;
}

View File

@@ -41,7 +41,7 @@ static const char name[] = "test04";
static const char purpose[] = "draws gouraud shaded triangle";
static const char usage[] = "-n <frames> -r <res> -d <filename> -p <pixel format>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -61,13 +61,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrdp", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrdp", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -181,7 +181,7 @@ void main( int argc, char **argv) {
__errExit:
grGlideShutdown();
return;
return 0;
}

View File

@@ -41,7 +41,7 @@ static const char name[] = "test05";
static const char purpose[] = "renders two interpenetrating triangles with z-buffering";
static const char usage[] = "-n <frames> -r <res> -d <filename> -p <pixel format>";
void
int
main( int argc, char **argv)
{
char match;
@@ -63,13 +63,13 @@ main( int argc, char **argv)
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrdp", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrdp", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -216,7 +216,7 @@ main( int argc, char **argv)
__errExit:
grGlideShutdown();
return;
return 0;
}

View File

@@ -41,7 +41,7 @@ static const char name[] = "test06";
static const char purpose[] = "renders two interpenetrating triangles with w-buffering";
static const char usage[] = "-n <frames> -r <res> -d <filename> -p <pixel format>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -61,13 +61,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrdp", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrdp", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -214,7 +214,7 @@ void main( int argc, char **argv) {
__errExit:
grGlideShutdown();
return;
return 0;
}

View File

@@ -40,7 +40,7 @@ static const char name[] = "test07";
static const char purpose[] = "alpha blending test";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -58,13 +58,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -174,7 +174,7 @@ void main( int argc, char **argv) {
__errExit:
grGlideShutdown();
return;
return 0;
}

View File

@@ -40,7 +40,7 @@ static const char name[] = "test08";
static const char purpose[] = "fogging";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -60,13 +60,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -180,7 +180,7 @@ void main( int argc, char **argv) {
free(fogtable);
__errExit:
grGlideShutdown();
return;
return 0;
}

View File

@@ -42,7 +42,7 @@ static const char purpose[] = "chromakey and chromarange - render a red and blue
" triangle but chromakey one out";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -65,13 +65,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -211,7 +211,7 @@ void main( int argc, char **argv) {
cnt = strcspn(filename, ".");
strncpy(fname, filename, cnt);
fname[cnt] = 0;
sprintf(tmp,"_%d\0", subframe);
sprintf(tmp,"_%d", subframe);
strcat(fname, tmp);
strcat(fname, filename+cnt);
if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -252,7 +252,7 @@ void main( int argc, char **argv) {
__errExit:
grGlideShutdown();
return;
return 0;
}

View File

@@ -42,7 +42,7 @@ static const char purpose[] = "culling test - render a red and blue"
", blue negative";
static const char usage[] = "-n <frames> -r <res> -d <filename>";
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -62,13 +62,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return -1;
}
switch( match ) {
case 'n':
@@ -174,7 +174,7 @@ void main( int argc, char **argv) {
cnt = strcspn(filename, ".");
strncpy(fname, filename, cnt);
fname[cnt] = 0;
sprintf(tmp,"_%d\0", subframe);
sprintf(tmp,"_%d", subframe);
strcat(fname, tmp);
strcat(fname, filename+cnt);
if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -208,7 +208,7 @@ void main( int argc, char **argv) {
__errExit:
grGlideShutdown();
return;
return 0;
}

View File

@@ -43,7 +43,7 @@ static const char usage[] = "-n <frames> -r <res>";
static int rRandom(int s, int e);
static unsigned int iRandom (unsigned int maxr);
void main( int argc, char **argv) {
int main( int argc, char **argv) {
char match;
char **remArgs;
int rv;
@@ -64,13 +64,13 @@ void main( int argc, char **argv) {
assert( hwconfig = tlVoodooType() );
/* Process Command Line Arguments */
while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
if ( rv == -1 ) {
printf( "Unrecognized command line argument\n" );
printf( "%s %s\n", name, usage );
printf( "Available resolutions:\n%s\n",
tlGetResolutionList() );
return;
return 0;
}
switch( match ) {
case 'n':
@@ -159,7 +159,7 @@ void main( int argc, char **argv) {
if ( tlScaleX(1.0f) < 64.0 ||
tlScaleY(1.0f) < 64.0 )
return;
return -1;
/* generate random start position */
startX = (int)rRandom( 64, (int)tlScaleX(1.0f) - 65 );
@@ -235,7 +235,7 @@ void main( int argc, char **argv) {
__errExit:
grGlideShutdown();
return;
return 0;
}
static unsigned long randx = 1;

Some files were not shown because too many files have changed in this diff Show More