- if(texfile) {
- if(!(pixels = load_compressed_image(texfile, &comp_size, &xsz, &ysz))) {
- return -1;
- }
- printf("loaded compressed texture file: %s (%dx%d)\n", texfile, xsz, ysz);
-
- } else {
- if(!(pixels = malloc(xsz * ysz * 3))) {
- abort();
- }
- gen_image(pixels, xsz, ysz);
-
- printf("compressing texture\n");
- if((comp_size = texcomp(pixels, COMP_FMT, pixels, xsz, ysz, GL_RGB, GL_UNSIGNED_BYTE)) == -1) {
- return -1;
- }
- printf("compressed texture is %d bytes (uncompressed was: %d)\n", comp_size, xsz * ysz * 3);
-
- dump_compressed_image("compressed_texture", pixels, comp_size, xsz, ysz);
+ if(load_texture(texfile, &tex) == -1) {
+ fprintf(stderr, "failed to load texture %s\n", texfile);
+ return -1;