misc: Remove glsl backdoor

SPIR-V support is now supported well enough in IHV's
drivers that we don't have to send GLSL directly anymore
so remove that from cube and tri demos.

diff --git a/demos/cube.c b/demos/cube.c
index b5d710d..30dc9fd 100644 (file)
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -41,8 +41,6 @@
 #include <vk_ext_khr_device_swapchain.h>
 #include "vk_debug_report_lunarg.h"
 
-#include "icd-spv.h"
-
 #include "vk_sdk_platform.h"
 #include "linmath.h"
 
@@ -321,7 +319,6 @@ struct demo {
 #endif // _WIN32
     bool prepared;
     bool use_staging_buffer;
-    bool use_glsl;
 
     VkInstance inst;
     VkPhysicalDevice gpu;
@@ -1402,29 +1399,11 @@ static VkShaderModule demo_prepare_shader_module(struct demo* demo,
     moduleCreateInfo.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO;
     moduleCreateInfo.pNext = NULL;
 
-    if (!demo->use_glsl) {
-        moduleCreateInfo.codeSize = size;
-        moduleCreateInfo.pCode = code;
-        moduleCreateInfo.flags = 0;
-        err = vkCreateShaderModule(demo->device, &moduleCreateInfo, NULL, &module);
-        assert(!err);
-    } else {
-        // Create fake SPV structure to feed GLSL
-        // to the driver "under the covers"
-        moduleCreateInfo.codeSize = 3 * sizeof(uint32_t) + size + 1;
-        moduleCreateInfo.pCode = malloc(moduleCreateInfo.codeSize);
-        moduleCreateInfo.flags = 0;
-
-        /* try version 0 first: VkShaderStage followed by GLSL */
-        ((uint32_t *) moduleCreateInfo.pCode)[0] = ICD_SPV_MAGIC;
-        ((uint32_t *) moduleCreateInfo.pCode)[1] = 0;
-        ((uint32_t *) moduleCreateInfo.pCode)[2] = stage;
-        memcpy(((uint32_t *) moduleCreateInfo.pCode + 3), code, size + 1);
-
-        err = vkCreateShaderModule(demo->device, &moduleCreateInfo, NULL, &module);
-        assert(!err);
-        free((void *) moduleCreateInfo.pCode);
-    }
+    moduleCreateInfo.codeSize = size;
+    moduleCreateInfo.pCode = code;
+    moduleCreateInfo.flags = 0;
+    err = vkCreateShaderModule(demo->device, &moduleCreateInfo, NULL, &module);
+    assert(!err);
 
     return module;
 }
@@ -1455,74 +1434,30 @@ char *demo_read_spv(const char *filename, size_t *psize)
 
 static VkShaderModule demo_prepare_vs(struct demo *demo)
 {
-    if (!demo->use_glsl) {
-        void *vertShaderCode;
-        size_t size;
+    void *vertShaderCode;
+    size_t size;
 
-        vertShaderCode = demo_read_spv("cube-vert.spv", &size);
-        demo->vert_shader_module = demo_prepare_shader_module(demo,
+    vertShaderCode = demo_read_spv("cube-vert.spv", &size);
+
+    demo->vert_shader_module = demo_prepare_shader_module(demo,
                 VK_SHADER_STAGE_VERTEX_BIT, vertShaderCode, size);
-        free(vertShaderCode);
-    } else {
-        static const char *vertShaderText =
-                "#version 140\n"
-                "#extension GL_ARB_separate_shader_objects : enable\n"
-                "#extension GL_ARB_shading_language_420pack : enable\n"
-                "\n"
-                "layout(binding = 0) uniform buf {\n"
-                "        mat4 MVP;\n"
-                "        vec4 position[12*3];\n"
-                "        vec4 attr[12*3];\n"
-                "} ubuf;\n"
-                "\n"
-                "layout (location = 0) out vec4 texcoord;\n"
-                "\n"
-                "void main() \n"
-                "{\n"
-                "   texcoord = ubuf.attr[gl_VertexID];\n"
-                "   gl_Position = ubuf.MVP * ubuf.position[gl_VertexID];\n"
-                "\n"
-                "   // GL->VK conventions\n"
-                "   gl_Position.y = -gl_Position.y;\n"
-                "   gl_Position.z = (gl_Position.z + gl_Position.w) / 2.0;\n"
-                "}\n";
-
-        demo->vert_shader_module = demo_prepare_shader_module(demo,
-                VK_SHADER_STAGE_VERTEX_BIT,
-                (const void *) vertShaderText, strlen(vertShaderText));
-    }
+
+    free(vertShaderCode);
 
     return demo->vert_shader_module;
 }
 
 static VkShaderModule demo_prepare_fs(struct demo *demo)
 {
-    if (!demo->use_glsl) {
-        void *fragShaderCode;
-        size_t size;
+    void *fragShaderCode;
+    size_t size;
 
-        fragShaderCode = demo_read_spv("cube-frag.spv", &size);
+    fragShaderCode = demo_read_spv("cube-frag.spv", &size);
 
-        demo->frag_shader_module = demo_prepare_shader_module(demo,
+    demo->frag_shader_module = demo_prepare_shader_module(demo,
                 VK_SHADER_STAGE_FRAGMENT_BIT, fragShaderCode, size);
-        free(fragShaderCode);
-    } else {
-        static const char *fragShaderText =
-                "#version 140\n"
-                "#extension GL_ARB_separate_shader_objects : enable\n"
-                "#extension GL_ARB_shading_language_420pack : enable\n"
-                "layout (binding = 1) uniform sampler2D tex;\n"
-                "\n"
-                "layout (location = 0) in vec4 texcoord;\n"
-                "layout (location = 0) out vec4 uFragColor;\n"
-                "void main() {\n"
-                "   uFragColor = texture(tex, texcoord.xy);\n"
-                "}\n";
-
-        demo->frag_shader_module = demo_prepare_shader_module(demo,
-                VK_SHADER_STAGE_FRAGMENT_BIT,
-                (const void *) fragShaderText, strlen(fragShaderText));
-    }
+
+    free(fragShaderCode);
 
     return demo->frag_shader_module;
 }
@@ -2588,10 +2523,6 @@ static void demo_init(struct demo *demo, int argc, char **argv)
             demo->use_staging_buffer = true;
             continue;
         }
-        if (strcmp(argv[i], "--use_glsl") == 0) {
-            demo->use_glsl = true;
-            continue;
-        }
         if (strcmp(argv[i], "--break") == 0) {
             demo->use_break = true;
             continue;

diff --git a/demos/tri.c b/demos/tri.c
index f0e2ff9..25a5c28 100644 (file)
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -46,8 +46,6 @@
 #include <vk_ext_khr_swapchain.h>
 #include <vk_ext_khr_device_swapchain.h>
 
-#include "icd-spv.h"
-
 #define DEMO_TEXTURE_COUNT 1
 #define VERTEX_BUFFER_BIND_ID 0
 #define APP_SHORT_NAME "tri"
@@ -167,7 +165,6 @@ struct demo {
 #endif // _WIN32
        bool prepared;
     bool use_staging_buffer;
-    bool use_glsl;
 
     VkAllocationCallbacks allocator;
 
@@ -1160,29 +1157,11 @@ static VkShaderModule demo_prepare_shader_module(struct demo *demo,
     moduleCreateInfo.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO;
     moduleCreateInfo.pNext = NULL;
 
-    if (!demo->use_glsl) {
-        moduleCreateInfo.codeSize = size;
-        moduleCreateInfo.pCode = code;
-        moduleCreateInfo.flags = 0;
-        err = vkCreateShaderModule(demo->device, &moduleCreateInfo, NULL, &module);
-        assert(!err);
-    } else {
-        // Create fake SPV structure to feed GLSL
-        // to the driver "under the covers"
-        moduleCreateInfo.codeSize = 3 * sizeof(uint32_t) + size + 1;
-        moduleCreateInfo.pCode = malloc(moduleCreateInfo.codeSize);
-        moduleCreateInfo.flags = 0;
-
-        /* try version 0 first: VkShaderStage followed by GLSL */
-        ((uint32_t *) moduleCreateInfo.pCode)[0] = ICD_SPV_MAGIC;
-        ((uint32_t *) moduleCreateInfo.pCode)[1] = 0;
-        ((uint32_t *) moduleCreateInfo.pCode)[2] = stage;
-        memcpy(((uint32_t *) moduleCreateInfo.pCode + 3), code, size + 1);
-
-        err = vkCreateShaderModule(demo->device, &moduleCreateInfo, NULL, &module);
-        assert(!err);
-        free((void *) moduleCreateInfo.pCode);
-    }
+    moduleCreateInfo.codeSize = size;
+    moduleCreateInfo.pCode = code;
+    moduleCreateInfo.flags = 0;
+    err = vkCreateShaderModule(demo->device, &moduleCreateInfo, NULL, &module);
+    assert(!err);
 
     return module;
 }
@@ -1213,64 +1192,30 @@ char *demo_read_spv(const char *filename, size_t *psize)
 
 static VkShaderModule demo_prepare_vs(struct demo *demo)
 {
-    if (!demo->use_glsl) {
-        void *vertShaderCode;
-        size_t size;
+    void *vertShaderCode;
+    size_t size;
 
-        vertShaderCode = demo_read_spv("tri-vert.spv", &size);
+    vertShaderCode = demo_read_spv("tri-vert.spv", &size);
 
-        demo->vert_shader_module = demo_prepare_shader_module(demo,
-                VK_SHADER_STAGE_VERTEX_BIT, vertShaderCode, size);
-        free(vertShaderCode);
-    } else {
-        static const char *vertShaderText =
-            "#version 140\n"
-            "#extension GL_ARB_separate_shader_objects : enable\n"
-            "#extension GL_ARB_shading_language_420pack : enable\n"
-            "layout (location = 0) in vec4 pos;\n"
-            "layout (location = 1) in vec2 attr;\n"
-            "out vec2 texcoord;\n"
-            "void main() {\n"
-            "   texcoord = attr;\n"
-            "   gl_Position = pos;\n"
-            "}\n";
-
-        demo->vert_shader_module = demo_prepare_shader_module(demo,
-                VK_SHADER_STAGE_VERTEX_BIT,
-                (const void *) vertShaderText, strlen(vertShaderText));
-    }
+    demo->vert_shader_module = demo_prepare_shader_module(demo,
+            VK_SHADER_STAGE_VERTEX_BIT, vertShaderCode, size);
+
+    free(vertShaderCode);
 
     return demo->vert_shader_module;
 }
 
 static VkShaderModule demo_prepare_fs(struct demo *demo)
 {
-    if (!demo->use_glsl) {
-        void *fragShaderCode;
-        size_t size;
+    void *fragShaderCode;
+    size_t size;
 
-        fragShaderCode = demo_read_spv("tri-frag.spv", &size);
+    fragShaderCode = demo_read_spv("tri-frag.spv", &size);
 
-        demo->frag_shader_module = demo_prepare_shader_module(demo,
-                VK_SHADER_STAGE_FRAGMENT_BIT, fragShaderCode, size);
+    demo->frag_shader_module = demo_prepare_shader_module(demo,
+            VK_SHADER_STAGE_FRAGMENT_BIT, fragShaderCode, size);
 
-        free(fragShaderCode);
-    } else {
-        static const char *fragShaderText =
-                "#version 140\n"
-                "#extension GL_ARB_separate_shader_objects : enable\n"
-                "#extension GL_ARB_shading_language_420pack : enable\n"
-                "layout (binding = 0) uniform sampler2D tex;\n"
-                "layout (location = 0) in vec2 texcoord;\n"
-                "layout (location = 0) out vec4 uFragColor;\n"
-                "void main() {\n"
-                "   uFragColor = texture(tex, texcoord);\n"
-                "}\n";
-
-        demo->frag_shader_module = demo_prepare_shader_module(demo,
-                VK_SHADER_STAGE_FRAGMENT_BIT,
-                (const void *) fragShaderText, strlen(fragShaderText));
-    }
+    free(fragShaderCode);
 
     return demo->frag_shader_module;
 }
@@ -2147,8 +2092,6 @@ static void demo_init(struct demo *demo, const int argc, const char *argv[])
 
     if (strncmp(pCmdLine, "--use_staging", strlen("--use_staging")) == 0)
         demo->use_staging_buffer = true;
-    else if (strncmp(pCmdLine, "--use_glsl", strlen("--use_glsl")) == 0)
-        demo->use_glsl = true;
     else if (strlen(pCmdLine) != 0) {
         fprintf(stderr, "Do not recognize argument \"%s\".\n", pCmdLine);
         argv_error = true;
@@ -2157,8 +2100,6 @@ static void demo_init(struct demo *demo, const int argc, const char *argv[])
     for (int i = 0; i < argc; i++) {
         if (strncmp(argv[i], "--use_staging", strlen("--use_staging")) == 0)
             demo->use_staging_buffer = true;
-        else if (strncmp(argv[i], "--use_glsl", strlen("--use_glsl")) == 0)
-            demo->use_glsl = true;
     }
 #endif // _WIN32
     if (argv_error) {