From 6cbc3929a54d37bd23cb5efa8e3320ba02f78b2f Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Fri, 31 May 2019 17:20:37 -0400 Subject: Use slang- prefix on slang compiler and core source (#973) * Prefixing source files in source/slang with slang- * Prefix source in source/slang with slang- prefix. * Rename core source files with slang- prefix. * Update project files. * Fix problems from automatic merge. --- source/slang/type-system-shared.h | 102 -------------------------------------- 1 file changed, 102 deletions(-) delete mode 100644 source/slang/type-system-shared.h (limited to 'source/slang/type-system-shared.h') diff --git a/source/slang/type-system-shared.h b/source/slang/type-system-shared.h deleted file mode 100644 index 95840e701..000000000 --- a/source/slang/type-system-shared.h +++ /dev/null @@ -1,102 +0,0 @@ -#ifndef SLANG_TYPE_SYSTEM_SHARED_H -#define SLANG_TYPE_SYSTEM_SHARED_H - -#include "../../slang.h" - -namespace Slang -{ -#define FOREACH_BASE_TYPE(X) \ - X(Void) \ - X(Bool) \ - X(Int8) \ - X(Int16) \ - X(Int) \ - X(Int64) \ - X(UInt8) \ - X(UInt16) \ - X(UInt) \ - X(UInt64) \ - X(Half) \ - X(Float) \ - X(Double) \ -/* end */ - - enum class BaseType - { -#define DEFINE_BASE_TYPE(NAME) NAME, -FOREACH_BASE_TYPE(DEFINE_BASE_TYPE) -#undef DEFINE_BASE_TYPE - - CountOf, - }; - - struct TextureFlavor - { - typedef TextureFlavor ThisType; - enum - { - // Mask for the overall "shape" of the texture - BaseShapeMask = SLANG_RESOURCE_BASE_SHAPE_MASK, - - // Flag for whether the shape has "array-ness" - ArrayFlag = SLANG_TEXTURE_ARRAY_FLAG, - - // Whether or not the texture stores multiple samples per pixel - MultisampleFlag = SLANG_TEXTURE_MULTISAMPLE_FLAG, - - // Whether or not this is a shadow texture - // - // TODO(tfoley): is this even meaningful/used? - // ShadowFlag = 0x80, - }; - - enum Shape : uint8_t - { - Shape1D = SLANG_TEXTURE_1D, - Shape2D = SLANG_TEXTURE_2D, - Shape3D = SLANG_TEXTURE_3D, - ShapeCube = SLANG_TEXTURE_CUBE, - ShapeBuffer = SLANG_TEXTURE_BUFFER, - - Shape1DArray = Shape1D | ArrayFlag, - Shape2DArray = Shape2D | ArrayFlag, - // No Shape3DArray - ShapeCubeArray = ShapeCube | ArrayFlag, - }; - - enum - { - // This the total number of expressible flavors, - // which is *not* to say that every expressible - // flavor is actual valid. - Count = 0x10000, - }; - - uint16_t flavor; - - Shape GetBaseShape() const { return Shape(flavor & BaseShapeMask); } - bool isArray() const { return (flavor & ArrayFlag) != 0; } - bool isMultisample() const { return (flavor & MultisampleFlag) != 0; } - // bool isShadow() const { return (flavor & ShadowFlag) != 0; } - - SLANG_FORCE_INLINE bool operator==(const ThisType& rhs) const { return flavor == rhs.flavor; } - SLANG_FORCE_INLINE bool operator!=(const ThisType& rhs) const { return !(*this == rhs); } - - SlangResourceShape getShape() const { return flavor & 0xFF; } - SlangResourceAccess getAccess() const { return (flavor >> 8) & 0xFF; } - - TextureFlavor() = default; - TextureFlavor(uint32_t tag) { flavor = (uint16_t)tag; } - - static TextureFlavor create(SlangResourceShape shape, SlangResourceAccess access); - }; - - enum class SamplerStateFlavor : uint8_t - { - SamplerState, - SamplerComparisonState, - }; - -} - -#endif -- cgit v1.2.3