Namespace Log.h/cpp in dawn::
The LogMessage::LogMessage constructor was redefining a symbol that exists in re2 inside of Chromium. So we namespace Log inside dawn:: to avoid the conflict. BUG=dawn:302 Change-Id: Ida349208e2c6fe9ac032e1bd8cd442dff0b3f6bc Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/14320 Commit-Queue: Austin Eng <enga@chromium.org> Reviewed-by: Austin Eng <enga@chromium.org>
This commit is contained in:
parent
dd4584340d
commit
dc3317da6c
|
@ -49,11 +49,11 @@ void PrintDeviceError(WGPUErrorType errorType, const char* message, void*) {
|
||||||
UNREACHABLE();
|
UNREACHABLE();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ErrorLog() << errorTypeName << " error: " << message;
|
dawn::ErrorLog() << errorTypeName << " error: " << message;
|
||||||
}
|
}
|
||||||
|
|
||||||
void PrintGLFWError(int code, const char* message) {
|
void PrintGLFWError(int code, const char* message) {
|
||||||
ErrorLog() << "GLFW error: " << code << " - " << message;
|
dawn::ErrorLog() << "GLFW error: " << code << " - " << message;
|
||||||
}
|
}
|
||||||
|
|
||||||
enum class CmdBufType {
|
enum class CmdBufType {
|
||||||
|
|
|
@ -19,7 +19,7 @@ void HandleAssertionFailure(const char* file,
|
||||||
const char* function,
|
const char* function,
|
||||||
int line,
|
int line,
|
||||||
const char* condition) {
|
const char* condition) {
|
||||||
ErrorLog() << "Assertion failure at " << file << ":" << line << " (" << function
|
dawn::ErrorLog() << "Assertion failure at " << file << ":" << line << " (" << function
|
||||||
<< "): " << condition;
|
<< "): " << condition;
|
||||||
DAWN_BREAKPOINT();
|
DAWN_BREAKPOINT();
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,9 @@
|
||||||
# include <android/log.h>
|
# include <android/log.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace {
|
namespace dawn {
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
|
||||||
const char* SeverityName(LogSeverity severity) {
|
const char* SeverityName(LogSeverity severity) {
|
||||||
switch (severity) {
|
switch (severity) {
|
||||||
|
@ -59,12 +61,12 @@ namespace {
|
||||||
}
|
}
|
||||||
#endif // defined(DAWN_PLATFORM_ANDROID)
|
#endif // defined(DAWN_PLATFORM_ANDROID)
|
||||||
|
|
||||||
} // anonymous namespace
|
} // anonymous namespace
|
||||||
|
|
||||||
LogMessage::LogMessage(LogSeverity severity) : mSeverity(severity) {
|
LogMessage::LogMessage(LogSeverity severity) : mSeverity(severity) {
|
||||||
}
|
}
|
||||||
|
|
||||||
LogMessage::~LogMessage() {
|
LogMessage::~LogMessage() {
|
||||||
std::string fullMessage = mStream.str();
|
std::string fullMessage = mStream.str();
|
||||||
|
|
||||||
// If this message has been moved, its stream is empty.
|
// If this message has been moved, its stream is empty.
|
||||||
|
@ -87,26 +89,28 @@ LogMessage::~LogMessage() {
|
||||||
fprintf(outputStream, "%s: %s\n", severityName, fullMessage.c_str());
|
fprintf(outputStream, "%s: %s\n", severityName, fullMessage.c_str());
|
||||||
fflush(outputStream);
|
fflush(outputStream);
|
||||||
#endif // defined(DAWN_PLATFORM_ANDROID)
|
#endif // defined(DAWN_PLATFORM_ANDROID)
|
||||||
}
|
}
|
||||||
|
|
||||||
LogMessage DebugLog() {
|
LogMessage DebugLog() {
|
||||||
return {LogSeverity::Debug};
|
return {LogSeverity::Debug};
|
||||||
}
|
}
|
||||||
|
|
||||||
LogMessage InfoLog() {
|
LogMessage InfoLog() {
|
||||||
return {LogSeverity::Info};
|
return {LogSeverity::Info};
|
||||||
}
|
}
|
||||||
|
|
||||||
LogMessage WarningLog() {
|
LogMessage WarningLog() {
|
||||||
return {LogSeverity::Warning};
|
return {LogSeverity::Warning};
|
||||||
}
|
}
|
||||||
|
|
||||||
LogMessage ErrorLog() {
|
LogMessage ErrorLog() {
|
||||||
return {LogSeverity::Error};
|
return {LogSeverity::Error};
|
||||||
}
|
}
|
||||||
|
|
||||||
LogMessage DebugLog(const char* file, const char* function, int line) {
|
LogMessage DebugLog(const char* file, const char* function, int line) {
|
||||||
LogMessage message = DebugLog();
|
LogMessage message = DebugLog();
|
||||||
message << file << ":" << line << "(" << function << ")";
|
message << file << ":" << line << "(" << function << ")";
|
||||||
return message;
|
return message;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} // namespace dawn
|
||||||
|
|
|
@ -45,17 +45,19 @@
|
||||||
|
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
// Log levels mostly used to signal intent where the log message is produced and used to route the
|
namespace dawn {
|
||||||
// message to the correct output.
|
|
||||||
enum class LogSeverity {
|
// Log levels mostly used to signal intent where the log message is produced and used to route
|
||||||
|
// the message to the correct output.
|
||||||
|
enum class LogSeverity {
|
||||||
Debug,
|
Debug,
|
||||||
Info,
|
Info,
|
||||||
Warning,
|
Warning,
|
||||||
Error,
|
Error,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Essentially an ostringstream that will print itself in its destructor.
|
// Essentially an ostringstream that will print itself in its destructor.
|
||||||
class LogMessage {
|
class LogMessage {
|
||||||
public:
|
public:
|
||||||
LogMessage(LogSeverity severity);
|
LogMessage(LogSeverity severity);
|
||||||
~LogMessage();
|
~LogMessage();
|
||||||
|
@ -75,16 +77,19 @@ class LogMessage {
|
||||||
|
|
||||||
LogSeverity mSeverity;
|
LogSeverity mSeverity;
|
||||||
std::ostringstream mStream;
|
std::ostringstream mStream;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Short-hands to create a LogMessage with the respective severity.
|
// Short-hands to create a LogMessage with the respective severity.
|
||||||
LogMessage DebugLog();
|
LogMessage DebugLog();
|
||||||
LogMessage InfoLog();
|
LogMessage InfoLog();
|
||||||
LogMessage WarningLog();
|
LogMessage WarningLog();
|
||||||
LogMessage ErrorLog();
|
LogMessage ErrorLog();
|
||||||
|
|
||||||
// DAWN_DEBUG is a helper macro that creates a DebugLog and outputs file/line/function information
|
// DAWN_DEBUG is a helper macro that creates a DebugLog and outputs file/line/function
|
||||||
LogMessage DebugLog(const char* file, const char* function, int line);
|
// information
|
||||||
#define DAWN_DEBUG() DebugLog(__FILE__, __func__, __LINE__)
|
LogMessage DebugLog(const char* file, const char* function, int line);
|
||||||
|
#define DAWN_DEBUG() ::dawn::DebugLog(__FILE__, __func__, __LINE__)
|
||||||
|
|
||||||
|
} // namespace dawn
|
||||||
|
|
||||||
#endif // COMMON_LOG_H_
|
#endif // COMMON_LOG_H_
|
||||||
|
|
|
@ -167,7 +167,7 @@ namespace dawn_native {
|
||||||
ErrorData* error = maybeError.AcquireError();
|
ErrorData* error = maybeError.AcquireError();
|
||||||
|
|
||||||
ASSERT(error != nullptr);
|
ASSERT(error != nullptr);
|
||||||
InfoLog() << error->GetMessage();
|
dawn::InfoLog() << error->GetMessage();
|
||||||
delete error;
|
delete error;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -102,7 +102,7 @@ namespace dawn_native { namespace opengl {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (type == GL_DEBUG_TYPE_ERROR) {
|
if (type == GL_DEBUG_TYPE_ERROR) {
|
||||||
WarningLog() << "OpenGL error:"
|
dawn::WarningLog() << "OpenGL error:"
|
||||||
<< "\n Source: " << sourceText //
|
<< "\n Source: " << sourceText //
|
||||||
<< "\n ID: " << id //
|
<< "\n ID: " << id //
|
||||||
<< "\n Severity: " << severityText //
|
<< "\n Severity: " << severityText //
|
||||||
|
|
|
@ -64,7 +64,8 @@ namespace dawn_native { namespace opengl {
|
||||||
if (infoLogLength > 1) {
|
if (infoLogLength > 1) {
|
||||||
std::vector<char> buffer(infoLogLength);
|
std::vector<char> buffer(infoLogLength);
|
||||||
gl.GetShaderInfoLog(shader, infoLogLength, nullptr, &buffer[0]);
|
gl.GetShaderInfoLog(shader, infoLogLength, nullptr, &buffer[0]);
|
||||||
ErrorLog() << source << "\nProgram compilation failed:\n" << buffer.data();
|
dawn::ErrorLog() << source << "\nProgram compilation failed:\n"
|
||||||
|
<< buffer.data();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return shader;
|
return shader;
|
||||||
|
@ -95,7 +96,7 @@ namespace dawn_native { namespace opengl {
|
||||||
if (infoLogLength > 1) {
|
if (infoLogLength > 1) {
|
||||||
std::vector<char> buffer(infoLogLength);
|
std::vector<char> buffer(infoLogLength);
|
||||||
gl.GetProgramInfoLog(mProgram, infoLogLength, nullptr, &buffer[0]);
|
gl.GetProgramInfoLog(mProgram, infoLogLength, nullptr, &buffer[0]);
|
||||||
ErrorLog() << "Program link failed:\n" << buffer.data();
|
dawn::ErrorLog() << "Program link failed:\n" << buffer.data();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -253,7 +253,7 @@ namespace dawn_native { namespace vulkan {
|
||||||
const char* /*pLayerPrefix*/,
|
const char* /*pLayerPrefix*/,
|
||||||
const char* pMessage,
|
const char* pMessage,
|
||||||
void* /*pUserdata*/) {
|
void* /*pUserdata*/) {
|
||||||
WarningLog() << pMessage;
|
dawn::WarningLog() << pMessage;
|
||||||
ASSERT((flags & VK_DEBUG_REPORT_ERROR_BIT_EXT) == 0);
|
ASSERT((flags & VK_DEBUG_REPORT_ERROR_BIT_EXT) == 0);
|
||||||
|
|
||||||
return VK_FALSE;
|
return VK_FALSE;
|
||||||
|
|
|
@ -159,7 +159,8 @@ DawnTestEnvironment::DawnTestEnvironment(int argc, char** argv) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strcmp("-h", argv[i]) == 0 || strcmp("--help", argv[i]) == 0) {
|
if (strcmp("-h", argv[i]) == 0 || strcmp("--help", argv[i]) == 0) {
|
||||||
InfoLog() << "\n\nUsage: " << argv[0]
|
dawn::InfoLog()
|
||||||
|
<< "\n\nUsage: " << argv[0]
|
||||||
<< " [GTEST_FLAGS...] [-w] [-d] [-c] [--adapter-vendor-id=x]\n"
|
<< " [GTEST_FLAGS...] [-w] [-d] [-c] [--adapter-vendor-id=x]\n"
|
||||||
" -w, --use-wire: Run the tests through the wire (defaults to no wire)\n"
|
" -w, --use-wire: Run the tests through the wire (defaults to no wire)\n"
|
||||||
" -d, --enable-backend-validation: Enable backend validation (defaults"
|
" -d, --enable-backend-validation: Enable backend validation (defaults"
|
||||||
|
@ -187,7 +188,7 @@ void DawnTestEnvironment::SetUp() {
|
||||||
mInstance.get()->DiscoverDefaultAdapters();
|
mInstance.get()->DiscoverDefaultAdapters();
|
||||||
DiscoverOpenGLAdapter();
|
DiscoverOpenGLAdapter();
|
||||||
|
|
||||||
InfoLog() << "Testing configuration\n"
|
dawn::InfoLog() << "Testing configuration\n"
|
||||||
"---------------------\n"
|
"---------------------\n"
|
||||||
"UseWire: "
|
"UseWire: "
|
||||||
<< (mUseWire ? "true" : "false")
|
<< (mUseWire ? "true" : "false")
|
||||||
|
@ -217,13 +218,14 @@ void DawnTestEnvironment::SetUp() {
|
||||||
<< pci.deviceId;
|
<< pci.deviceId;
|
||||||
|
|
||||||
// Preparing for outputting hex numbers
|
// Preparing for outputting hex numbers
|
||||||
InfoLog() << std::showbase << std::hex << std::setfill('0') << std::setw(4)
|
dawn::InfoLog() << std::showbase << std::hex << std::setfill('0') << std::setw(4)
|
||||||
|
|
||||||
<< " - \"" << pci.name << "\"\n"
|
<< " - \"" << pci.name << "\"\n"
|
||||||
<< " type: " << DeviceTypeName(adapter.GetDeviceType())
|
<< " type: " << DeviceTypeName(adapter.GetDeviceType())
|
||||||
<< ", backend: " << ParamName(adapter.GetBackendType()) << "\n"
|
<< ", backend: " << ParamName(adapter.GetBackendType()) << "\n"
|
||||||
<< " vendorId: 0x" << vendorId.str() << ", deviceId: 0x" << deviceId.str()
|
<< " vendorId: 0x" << vendorId.str() << ", deviceId: 0x" << deviceId.str()
|
||||||
<< (mHasVendorIdFilter && mVendorIdFilter == pci.vendorId ? " [Selected]" : "")
|
<< (mHasVendorIdFilter && mVendorIdFilter == pci.vendorId ? " [Selected]"
|
||||||
|
: "")
|
||||||
<< "\n";
|
<< "\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -297,7 +297,7 @@ class DawnTestBase {
|
||||||
// Skip a test when the given condition is satisfied.
|
// Skip a test when the given condition is satisfied.
|
||||||
#define DAWN_SKIP_TEST_IF(condition) \
|
#define DAWN_SKIP_TEST_IF(condition) \
|
||||||
if (condition) { \
|
if (condition) { \
|
||||||
InfoLog() << "Test skipped: " #condition "."; \
|
dawn::InfoLog() << "Test skipped: " #condition "."; \
|
||||||
GTEST_SKIP(); \
|
GTEST_SKIP(); \
|
||||||
return; \
|
return; \
|
||||||
}
|
}
|
||||||
|
|
|
@ -113,7 +113,7 @@ DawnPerfTestEnvironment::DawnPerfTestEnvironment(int argc, char** argv)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strcmp("-h", argv[i]) == 0 || strcmp("--help", argv[i]) == 0) {
|
if (strcmp("-h", argv[i]) == 0 || strcmp("--help", argv[i]) == 0) {
|
||||||
InfoLog()
|
dawn::InfoLog()
|
||||||
<< "Additional flags:"
|
<< "Additional flags:"
|
||||||
<< " [--calibration] [--override-steps=x] [--enable-tracing] [--trace-file=file]\n"
|
<< " [--calibration] [--override-steps=x] [--enable-tracing] [--trace-file=file]\n"
|
||||||
<< " --calibration: Only run calibration. Calibration allows the perf test"
|
<< " --calibration: Only run calibration. Calibration allows the perf test"
|
||||||
|
|
|
@ -67,7 +67,7 @@ namespace utils {
|
||||||
shaderc::Compiler compiler;
|
shaderc::Compiler compiler;
|
||||||
auto result = compiler.CompileGlslToSpv(source, strlen(source), kind, "myshader?");
|
auto result = compiler.CompileGlslToSpv(source, strlen(source), kind, "myshader?");
|
||||||
if (result.GetCompilationStatus() != shaderc_compilation_status_success) {
|
if (result.GetCompilationStatus() != shaderc_compilation_status_success) {
|
||||||
ErrorLog() << result.GetErrorMessage();
|
dawn::ErrorLog() << result.GetErrorMessage();
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
#ifdef DUMP_SPIRV_ASSEMBLY
|
#ifdef DUMP_SPIRV_ASSEMBLY
|
||||||
|
@ -106,7 +106,7 @@ namespace utils {
|
||||||
shaderc::Compiler compiler;
|
shaderc::Compiler compiler;
|
||||||
shaderc::SpvCompilationResult result = compiler.AssembleToSpv(source, strlen(source));
|
shaderc::SpvCompilationResult result = compiler.AssembleToSpv(source, strlen(source));
|
||||||
if (result.GetCompilationStatus() != shaderc_compilation_status_success) {
|
if (result.GetCompilationStatus() != shaderc_compilation_status_success) {
|
||||||
ErrorLog() << result.GetErrorMessage();
|
dawn::ErrorLog() << result.GetErrorMessage();
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue