vk/0.210.0: Remove VkShader

3 files changed, 10 insertions, 13 deletions

diff --git a/include/qonos/qonos.h b/include/qonos/qonos.h
index 9b31098..efbd7f8 100644
--- a/include/qonos/qonos.h
+++ b/include/qonos/qonos.h
@@ -97,20 +97,20 @@ extern "C" {
 typedef struct QoExtraGraphicsPipelineCreateInfo_ {
     VkGraphicsPipelineCreateInfo *pNext;
     VkPrimitiveTopology topology;
-    VkShader vertexShader;
-    VkShader geometryShader;
-    VkShader fragmentShader;
+    VkShaderModule vertexShader;
+    VkShaderModule geometryShader;
+    VkShaderModule fragmentShader;
     uint32_t dynamicStates; // Bitfield
 } QoExtraGraphicsPipelineCreateInfo;
 
-typedef struct QoShaderCreateInfo_ {
+typedef struct QoShaderModuleCreateInfo_ {
     void *pNext;
     size_t spirvSize;
     const void *pSpirv;
     size_t glslSize;
     const char *pGlsl;
     VkShaderStage stage;
-} QoShaderCreateInfo;
+} QoShaderModuleCreateInfo;
 
 #define QO_EXTRA_GRAPHICS_PIPELINE_CREATE_INFO_DEFAULTS \
     .topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST
@@ -469,11 +469,11 @@ VkImageView qoCreateImageView(VkDevice dev, ...);
 #endif
 
 #ifdef DOXYGEN
-VkShader qoCreateShader(VkDevice dev, ...);
+VkShader qoCreateShaderModule(VkDevice dev, ...);
 #else
-#define qoCreateShader(dev, ...) \
-    __qoCreateShader(dev, \
-        &(QoShaderCreateInfo) { \
+#define qoCreateShaderModule(dev, ...) \
+    __qoCreateShaderModule(dev, \
+        &(QoShaderModuleCreateInfo) { \
             .pNext = NULL, \
             ##__VA_ARGS__, \
         })
@@ -505,7 +505,7 @@ VkPipeline qoCreateGraphicsPipeline(VkDevice dev,
                                     const QoExtraGraphicsPipelineCreateInfo *info);
 VkImage __qoCreateImage(VkDevice dev, const VkImageCreateInfo *info);
 VkImageView __qoCreateImageView(VkDevice dev, const VkImageViewCreateInfo *info);
-VkShader __qoCreateShader(VkDevice dev, const QoShaderCreateInfo *info);
+VkShaderModule __qoCreateShaderModule(VkDevice dev, const QoShaderModuleCreateInfo *info);
 
 #ifdef __cplusplus
 }
diff --git a/include/tapi/t_cleanup.h b/include/tapi/t_cleanup.h
index f144219..6af12e1 100644
--- a/include/tapi/t_cleanup.h
+++ b/include/tapi/t_cleanup.h
@@ -81,5 +81,4 @@ static inline void t_cleanup_push_vk_query_pool(VkDevice dev, VkQueryPool x)
 static inline void t_cleanup_push_vk_render_pass(VkDevice dev, VkRenderPass x)                                      { t_cleanup_push_command(CRU_CLEANUP_CMD_VK_RENDER_PASS, dev, x); }
 static inline void t_cleanup_push_vk_sampler(VkDevice dev, VkSampler x)                                             { t_cleanup_push_command(CRU_CLEANUP_CMD_VK_SAMPLER, dev, x); }
 static inline void t_cleanup_push_vk_semaphore(VkDevice dev, VkSemaphore x)                                         { t_cleanup_push_command(CRU_CLEANUP_CMD_VK_SEMAPHORE, dev, x); }
-static inline void t_cleanup_push_vk_shader(VkDevice dev, VkShader x)                                               { t_cleanup_push_command(CRU_CLEANUP_CMD_VK_SHADER, dev, x); }
 static inline void t_cleanup_push_vk_shader_module(VkDevice dev, VkShaderModule x)                                  { t_cleanup_push_command(CRU_CLEANUP_CMD_VK_SHADER_MODULE, dev, x); }
diff --git a/include/util/cru_cleanup.h b/include/util/cru_cleanup.h
index bb47a47..877840f 100644
--- a/include/util/cru_cleanup.h
+++ b/include/util/cru_cleanup.h
@@ -63,7 +63,6 @@ enum cru_cleanup_cmd {
     CRU_CLEANUP_CMD_VK_RENDER_PASS,
     CRU_CLEANUP_CMD_VK_SAMPLER,
     CRU_CLEANUP_CMD_VK_SEMAPHORE,
-    CRU_CLEANUP_CMD_VK_SHADER,
     CRU_CLEANUP_CMD_VK_SHADER_MODULE,
 };
 
@@ -113,7 +112,6 @@ static inline void cru_cleanup_push_vk_query_pool(cru_cleanup_stack_t *c, VkDevi
 static inline void cru_cleanup_push_vk_render_pass(cru_cleanup_stack_t *c, VkDevice dev, VkRenderPass x)                                    { cru_cleanup_push_command(c, CRU_CLEANUP_CMD_VK_RENDER_PASS,                   dev, x); }
 static inline void cru_cleanup_push_vk_sampler(cru_cleanup_stack_t *c, VkDevice dev, VkSampler x)                                           { cru_cleanup_push_command(c, CRU_CLEANUP_CMD_VK_SAMPLER,                       dev, x); }
 static inline void cru_cleanup_push_vk_semaphore(cru_cleanup_stack_t *c, VkDevice dev, VkSemaphore x)                                       { cru_cleanup_push_command(c, CRU_CLEANUP_CMD_VK_SEMAPHORE,                     dev, x); }
-static inline void cru_cleanup_push_vk_shader(cru_cleanup_stack_t *c, VkDevice dev, VkShader x)                                             { cru_cleanup_push_command(c, CRU_CLEANUP_CMD_VK_SHADER,                        dev, x); }
 static inline void cru_cleanup_push_vk_shader_module(cru_cleanup_stack_t *c, VkDevice dev, VkShaderModule x)                                { cru_cleanup_push_command(c, CRU_CLEANUP_CMD_VK_SHADER_MODULE,                 dev, x); }
 
 #ifdef __cplusplus