X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Ftexcompress_s3tc_tmp.h;h=dbf8c871b7ab66ecc0f5a684cd1bd8f34968d76d;hp=3abce6e904006dbfcd3e114cbf24af28c0113355;hb=2734baa9e24fc9401fab2a116fcfb18c56538175;hpb=82c54c4fdc8495d7522c782141c080314459690a diff --git a/src/mesa/main/texcompress_s3tc_tmp.h b/src/mesa/main/texcompress_s3tc_tmp.h index 3abce6e9040..dbf8c871b7a 100644 --- a/src/mesa/main/texcompress_s3tc_tmp.h +++ b/src/mesa/main/texcompress_s3tc_tmp.h @@ -22,6 +22,9 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#ifndef TEXCOMPRESS_S3TC_TMP_H +#define TEXCOMPRESS_S3TC_TMP_H + #ifdef __APPLE__ #include #else @@ -182,8 +185,8 @@ static void fetch_2d_texel_rgba_dxt5(GLint srcRowStride, const GLubyte *pixdata, #define ALPHACUT 127 -static void fancybasecolorsearch( GLubyte *blkaddr, GLubyte srccolors[4][4][4], GLubyte *bestcolor[2], - GLint numxpixels, GLint numypixels, GLint type, GLboolean haveAlpha) +static void fancybasecolorsearch( UNUSED GLubyte *blkaddr, GLubyte srccolors[4][4][4], GLubyte *bestcolor[2], + GLint numxpixels, GLint numypixels, UNUSED GLint type, UNUSED GLboolean haveAlpha) { /* use same luminance-weighted distance metric to determine encoding as for finding the base colors */ @@ -983,7 +986,9 @@ static void tx_compress_dxtn(GLint srccomps, GLint width, GLint height, const GL } break; default: - fprintf(stderr, "libdxtn: Bad dstFormat %d in tx_compress_dxtn\n", destFormat); + assert(false); return; } } + +#endif