diff --git a/SHADE_Engine/src/Assets/Asset Types/SHShaderAsset.h b/SHADE_Engine/src/Assets/Asset Types/SHShaderAsset.h index 2fdf0cb6..47681d79 100644 --- a/SHADE_Engine/src/Assets/Asset Types/SHShaderAsset.h +++ b/SHADE_Engine/src/Assets/Asset Types/SHShaderAsset.h @@ -13,10 +13,17 @@ #include "SHAssetData.h" #include "SH_API.h" #include -#include "Graphics/MiddleEnd/Shaders/SHShaderType.h" namespace SHADE { + enum class SH_SHADER_TYPE : uint8_t + { + VERTEX, + FRAGMENT, + COMPUTE, + INAVLID_TYPE + }; + struct SH_API SHShaderAsset : SHAssetData { /*-----------------------------------------------------------------------*/ diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Shaders/SHShaderModuleLibrary.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Shaders/SHShaderModuleLibrary.cpp index 23d6323c..7fa5168d 100644 --- a/SHADE_Engine/src/Graphics/MiddleEnd/Shaders/SHShaderModuleLibrary.cpp +++ b/SHADE_Engine/src/Graphics/MiddleEnd/Shaders/SHShaderModuleLibrary.cpp @@ -1,6 +1,7 @@ #include "SHPch.h" #include "SHShaderModuleLibrary.h" #include "Graphics/Devices/SHVkLogicalDevice.h" +#include "Assets/Asset Types/SHShaderAsset.h" namespace SHADE { diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Shaders/SHShaderModuleLibrary.h b/SHADE_Engine/src/Graphics/MiddleEnd/Shaders/SHShaderModuleLibrary.h index ed942833..aba3a16c 100644 --- a/SHADE_Engine/src/Graphics/MiddleEnd/Shaders/SHShaderModuleLibrary.h +++ b/SHADE_Engine/src/Graphics/MiddleEnd/Shaders/SHShaderModuleLibrary.h @@ -2,7 +2,6 @@ #define SH_SHADER_MODULE_LIBRARY_H #include "Graphics/Shaders/SHVkShaderModule.h" -#include "SHShaderSourceLibrary.h" #include namespace SHADE diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Shaders/SHShaderType.h b/SHADE_Engine/src/Graphics/MiddleEnd/Shaders/SHShaderType.h deleted file mode 100644 index 77f79f09..00000000 --- a/SHADE_Engine/src/Graphics/MiddleEnd/Shaders/SHShaderType.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef SH_SHADER_TYPE_H -#define SH_SHADER_TYPE_H - -namespace SHADE -{ - enum class SH_SHADER_TYPE : uint8_t - { - VERTEX, - FRAGMENT, - COMPUTE, - INAVLID_TYPE - }; -} - -#endif