From 94210da6be55a0745aa22fe1c5ae67f24e2ecba2 Mon Sep 17 00:00:00 2001 From: jacob Date: Wed, 3 Dec 2025 20:49:05 -0600 Subject: [PATCH] formatting --- src/base/base.h | 18 +++++++++--------- src/base/base_inc.h | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/base/base.h b/src/base/base.h index 8b2558db..82430b15 100644 --- a/src/base/base.h +++ b/src/base/base.h @@ -54,10 +54,10 @@ //- Language #if defined(__HLSL_VERSION) #define IsLanguageC 0 - #define IsLanguageGpu 1 + #define IsLanguageHlsl 1 #else #define IsLanguageC 1 - #define IsLanguageGpu 0 + #define IsLanguageHlsl 0 #endif //- Platform system @@ -73,7 +73,7 @@ #define IsPlatformWindows 0 #define IsPlatformMac 0 #define IsPlatformLinux 1 -#elif IsLanguageGpu +#elif IsLanguageHlsl #define IsPlatformWindows 0 #define IsPlatformMac 0 #define IsPlatformLinux 0 @@ -88,7 +88,7 @@ #elif defined(_M_ARM64) || defined(__aarch64__) #define IsArchX64 0 #define IsArchArm64 1 -#elif IsLanguageGpu +#elif IsLanguageHlsl #define IsArchX64 0 #define IsArchArm64 0 #else @@ -214,7 +214,7 @@ #elif defined(__x86_64) || defined(__i386__) #define WriteBarrier() __asm__ volatile("" ::: "memory") #define ReadBarrier() __asm__ volatile("" ::: "memory") -#elif IsLanguageGpu +#elif IsLanguageHlsl #define WriteBarrier() #define ReadBarrier() #else @@ -464,7 +464,7 @@ #define Packed(s) __pragma(pack(push, 1)) s __pragma(pack(pop)) #elif IsCompilerClang #define Packed(s) s __attribute((__packed__)) -#elif IsLanguageGpu +#elif IsLanguageHlsl #define Packed(s) s #endif @@ -496,7 +496,7 @@ typedef i8 b8; typedef u32 b32; Struct(U128) { u64 hi; u64 lo; }; -#elif IsLanguageGpu +#elif IsLanguageHlsl typedef int i32; typedef uint u32; typedef float f32; @@ -708,7 +708,7 @@ Struct(VertexShader) { ResourceKey resource; }; Struct(PixelShader) { ResourceKey resource; }; Struct(ComputeShader) { ResourceKey resource; }; -#elif IsLanguageGpu +#elif IsLanguageHlsl #define Semantic(t, n) t n : n #define ComputeShader(name, x) [numthreads(x, 1, 1)] void name(Semantic(u32, SV_DispatchThreadID)) #define ComputeShader2D(name, x, y) [numthreads(x, y, 1)] void name(Semantic(Vec2U32, SV_DispatchThreadID)) @@ -743,7 +743,7 @@ Struct(SamplerStateHandle) { u32 v; }; StaticAssert(slot < MaxShaderConstants); \ Enum(name##__shaderconstantenum) { name = slot }; \ Struct(name##__shaderconstanttype) { type v; } -#elif IsLanguageGpu +#elif IsLanguageHlsl #define ShaderConstant(type, name, slot) cbuffer name : register(b##slot) { type name; } #endif diff --git a/src/base/base_inc.h b/src/base/base_inc.h index feda6b99..ce76e8be 100644 --- a/src/base/base_inc.h +++ b/src/base/base_inc.h @@ -26,7 +26,7 @@ # include "base_bitbuff.h" # include "base_resource.h" # include "base_controller.h" -#elif IsLanguageGpu +#elif IsLanguageHlsl # include "base_gpu.hlsl" #endif