Revision: 28199
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28199
Author: gsrb3d
Date: 2010-04-14 23:12:05 +0200 (Wed, 14 Apr 2010)
Log Message:
-----------
Make memstat easier to read, add missing Intel ID and cleanups.
Modified Paths:
--------------
trunk/blender/intern/guardedalloc/intern/mallocn.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/object/object_transform.c
trunk/blender/source/blender/gpu/intern/gpu_extensions.c
trunk/blender/source/gameengine/GameLogic/Makefile
Modified: trunk/blender/intern/guardedalloc/intern/mallocn.c
===================================================================
--- trunk/blender/intern/guardedalloc/intern/mallocn.c 2010-04-14 20:45:36 UTC
(rev 28198)
+++ trunk/blender/intern/guardedalloc/intern/mallocn.c 2010-04-14 21:12:05 UTC
(rev 28199)
@@ -463,12 +463,17 @@
/* sort by length and print */
qsort(printblock, totpb, sizeof(MemPrintBlock), compare_len);
printf("\ntotal memory len: %.3f MB\n",
(double)mem_in_use/(double)(1024*1024));
+ printf(" ITEMS TOTAL-MiB AVERAGE-KiB TYPE\n");
for(a=0, pb=printblock; a<totpb; a++, pb++)
- printf("%s items: %d, len: %.3f MB\n", pb->name, pb->items,
(double)pb->len/(double)(1024*1024));
+ printf("%6d (%8.3f %8.3f) %s\n", pb->items,
(double)pb->len/(double)(1024*1024), (double)pb->len/1024.0/(double)pb->items,
pb->name);
free(printblock);
mem_unlock_thread();
+
+#if 0 /* GLIBC only */
+ malloc_stats();
+#endif
}
/* Prints in python syntax for easy */
Modified: trunk/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature.c
2010-04-14 20:45:36 UTC (rev 28198)
+++ trunk/blender/source/blender/editors/armature/editarmature.c
2010-04-14 21:12:05 UTC (rev 28199)
@@ -5075,7 +5075,7 @@
VECCOPY(pchan->eul, eul);
}
}
- }
+ } // Duplicated
in source/blender/editors/object/object_transform.c
else {
if (pchan->rotmode == ROT_MODE_QUAT) {
pchan->quat[1]=pchan->quat[2]=pchan->quat[3]=
0.0f;
Modified: trunk/blender/source/blender/editors/object/object_transform.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_transform.c
2010-04-14 20:45:36 UTC (rev 28198)
+++ trunk/blender/source/blender/editors/object/object_transform.c
2010-04-14 21:12:05 UTC (rev 28199)
@@ -208,7 +208,7 @@
VECCOPY(ob->rot, eul);
}
}
- }
+ } //
Duplicated in source/blender/editors/armature/editarmature.c
else {
if (ob->rotmode == ROT_MODE_QUAT) {
ob->quat[1]=ob->quat[2]=ob->quat[3]=
0.0f;
Modified: trunk/blender/source/blender/gpu/intern/gpu_extensions.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_extensions.c 2010-04-14
20:45:36 UTC (rev 28198)
+++ trunk/blender/source/blender/gpu/intern/gpu_extensions.c 2010-04-14
21:12:05 UTC (rev 28199)
@@ -122,7 +122,10 @@
GG.device = GPU_DEVICE_NVIDIA;
GG.driver = GPU_DRIVER_OFFICIAL;
}
- else if(strstr(vendor, "Intel") || strstr(renderer, "Mesa DRI Intel")) {
+ else if(strstr(vendor, "Intel") ||
+ /* src/mesa/drivers/dri/intel/intel_context.c */
+ strstr(renderer, "Mesa DRI Intel") ||
+ strstr(renderer, "Mesa DRI Mobile Intel")) {
GG.device = GPU_DEVICE_INTEL;
GG.driver = GPU_DRIVER_OFFICIAL;
}
Modified: trunk/blender/source/gameengine/GameLogic/Makefile
===================================================================
--- trunk/blender/source/gameengine/GameLogic/Makefile 2010-04-14 20:45:36 UTC
(rev 28198)
+++ trunk/blender/source/gameengine/GameLogic/Makefile 2010-04-14 21:12:05 UTC
(rev 28199)
@@ -38,10 +38,10 @@
CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
-CPPFLAGS += -I../Expressions
+CPPFLAGS += -I../Expressions
CPPFLAGS += -I../SceneGraph
CPPFLAGS += -I../Rasterizer
-CPPFLAGS += -I$(NAN_STRING)/include
+CPPFLAGS += -I$(NAN_STRING)/include
CPPFLAGS += -I$(NAN_MOTO)/include
CPPFLAGS += -I../../blender/makesdna
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
