From fdd889717239e8dbc7b3dabf1e3c630d6203837b Mon Sep 17 00:00:00 2001 From: Lukas Toenne Date: Fri, 13 Sep 2013 13:36:47 +0000 Subject: Cleanup and improvements of the compositor debug output. Debug code for graphviz output moved to a dedicated file COM_Debug.h/cpp. The DebugInfo class has only static functions, which are called from a number of places to keep track of what is happening in the compositor. If debugging is disabled these are just inline stubs, so we don't need #ifdefs everywhere and don't get any overhead. The graphviz output is much more useful now. DebugInfo keeps track of node names in a static string map for meaningful names. It uses a number of colors for various special operation classes. ExecutionGroups are indicated in graphviz with clusters. Currently the graphviz .dot files are stored in the BLI_temporary_dir() folder. A separate dot file is generated for each stage of the ExecutionGroup scheduling, this is intended to give some idea of the compositor progress, but could still be improved. --- source/blender/compositor/operations/COM_SetColorOperation.h | 2 +- source/blender/compositor/operations/COM_SetValueOperation.h | 2 +- source/blender/compositor/operations/COM_SetVectorOperation.h | 2 +- source/blender/compositor/operations/COM_TrackPositionOperation.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/compositor/operations') diff --git a/source/blender/compositor/operations/COM_SetColorOperation.h b/source/blender/compositor/operations/COM_SetColorOperation.h index 7895c34620b..8377decdd7b 100644 --- a/source/blender/compositor/operations/COM_SetColorOperation.h +++ b/source/blender/compositor/operations/COM_SetColorOperation.h @@ -58,7 +58,7 @@ public: void executePixel(float output[4], float x, float y, PixelSampler sampler); void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]); - const bool isSetOperation() const { return true; } + bool isSetOperation() const { return true; } }; #endif diff --git a/source/blender/compositor/operations/COM_SetValueOperation.h b/source/blender/compositor/operations/COM_SetValueOperation.h index 3ddc667bc7e..b88b85d66f2 100644 --- a/source/blender/compositor/operations/COM_SetValueOperation.h +++ b/source/blender/compositor/operations/COM_SetValueOperation.h @@ -49,6 +49,6 @@ public: void executePixel(float output[4], float x, float y, PixelSampler sampler); void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]); - const bool isSetOperation() const { return true; } + bool isSetOperation() const { return true; } }; #endif diff --git a/source/blender/compositor/operations/COM_SetVectorOperation.h b/source/blender/compositor/operations/COM_SetVectorOperation.h index e9d6a163e9f..d15da58e58e 100644 --- a/source/blender/compositor/operations/COM_SetVectorOperation.h +++ b/source/blender/compositor/operations/COM_SetVectorOperation.h @@ -57,7 +57,7 @@ public: void executePixel(float output[4], float x, float y, PixelSampler sampler); void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]); - const bool isSetOperation() const { return true; } + bool isSetOperation() const { return true; } void setVector(float vector[3]) { setX(vector[0]); diff --git a/source/blender/compositor/operations/COM_TrackPositionOperation.h b/source/blender/compositor/operations/COM_TrackPositionOperation.h index b5499ab76b7..7a4ce9f9213 100644 --- a/source/blender/compositor/operations/COM_TrackPositionOperation.h +++ b/source/blender/compositor/operations/COM_TrackPositionOperation.h @@ -72,7 +72,7 @@ public: void executePixel(float output[4], float x, float y, PixelSampler sampler); - const bool isSetOperation() const { return true; } + bool isSetOperation() const { return true; } }; #endif -- cgit v1.2.3