1 files changed, 11 insertions, 10 deletions

diff --git a/src/window.cpp b/src/window.cpp
index 773c767..a0e33f6 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -9,6 +9,7 @@
 #include "asset-manager.hpp"
 #include "camera.hpp"
 #include "ecs.hpp"
+#include "embedded-shaders.h"
 #include "font.hpp"
 #include "game-settings.hpp"
 #include "math-helpers.hpp"
@@ -1825,8 +1826,8 @@ void CreatePresentPipeline() {
 	assert(pkvk_present.descriptor_sets == nullptr || pkvk_present.descriptor_sets == CAFE_BABE(VkDescriptorSet));
 
 	// enqueue asset loading
-	AssetHandle vertShaderAsset{AM_GetHandle(AssetKey{"pke_prsnt_vrt\0\0"})};
-	AssetHandle fragShaderAsset{AM_GetHandle(AssetKey{"pke_prsnt_frg\0\0"})};
+	AssetHandle vertShaderAsset{AM_GetHandle(embedded_shaders[embedded_shader_index_present_vert].name)};
+	AssetHandle fragShaderAsset{AM_GetHandle(embedded_shaders[embedded_shader_index_present_frag].name)};
 
 	VkPipelineShaderStageCreateInfo shaderStages[2];
 	for (long i = 0; i < 2; ++i) {
@@ -2262,13 +2263,13 @@ void CreateGraphicsPipelines() {
 	// pipelines
 	{
 		// enqueue asset loading
-		AssetHandle vertShaderAssetHandle{AM_GetHandle(AssetKey{"pke_txtr_vrt\0\0\0"})};
-		AssetHandle textureFragShaderAssetHandle { AM_GetHandle(AssetKey{"pke_txtr_frg\0\0\0"})};
-		AssetHandle vertGlyphAssetHandle{AM_GetHandle(AssetKey{"pke_glyph_vrt\0\0"})};
-		AssetHandle fragGlyphAssetHandle { AM_GetHandle(AssetKey{"pke_glyph_frg\0\0"})};
-		AssetHandle asset_handle_vert_ui_base { AM_GetHandle(AssetKey{"pke_ui_bs_vrt\0\0"})};
-		AssetHandle asset_handle_frag_ui_base { AM_GetHandle(AssetKey{"pke_ui_bs_frg\0\0"})};
-		AssetHandle asset_handle_frag_ui_txtr { AM_GetHandle(AssetKey{"pke_ui_txt_frg\0"})};
+		AssetHandle vertShaderAssetHandle        { AM_GetHandle(embedded_shaders[embedded_shader_index_3d_vert].name)};
+		AssetHandle textureFragShaderAssetHandle { AM_GetHandle(embedded_shaders[embedded_shader_index_3d_frag].name)};
+		AssetHandle vertGlyphAssetHandle         { AM_GetHandle(embedded_shaders[embedded_shader_index_glyph_vert].name)};
+		AssetHandle fragGlyphAssetHandle         { AM_GetHandle(embedded_shaders[embedded_shader_index_glyph_frag].name)};
+		AssetHandle asset_handle_vert_ui_base    { AM_GetHandle(embedded_shaders[embedded_shader_index_ui_base_vert].name)};
+		AssetHandle asset_handle_frag_ui_base    { AM_GetHandle(embedded_shaders[embedded_shader_index_ui_base_frag].name)};
+		AssetHandle asset_handle_frag_ui_txtr    { AM_GetHandle(embedded_shaders[embedded_shader_index_ui_texture_frag].name)};
 
 		const long vertexBindingCount = 4;
 		long index = 0;
@@ -4206,7 +4207,7 @@ VkShaderModule UploadShader(AssetHandle handle) {
 		return NULL;
 	}
 #ifndef NDEBUG
-	fprintf(stdout, "Uploading Shader: '%s'\n", asset->basePath);
+	fprintf(stdout, "Uploading Shader: '%s'\n", asset->key);
 #endif
 
 	VkShaderModuleCreateInfo createInfo;