diff options
| author | Guillermo S. Romero <gsr.b3d@infernal-iceberg.com> | 2010-04-15 01:12:05 +0400 |
|---|---|---|
| committer | Guillermo S. Romero <gsr.b3d@infernal-iceberg.com> | 2010-04-15 01:12:05 +0400 |
| commit | 7d9067ca2c0487dd43c127cdc5d09b3565601991 (patch) | |
| tree | 4be5c6628805bb1a838abac88d35bd2a7b912211 | |
| parent | a02a4f0fc4ae16ffc66b3a1efc9c3f649ac11acc (diff) | |
Make memstat easier to read, add missing Intel ID and cleanups.
| -rw-r--r-- | intern/guardedalloc/intern/mallocn.c | 7 | ||||
| -rw-r--r-- | source/blender/editors/armature/editarmature.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/object/object_transform.c | 2 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_extensions.c | 5 | ||||
| -rw-r--r-- | source/gameengine/GameLogic/Makefile | 4 |
5 files changed, 14 insertions, 6 deletions
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index 806f8d183ba..94453e91912 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -463,12 +463,17 @@ void MEM_printmemlist_stats() /* 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 */ diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 5f0c2e3d4be..2db86d70734 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -5075,7 +5075,7 @@ static int pose_clear_rot_exec(bContext *C, wmOperator *op) 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; diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index 13b7f883922..c363a9858cb 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -208,7 +208,7 @@ static int object_rotation_clear_exec(bContext *C, wmOperator *op) 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; diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c index d53b8e67c56..4eaf969ee8a 100644 --- a/source/blender/gpu/intern/gpu_extensions.c +++ b/source/blender/gpu/intern/gpu_extensions.c @@ -122,7 +122,10 @@ void GPU_extensions_init() 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; } diff --git a/source/gameengine/GameLogic/Makefile b/source/gameengine/GameLogic/Makefile index a1794a60452..ba1e1c25ee7 100644 --- a/source/gameengine/GameLogic/Makefile +++ b/source/gameengine/GameLogic/Makefile @@ -38,10 +38,10 @@ include nan_compile.mk 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) |