WIP

Author: hoffstadt

extensions/pl_graphics_ext.h

@@ -818,6 +818,7 @@ typedef struct _plComputeShaderDesc
     plBindGroupLayoutDesc    atBindGroupLayouts[3];
     plSpecializationConstant atConstants[PL_MAX_SHADER_SPECIALIZATION_CONSTANTS];
     const void*              pTempConstantData;
+    const char*              pcDebugName; // default: "unnamed compute shader"
 
     // [INTERNAL]
     uint32_t                _uConstantCount;
@@ -894,6 +895,7 @@ typedef struct _plShaderDesc
     plBindGroupLayoutDesc    atBindGroupLayouts[3];
     plRenderPassLayoutHandle tRenderPassLayout;    
     plSampleCount            tMSAASampleCount;
+    const char*              pcDebugName; // default: "unnamed shader"
 
     // [INTERNAL]
     uint32_t                _uConstantCount;

extensions/pl_graphics_vulkan.c

@@ -1356,6 +1356,9 @@ pl_create_compute_shader(plDevice* ptDevice, const plComputeShaderDesc* ptDescri
     plComputeShaderHandle tHandle = pl__get_new_compute_shader_handle(ptDevice);
     plComputeShader* ptShader = pl__get_compute_shader(ptDevice, tHandle);
     ptShader->tDesc = *ptDescription;
+
+    if(ptShader->tDesc.pcDebugName == NULL)
+        ptShader->tDesc.pcDebugName = "unnamed compute shader";
 
     plVulkanComputeShader* ptVulkanShader = &ptDevice->sbtComputeShadersHot[tHandle.uIndex];
 
@@ -1437,7 +1440,7 @@ pl_create_compute_shader(plDevice* ptDevice, const plComputeShaderDesc* ptDescri
         .stage  = tShaderStage
     };
     PL_VULKAN(vkCreateComputePipelines(ptDevice->tLogicalDevice, VK_NULL_HANDLE, 1, &tPipelineCreateInfo, gptGraphics->ptAllocationCallbacks, &ptVulkanShader->tPipeline));
-
+    pl__set_vulkan_object_name(ptDevice, (uint64_t)ptVulkanShader->tPipeline, VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_EXT, ptShader->tDesc.pcDebugName);
     return tHandle;
 }
 
@@ -1449,6 +1452,9 @@ pl_create_shader(plDevice* ptDevice, const plShaderDesc* ptDescription)
     ptShader->tDesc = *ptDescription;
     uint32_t uStageCount = 1;
 
+    if(ptShader->tDesc.pcDebugName == NULL)
+        ptShader->tDesc.pcDebugName = "unnamed shader";
+
     plVulkanShader* ptVulkanShader = &ptDevice->sbtShadersHot[tHandle.uIndex];
 
     // TODO: handle these properly
@@ -1705,6 +1711,7 @@ pl_create_shader(plDevice* ptDevice, const plShaderDesc* ptDescription)
     };
 
     PL_VULKAN(vkCreateGraphicsPipelines(ptDevice->tLogicalDevice, VK_NULL_HANDLE, 1, &tPipelineInfo, gptGraphics->ptAllocationCallbacks, &tVulkanShader.tPipeline));
+    pl__set_vulkan_object_name(ptDevice, (uint64_t)tVulkanShader.tPipeline, VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_EXT, ptShader->tDesc.pcDebugName);
     ptVulkanShader->tPipeline       = tVulkanShader.tPipeline;
     ptVulkanShader->tPipelineLayout = tVulkanShader.tPipelineLayout;
     return tHandle;

extensions/pl_renderer_ext.c

@@ -526,7 +526,6 @@ typedef struct _plScene
     bool           bActive;
     plShaderHandle tLightingShader;
     plShaderHandle tEnvLightingShader;
-    plShaderHandle tTonemapShader;
 
     // skybox resources (optional)
     plDrawable        tSkyboxDrawable;
@@ -653,35 +652,8 @@ typedef struct _plRefRendererData
     plRenderPassLayoutHandle tPickRenderPassLayout;
 
     // bind group layouts
-    plBindGroupLayoutHandle tGlobalSceneBindGroupLayout;
-    plBindGroupLayoutHandle tLightingViewBindGroupLayout;
-    plBindGroupLayoutHandle tPickViewBindGroupLayout;
-    plBindGroupLayoutHandle tSkyboxComputeBindGroupLayout;
-    plBindGroupLayoutHandle tSkyboxBindGroupLayout;
-    plBindGroupLayoutHandle tSkyboxBG0Layout;
-    plBindGroupLayoutHandle tSkyboxBG1Layout;
-    plBindGroupLayoutHandle tDeferredBG1Layout;
     plBindGroupLayoutHandle tSceneBGLayout;
-    plBindGroupLayoutHandle tPickBG0Layout;
-    plBindGroupLayoutHandle tJFABGLayout;
     plBindGroupLayoutHandle tShadowGlobalBGLayout;
-    plBindGroupLayoutHandle tOutlineBGLayout;
-    plBindGroupLayoutHandle tSkinBGLayout;
-    plBindGroupLayoutHandle tSkin2BGLayout;
-    plBindGroupLayoutHandle tEnvBGLayout;
-
-    // shader templates (variants are made from these)
-    plShaderHandle        tShadowShader;
-    plShaderHandle        tAlphaShadowShader;
-    plShaderHandle        tDeferredShader;
-    plShaderHandle        tForwardShader;
-    plShaderHandle        tSkyboxShader;
-    plShaderHandle        tPickShader;
-    plComputeShaderHandle tEnvFilterShader;
-
-    // outline shaders
-    plShaderHandle        tUVShader;
-    plComputeShaderHandle tJFAShader;
 
     // renderer specific log channel
     uint64_t uLogChannel;
@@ -782,7 +754,6 @@ static void pl__renderer_post_process_scene(plCommandBuffer*, plView*, const plM
 static inline plDynamicBinding pl__allocate_dynamic_data(plDevice* ptDevice){ return pl_allocate_dynamic_data(gptGfx, gptData->ptDevice, &gptData->tCurrentDynamicDataBlock);}
 static void                    pl__renderer_add_drawable_skin_data_to_global_buffers(plScene*, uint32_t uDrawableIndex);
 static void                    pl__renderer_add_drawable_data_to_global_buffer(plScene*, uint32_t uDrawableIndex);
-static void                    pl__renderer_create_global_shaders(void);
 static size_t                  pl__renderer_get_data_type_size2(plDataType tType);
 static plBlendState            pl__renderer_get_blend_state(plBlendMode tBlendMode);
 static uint32_t                pl__renderer_get_bindless_texture_index(plScene*, plTextureHandle);