vk/compiler: create the right kind of program struct

This fixes Valgrind errors and gets all the tests to pass with
--use-spir-v.

diff --git a/src/vulkan/compiler.cpp b/src/vulkan/compiler.cpp
index 0a8ec87415fa07f98dc98bc0efd980d4a02a9415..216da89c69711a1d6c5cf3a6bbb6a96c97bda366 100644 (file)
--- a/src/vulkan/compiler.cpp
+++ b/src/vulkan/compiler.cpp
@@ -981,7 +981,21 @@ anv_compile_shader_spirv(struct anv_compiler *compiler,
    fail_if(mesa_shader == NULL,
            "failed to create %s shader\n", stage_info[stage].name);
 
-   mesa_shader->Program = rzalloc(mesa_shader, struct gl_program);
+   switch (stage) {
+   case VK_SHADER_STAGE_VERTEX:
+      mesa_shader->Program = &rzalloc(mesa_shader, struct brw_vertex_program)->program.Base;
+      break;
+   case VK_SHADER_STAGE_GEOMETRY:
+      mesa_shader->Program = &rzalloc(mesa_shader, struct brw_geometry_program)->program.Base;
+      break;
+   case VK_SHADER_STAGE_FRAGMENT:
+      mesa_shader->Program = &rzalloc(mesa_shader, struct brw_fragment_program)->program.Base;
+      break;
+   case VK_SHADER_STAGE_COMPUTE:
+      mesa_shader->Program = &rzalloc(mesa_shader, struct brw_compute_program)->program.Base;
+      break;
+   }
+
    mesa_shader->Type = stage_info[stage].token;
    mesa_shader->Stage = stage_info[stage].stage;