mesa: casts to silence new warnings from printf()
authorBrian Paul <brianp@vmware.com>
Fri, 19 Feb 2010 19:45:49 +0000 (12:45 -0700)
committerBrian Paul <brianp@vmware.com>
Fri, 19 Feb 2010 19:45:49 +0000 (12:45 -0700)
src/mesa/main/debug.c
src/mesa/shader/prog_print.c

index 246dbd4..33b35e0 100644 (file)
@@ -490,9 +490,9 @@ _mesa_dump_color_buffer(const char *filename)
    _mesa_ReadPixels(0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, buf);
 
    printf("ReadBuffer %p 0x%x  DrawBuffer %p 0x%x\n",
-         ctx->ReadBuffer->_ColorReadBuffer,
+         (void *) ctx->ReadBuffer->_ColorReadBuffer,
          ctx->ReadBuffer->ColorReadBuffer,
-         ctx->DrawBuffer->_ColorDrawBuffers[0],
+         (void *) ctx->DrawBuffer->_ColorDrawBuffers[0],
          ctx->DrawBuffer->ColorDrawBuffer[0]);
    printf("Writing %d x %d color buffer to %s\n", w, h, filename);
    write_ppm(filename, buf, w, h, 4, 0, 1, 2, GL_TRUE);
index a933f21..b4905ab 100644 (file)
@@ -603,7 +603,7 @@ _mesa_fprint_instruction_opt(FILE *f,
 
    switch (inst->Opcode) {
    case OPCODE_PRINT:
-      fprintf(f, "PRINT '%s'", inst->Data);
+      fprintf(f, "PRINT '%s'", (char *) inst->Data);
       if (inst->SrcReg[0].File != PROGRAM_UNDEFINED) {
          fprintf(f, ", ");
          fprintf(f, "%s[%d]%s",