2 files changed, 15 insertions, 1 deletions
diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index 0403da8c..2c5e3a28 100644
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -1892,8 +1892,18 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateShaderModule(
     const VkAllocationCallbacks*                     pAllocator,
     VkShaderModule*                             pShaderModule)
 {
-    // TODO: Fill in with real data
     NULLDRV_LOG_FUNC;
+
+    struct nulldrv_dev *dev = nulldrv_dev(device);
+    struct nulldrv_shader_module *shader_module;
+
+    shader_module = (struct nulldrv_shader_module *) nulldrv_base_create(dev,
+            sizeof(*shader_module), VK_DEBUG_REPORT_OBJECT_TYPE_SHADER_MODULE_EXT);
+    if (!shader_module)
+        return VK_ERROR_OUT_OF_HOST_MEMORY;
+
+    *pShaderModule = (VkShaderModule) shader_module;
+
     return VK_SUCCESS;
 }
 
diff --git a/icd/nulldrv/nulldrv.h b/icd/nulldrv/nulldrv.h
index 38652587..f933a77a 100644
--- a/icd/nulldrv/nulldrv.h
+++ b/icd/nulldrv/nulldrv.h
@@ -113,6 +113,10 @@ struct nulldrv_sampler {
     struct nulldrv_obj obj;
 };
 
+struct nulldrv_shader_module {
+    struct nulldrv_obj obj;
+};
+
 struct nulldrv_pipeline_cache {
     struct nulldrv_obj obj;
 };