From 6a45541f24285da5a285317198e6cf9e08528908 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Dec 2016 13:17:20 +0100 Subject: [PATCH] (Vulkan) Rename pipeline files --- gfx/drivers/vulkan.c | 32 +++++++++---------- .../{ribbon.frag => pipeline_ribbon.frag} | 0 ...bbon.frag.inc => pipeline_ribbon.frag.inc} | 0 .../{ribbon.vert => pipeline_ribbon.vert} | 0 ...bbon.vert.inc => pipeline_ribbon.vert.inc} | 0 ...imple.frag => pipeline_ribbon_simple.frag} | 0 ...ag.inc => pipeline_ribbon_simple.frag.inc} | 0 ...imple.vert => pipeline_ribbon_simple.vert} | 0 ...rt.inc => pipeline_ribbon_simple.vert.inc} | 0 9 files changed, 16 insertions(+), 16 deletions(-) rename gfx/drivers/vulkan_shaders/{ribbon.frag => pipeline_ribbon.frag} (100%) rename gfx/drivers/vulkan_shaders/{ribbon.frag.inc => pipeline_ribbon.frag.inc} (100%) rename gfx/drivers/vulkan_shaders/{ribbon.vert => pipeline_ribbon.vert} (100%) rename gfx/drivers/vulkan_shaders/{ribbon.vert.inc => pipeline_ribbon.vert.inc} (100%) rename gfx/drivers/vulkan_shaders/{ribbon_simple.frag => pipeline_ribbon_simple.frag} (100%) rename gfx/drivers/vulkan_shaders/{ribbon_simple.frag.inc => pipeline_ribbon_simple.frag.inc} (100%) rename gfx/drivers/vulkan_shaders/{ribbon_simple.vert => pipeline_ribbon_simple.vert} (100%) rename gfx/drivers/vulkan_shaders/{ribbon_simple.vert.inc => pipeline_ribbon_simple.vert.inc} (100%) diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c index 153b94a614..cece351d83 100644 --- a/gfx/drivers/vulkan.c +++ b/gfx/drivers/vulkan.c @@ -208,20 +208,20 @@ static void vulkan_init_pipelines( #include "vulkan_shaders/font.frag.inc" ; - static const uint32_t ribbon_vert[] = -#include "vulkan_shaders/ribbon.vert.inc" + static const uint32_t pipeline_ribbon_vert[] = +#include "vulkan_shaders/pipeline_ribbon.vert.inc" ; - static const uint32_t ribbon_frag[] = -#include "vulkan_shaders/ribbon.frag.inc" + static const uint32_t pipeline_ribbon_frag[] = +#include "vulkan_shaders/pipeline_ribbon.frag.inc" ; - static const uint32_t ribbon_simple_vert[] = -#include "vulkan_shaders/ribbon_simple.vert.inc" + static const uint32_t pipeline_ribbon_simple_vert[] = +#include "vulkan_shaders/pipeline_ribbon_simple.vert.inc" ; - static const uint32_t ribbon_simple_frag[] = -#include "vulkan_shaders/ribbon_simple.frag.inc" + static const uint32_t pipeline_ribbon_simple_frag[] = +#include "vulkan_shaders/pipeline_ribbon_simple.frag.inc" ; unsigned i; @@ -393,13 +393,13 @@ static void vulkan_init_pipelines( { if (i & 2) { - module_info.codeSize = sizeof(ribbon_simple_vert); - module_info.pCode = ribbon_simple_vert; + module_info.codeSize = sizeof(pipeline_ribbon_simple_vert); + module_info.pCode = pipeline_ribbon_simple_vert; } else { - module_info.codeSize = sizeof(ribbon_vert); - module_info.pCode = ribbon_vert; + module_info.codeSize = sizeof(pipeline_ribbon_vert); + module_info.pCode = pipeline_ribbon_vert; } shader_stages[0].stage = VK_SHADER_STAGE_VERTEX_BIT; @@ -409,13 +409,13 @@ static void vulkan_init_pipelines( if (i & 2) { - module_info.codeSize = sizeof(ribbon_simple_frag); - module_info.pCode = ribbon_simple_frag; + module_info.codeSize = sizeof(pipeline_ribbon_simple_frag); + module_info.pCode = pipeline_ribbon_simple_frag; } else { - module_info.codeSize = sizeof(ribbon_frag); - module_info.pCode = ribbon_frag; + module_info.codeSize = sizeof(pipeline_ribbon_frag); + module_info.pCode = pipeline_ribbon_frag; } shader_stages[1].stage = VK_SHADER_STAGE_FRAGMENT_BIT; diff --git a/gfx/drivers/vulkan_shaders/ribbon.frag b/gfx/drivers/vulkan_shaders/pipeline_ribbon.frag similarity index 100% rename from gfx/drivers/vulkan_shaders/ribbon.frag rename to gfx/drivers/vulkan_shaders/pipeline_ribbon.frag diff --git a/gfx/drivers/vulkan_shaders/ribbon.frag.inc b/gfx/drivers/vulkan_shaders/pipeline_ribbon.frag.inc similarity index 100% rename from gfx/drivers/vulkan_shaders/ribbon.frag.inc rename to gfx/drivers/vulkan_shaders/pipeline_ribbon.frag.inc diff --git a/gfx/drivers/vulkan_shaders/ribbon.vert b/gfx/drivers/vulkan_shaders/pipeline_ribbon.vert similarity index 100% rename from gfx/drivers/vulkan_shaders/ribbon.vert rename to gfx/drivers/vulkan_shaders/pipeline_ribbon.vert diff --git a/gfx/drivers/vulkan_shaders/ribbon.vert.inc b/gfx/drivers/vulkan_shaders/pipeline_ribbon.vert.inc similarity index 100% rename from gfx/drivers/vulkan_shaders/ribbon.vert.inc rename to gfx/drivers/vulkan_shaders/pipeline_ribbon.vert.inc diff --git a/gfx/drivers/vulkan_shaders/ribbon_simple.frag b/gfx/drivers/vulkan_shaders/pipeline_ribbon_simple.frag similarity index 100% rename from gfx/drivers/vulkan_shaders/ribbon_simple.frag rename to gfx/drivers/vulkan_shaders/pipeline_ribbon_simple.frag diff --git a/gfx/drivers/vulkan_shaders/ribbon_simple.frag.inc b/gfx/drivers/vulkan_shaders/pipeline_ribbon_simple.frag.inc similarity index 100% rename from gfx/drivers/vulkan_shaders/ribbon_simple.frag.inc rename to gfx/drivers/vulkan_shaders/pipeline_ribbon_simple.frag.inc diff --git a/gfx/drivers/vulkan_shaders/ribbon_simple.vert b/gfx/drivers/vulkan_shaders/pipeline_ribbon_simple.vert similarity index 100% rename from gfx/drivers/vulkan_shaders/ribbon_simple.vert rename to gfx/drivers/vulkan_shaders/pipeline_ribbon_simple.vert diff --git a/gfx/drivers/vulkan_shaders/ribbon_simple.vert.inc b/gfx/drivers/vulkan_shaders/pipeline_ribbon_simple.vert.inc similarity index 100% rename from gfx/drivers/vulkan_shaders/ribbon_simple.vert.inc rename to gfx/drivers/vulkan_shaders/pipeline_ribbon_simple.vert.inc