0579eaae1f
The idea is to make include statements more explicit and obvious where the file is coming from, additionally reducing chance of wrong header being picked up. For example, it was not obvious whether bvh.h was refferring to builder or traversal, whenter node.h is a generic graph node or a shader node and cases like that. Surely this might look obvious for the active developers, but after some time of not touching the code it becomes less obvious where file is coming from. This was briefly mentioned in T50824 and seems @brecht is fine with such explicitness, but need to agree with all active developers before committing this. Please note that this patch is lacking changes related on GPU/OpenCL support. This will be solved if/when we all agree this is a good idea to move forward. Reviewers: brecht, lukasstockner97, maiself, nirved, dingto, juicyfruit, swerner Reviewed By: lukasstockner97, maiself, nirved, dingto Subscribers: brecht Differential Revision: https://developer.blender.org/D2586
91 lines
2.2 KiB
C++
91 lines
2.2 KiB
C++
/*
|
|
* Copyright 2011-2014 Blender Foundation
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include "util/util_logging.h"
|
|
|
|
#include "util/util_math.h"
|
|
|
|
#include <stdio.h>
|
|
#ifdef _MSC_VER
|
|
# define snprintf _snprintf
|
|
#endif
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
void util_logging_init(const char *argv0)
|
|
{
|
|
#ifdef WITH_CYCLES_LOGGING
|
|
using CYCLES_GFLAGS_NAMESPACE::SetCommandLineOption;
|
|
|
|
/* Make it so FATAL messages are always print into console. */
|
|
char severity_fatal[32];
|
|
snprintf(severity_fatal, sizeof(severity_fatal), "%d",
|
|
google::GLOG_FATAL);
|
|
|
|
google::InitGoogleLogging(argv0);
|
|
SetCommandLineOption("logtostderr", "1");
|
|
SetCommandLineOption("v", "0");
|
|
SetCommandLineOption("stderrthreshold", severity_fatal);
|
|
SetCommandLineOption("minloglevel", severity_fatal);
|
|
#else
|
|
(void) argv0;
|
|
#endif
|
|
}
|
|
|
|
void util_logging_start(void)
|
|
{
|
|
#ifdef WITH_CYCLES_LOGGING
|
|
using CYCLES_GFLAGS_NAMESPACE::SetCommandLineOption;
|
|
SetCommandLineOption("logtostderr", "1");
|
|
SetCommandLineOption("v", "2");
|
|
SetCommandLineOption("stderrthreshold", "1");
|
|
SetCommandLineOption("minloglevel", "0");
|
|
#endif
|
|
}
|
|
|
|
void util_logging_verbosity_set(int verbosity)
|
|
{
|
|
#ifdef WITH_CYCLES_LOGGING
|
|
using CYCLES_GFLAGS_NAMESPACE::SetCommandLineOption;
|
|
char val[10];
|
|
snprintf(val, sizeof(val), "%d", verbosity);
|
|
SetCommandLineOption("v", val);
|
|
#else
|
|
(void) verbosity;
|
|
#endif
|
|
}
|
|
|
|
std::ostream& operator <<(std::ostream &os,
|
|
const int2 &value)
|
|
{
|
|
os << "(" << value.x
|
|
<< ", " << value.y
|
|
<< ")";
|
|
return os;
|
|
}
|
|
|
|
std::ostream& operator <<(std::ostream &os,
|
|
const float3 &value)
|
|
{
|
|
os << "(" << value.x
|
|
<< ", " << value.y
|
|
<< ", " << value.z
|
|
<< ")";
|
|
return os;
|
|
}
|
|
|
|
CCL_NAMESPACE_END
|