Module Name:    xsrc
Committed By:   riastradh
Date:           Fri Feb 26 18:28:41 UTC 2016

Modified Files:
        xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau:
            nouveau_debug.h
        xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen:
            nv50_ir_print.cpp
        xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon:
            r600_pipe_common.h

Log Message:
Space between string literals to appease idiotic C++11 breakage.

Will be needed to switch on -std=c++11, which is in turn needed for
other upcoming changes to get Clang to build this.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
    xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/nouveau_debug.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
    
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp
cvs rdiff -u -r1.1.1.1 -r1.2 \
    xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon/r600_pipe_common.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/nouveau_debug.h
diff -u xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/nouveau_debug.h:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/nouveau_debug.h:1.2
--- xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/nouveau_debug.h:1.1.1.1	Thu Dec 18 06:02:07 2014
+++ xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/nouveau_debug.h	Fri Feb 26 18:28:41 2016
@@ -16,7 +16,7 @@
 #define NOUVEAU_DEBUG 0
 
 #define NOUVEAU_ERR(fmt, args...)                                 \
-   fprintf(stderr, "%s:%d - "fmt, __FUNCTION__, __LINE__, ##args)
+   fprintf(stderr, "%s:%d - " fmt, __FUNCTION__, __LINE__, ##args)
 
 #define NOUVEAU_DBG(ch, args...)           \
    if ((NOUVEAU_DEBUG) & (NOUVEAU_DEBUG_##ch))        \

Index: xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp
diff -u xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp:1.2
--- xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp:1.1.1.1	Thu Dec 18 06:02:07 2014
+++ xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp	Fri Feb 26 18:28:41 2016
@@ -409,7 +409,7 @@ int ImmediateValue::print(char *buf, siz
    case TYPE_U64:
    case TYPE_S64:
    default:
-      PRINT("0x%016"PRIx64, reg.data.u64);
+      PRINT("0x%016" PRIx64, reg.data.u64);
       break;
    }
    return pos;

Index: xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon/r600_pipe_common.h
diff -u xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon/r600_pipe_common.h:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon/r600_pipe_common.h:1.2
--- xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon/r600_pipe_common.h:1.1.1.1	Thu Dec 18 06:02:07 2014
+++ xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon/r600_pipe_common.h	Fri Feb 26 18:28:41 2016
@@ -538,7 +538,7 @@ static inline unsigned r600_tex_aniso_fi
 	} while (0);
 
 #define R600_ERR(fmt, args...) \
-	fprintf(stderr, "EE %s:%d %s - "fmt, __FILE__, __LINE__, __func__, ##args)
+	fprintf(stderr, "EE %s:%d %s - " fmt, __FILE__, __LINE__, __func__, ##args)
 
 /* For MSAA sample positions. */
 #define FILL_SREG(s0x, s0y, s1x, s1y, s2x, s2y, s3x, s3y)  \

Reply via email to