remove ^M chars, disable shading language extensions

[mesa.git] / src / mesa / main / texcompress.c

diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index 396f14a5663945af7168c81267ebd4318a19ef20..d18b1d0b418fc6afba44813eb3c6a7c5e2c18538 100644 (file)
--- a/src/mesa/main/texcompress.c
+++ b/src/mesa/main/texcompress.c
@@ -247,7 +247,7 @@ _mesa_compressed_image_address(GLint col, GLint row, GLint img,
       addr = (GLubyte *) image + 16 * (((width + 3) / 4) * (row / 4) + col / 4);
       break;
    default:
-      return 0;
+      return NULL;
    }
 
    return addr;