encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-12 14:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename src/common macros NXT_* to DAWN_*

Browse Source
This commit is contained in:
Corentin Wallez
2018-07-18 13:37:54 +02:00
committed by Corentin Wallez
parent 33ca49614d
commit 83a9c9d6d9
28 changed files with 122 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/Device.h
View File

@@ -33,7 +33,7 @@ namespace backend {
void HandleError(const char* message);
bool ConsumedError(MaybeError maybeError) {
if (NXT_UNLIKELY(maybeError.IsError())) {
if (DAWN_UNLIKELY(maybeError.IsError())) {
ConsumeError(maybeError.AcquireError());
return true;
}

4
src/backend/Error.h
View File

@@ -56,7 +56,7 @@ namespace backend {
#define DAWN_TRY(EXPR) \
{ \
auto DAWN_LOCAL_VAR = EXPR; \
if (NXT_UNLIKELY(DAWN_LOCAL_VAR.IsError())) { \
if (DAWN_UNLIKELY(DAWN_LOCAL_VAR.IsError())) { \
ErrorData* error = DAWN_LOCAL_VAR.AcquireError(); \
AppendBacktrace(error, __FILE__, __func__, __LINE__); \
return {error}; \
@@ -70,7 +70,7 @@ namespace backend {
#define DAWN_TRY_ASSIGN(VAR, EXPR) \
{ \
auto DAWN_LOCAL_VAR = EXPR; \
if (NXT_UNLIKELY(DAWN_LOCAL_VAR.IsError())) { \
if (DAWN_UNLIKELY(DAWN_LOCAL_VAR.IsError())) { \
ErrorData* error = DAWN_LOCAL_VAR.AcquireError(); \
AppendBacktrace(error, __FILE__, __func__, __LINE__); \
return {error}; \

8
src/backend/PerStage.h
View File

@@ -49,22 +49,22 @@ namespace backend {
class PerStage {
public:
T& operator[](dawn::ShaderStage stage) {
NXT_ASSERT(static_cast<uint32_t>(stage) < kNumStages);
DAWN_ASSERT(static_cast<uint32_t>(stage) < kNumStages);
return mData[static_cast<uint32_t>(stage)];
}
const T& operator[](dawn::ShaderStage stage) const {
NXT_ASSERT(static_cast<uint32_t>(stage) < kNumStages);
DAWN_ASSERT(static_cast<uint32_t>(stage) < kNumStages);
return mData[static_cast<uint32_t>(stage)];
}
T& operator[](dawn::ShaderStageBit stageBit) {
uint32_t bit = static_cast<uint32_t>(stageBit);
NXT_ASSERT(bit != 0 && IsPowerOfTwo(bit) && bit <= (1 << kNumStages));
DAWN_ASSERT(bit != 0 && IsPowerOfTwo(bit) && bit <= (1 << kNumStages));
return mData[Log2(bit)];
}
const T& operator[](dawn::ShaderStageBit stageBit) const {
uint32_t bit = static_cast<uint32_t>(stageBit);
NXT_ASSERT(bit != 0 && IsPowerOfTwo(bit) && bit <= (1 << kNumStages));
DAWN_ASSERT(bit != 0 && IsPowerOfTwo(bit) && bit <= (1 << kNumStages));
return mData[Log2(bit)];
}

2
src/backend/d3d12/ShaderModuleD3D12.cpp
View File

@@ -35,7 +35,7 @@ namespace backend { namespace d3d12 {
case dawn::BindingType::StorageBuffer:
return mMap[3];
default:
NXT_UNREACHABLE();
DAWN_UNREACHABLE();
}
}

2
src/backend/d3d12/d3d12_platform.h
View File

@@ -27,7 +27,7 @@ using Microsoft::WRL::ComPtr;
// Remove windows.h macros after d3d12's include of windows.h
#include "common/Platform.h"
#if defined(NXT_PLATFORM_WINDOWS)
#if defined(DAWN_PLATFORM_WINDOWS)
# include "common/windows_with_undefs.h"
#endif

2
src/backend/opengl/DeviceGL.h
View File

@@ -24,7 +24,7 @@
#include "glad/glad.h"
// Remove windows.h macros after glad's include of windows.h
#if defined(NXT_PLATFORM_WINDOWS)
#if defined(DAWN_PLATFORM_WINDOWS)
# include "common/windows_with_undefs.h"
#endif

2
src/backend/opengl/ShaderModuleGL.cpp
View File

@@ -51,7 +51,7 @@ namespace backend { namespace opengl {
spirv_cross::CompilerGLSL::Options options;
// TODO(cwallez@chromium.org): discover the backing context version and use that.
#if defined(NXT_PLATFORM_APPLE)
#if defined(DAWN_PLATFORM_APPLE)
options.version = 410;
#else
options.version = 440;

4
src/backend/vulkan/DeviceVk.cpp
View File

@@ -42,9 +42,9 @@
#include <iostream>
#if NXT_PLATFORM_LINUX
#if DAWN_PLATFORM_LINUX
const char kVulkanLibName[] = "libvulkan.so.1";
#elif NXT_PLATFORM_WINDOWS
#elif DAWN_PLATFORM_WINDOWS
const char kVulkanLibName[] = "vulkan-1.dll";
#else
# error "Unimplemented Vulkan backend platform"