From: Kristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Date: Thu, 11 Jun 2015 21:55:50 +0000 (-0700)
Subject: vk: Compile fragment shader after VS and GS
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=923e923bbceb76376edb9ddf138ee185105cb75b;p=mesa.git

vk: Compile fragment shader after VS and GS

Just moving code around to do shader stages in the natual order.
---

diff --git a/src/vulkan/compiler.cpp b/src/vulkan/compiler.cpp
index 6adf92b3662..b5a287b622f 100644
--- a/src/vulkan/compiler.cpp
+++ b/src/vulkan/compiler.cpp
@@ -944,18 +944,7 @@ anv_compiler_run(struct anv_compiler *compiler, struct anv_pipeline *pipeline)
    }
 
    bool success;
-   struct brw_wm_prog_key wm_key;
-   struct gl_fragment_program *fp = (struct gl_fragment_program *)
-      program->_LinkedShaders[MESA_SHADER_FRAGMENT]->Program;
-   struct brw_fragment_program *bfp = brw_fragment_program(fp);
-
-   brw_wm_populate_key(brw, bfp, &wm_key);
-
-   success = really_do_wm_prog(brw, program, bfp, &wm_key, pipeline);
-   fail_if(!success, "do_wm_prog failed\n");
-   pipeline->prog_data[VK_SHADER_STAGE_FRAGMENT] = &pipeline->wm_prog_data.base;
-   pipeline->active_stages = VK_SHADER_STAGE_FRAGMENT_BIT;
-
+   pipeline->active_stages = 0;
 
    if (pipeline->shaders[VK_SHADER_STAGE_VERTEX]) {
       struct brw_vs_prog_key vs_key;
@@ -991,6 +980,20 @@ anv_compiler_run(struct anv_compiler *compiler, struct anv_pipeline *pipeline)
       pipeline->gs_vec4 = NO_KERNEL;
    }
 
+   if (pipeline->shaders[VK_SHADER_STAGE_FRAGMENT]) {
+      struct brw_wm_prog_key wm_key;
+      struct gl_fragment_program *fp = (struct gl_fragment_program *)
+         program->_LinkedShaders[MESA_SHADER_FRAGMENT]->Program;
+      struct brw_fragment_program *bfp = brw_fragment_program(fp);
+
+      brw_wm_populate_key(brw, bfp, &wm_key);
+
+      success = really_do_wm_prog(brw, program, bfp, &wm_key, pipeline);
+      fail_if(!success, "do_wm_prog failed\n");
+      pipeline->prog_data[VK_SHADER_STAGE_FRAGMENT] = &pipeline->wm_prog_data.base;
+      pipeline->active_stages |= VK_SHADER_STAGE_FRAGMENT_BIT;
+   }
+
    brw->ctx.Driver.DeleteShaderProgram(&brw->ctx, program);
 
    gen7_compute_urb_partition(pipeline);