From 89f9e5b01bd64ff69649e0d3ec735ac17e6ec1fe Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Mon, 27 Oct 2014 11:49:51 -0700 Subject: [PATCH] try to get more coherent names --- interface/src/gpu/Batch.h | 4 ++-- interface/src/renderer/Model.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/interface/src/gpu/Batch.h b/interface/src/gpu/Batch.h index cceb41be76..b0bf30bae5 100644 --- a/interface/src/gpu/Batch.h +++ b/interface/src/gpu/Batch.h @@ -28,9 +28,9 @@ } }; - #define PROFILE_SCOPE(name) ProfileRange profileRangeThis(name); + #define PROFILE_RANGE(name) ProfileRange profileRangeThis(name); #else - #define PROFILE_SCOPE(name) +#define PROFILE_RANGE(name) #endif namespace gpu { diff --git a/interface/src/renderer/Model.cpp b/interface/src/renderer/Model.cpp index c2893c79ce..e949e9a811 100644 --- a/interface/src/renderer/Model.cpp +++ b/interface/src/renderer/Model.cpp @@ -395,7 +395,7 @@ void Model::setJointStates(QVector states) { } bool Model::render(float alpha, RenderMode mode, RenderArgs* args) { - PROFILE_SCOPE(__FUNCTION__); + PROFILE_RANGE(__FUNCTION__); // render the attachments foreach (Model* attachment, _attachments) { attachment->render(alpha, mode); @@ -562,7 +562,7 @@ bool Model::render(float alpha, RenderMode mode, RenderArgs* args) { // Render! { - PROFILE_SCOPE("render Batch"); + PROFILE_RANGE("render Batch"); ::gpu::backend::renderBatch(batch); batch.clear(); } @@ -1555,7 +1555,7 @@ void Model::segregateMeshGroups() { int Model::renderMeshes(gpu::Batch& batch, RenderMode mode, bool translucent, float alphaThreshold, bool hasTangents, bool hasSpecular, bool isSkinned, RenderArgs* args) { - PROFILE_SCOPE(__FUNCTION__); + PROFILE_RANGE(__FUNCTION__); bool dontCullOutOfViewMeshParts = Menu::getInstance()->isOptionChecked(MenuOption::DontCullOutOfViewMeshParts); bool cullTooSmallMeshParts = !Menu::getInstance()->isOptionChecked(MenuOption::DontCullTooSmallMeshParts); bool dontReduceMaterialSwitches = Menu::getInstance()->isOptionChecked(MenuOption::DontReduceMaterialSwitches);