commit 714f0a3dcc94e6a056139a372b055ea4dcdcce21
author Chia-I Wu <olvaffe@gmail.com> Sat Oct 11 14:08:15 2014 +0800
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Oct 31 15:29:16 2014 -0600
tree 277e19c85df2b8316885aec948e4fd6c6b1f315b
parent 86e7e7b3e16b64ddcdc69c35ada4cc08e305b9f4

intel: use intel_gpu to set up the compiler context

Instead of hardcoding Haswell.  The tests now pass on my SandyBridge.

icd/intel/pipeline_shader.c

diff --git a/icd/intel/pipeline_shader.c b/icd/intel/pipeline_shader.c
index baf28e4..60ff8ff 100644
--- a/icd/intel/pipeline_shader.c
+++ b/icd/intel/pipeline_shader.c
@@ -275,7 +275,7 @@
 
     // Right here, lower the IR to ISA using NOS
     // This must be after assignment of pipeline constant buffer
-    ret = intel_pipeline_shader_compile(vs,
+    ret = intel_pipeline_shader_compile(vs, pipeline->dev->gpu,
             intel_shader(info->vs.shader)->ir);
     if (ret != XGL_SUCCESS)
         return ret;
@@ -299,7 +299,7 @@
     struct intel_pipeline_shader *tcs = &pipeline->tcs;
     XGL_RESULT ret;
 
-    ret = intel_pipeline_shader_compile(tcs,
+    ret = intel_pipeline_shader_compile(tcs, pipeline->dev->gpu,
             intel_shader(info->tcs.shader)->ir);
     if (ret != XGL_SUCCESS)
         return ret;
@@ -317,7 +317,7 @@
     struct intel_pipeline_shader *tes = &pipeline->tes;
     XGL_RESULT ret;
 
-    ret = intel_pipeline_shader_compile(tes,
+    ret = intel_pipeline_shader_compile(tes, pipeline->dev->gpu,
             intel_shader(info->tes.shader)->ir);
     if (ret != XGL_SUCCESS)
         return ret;
@@ -335,7 +335,7 @@
     struct intel_pipeline_shader *gs = &pipeline->gs;
     XGL_RESULT ret;
 
-    ret = intel_pipeline_shader_compile(gs,
+    ret = intel_pipeline_shader_compile(gs, pipeline->dev->gpu,
             intel_shader(info->gs.shader)->ir);
     if (ret != XGL_SUCCESS)
         return ret;
@@ -357,7 +357,7 @@
 
     // Right here, lower the IR to ISA using NOS
     // This must be after assignment of pipeline constant buffer
-    ret = intel_pipeline_shader_compile(fs,
+    ret = intel_pipeline_shader_compile(fs, pipeline->dev->gpu,
             intel_shader(info->fs.shader)->ir);
     if (ret != XGL_SUCCESS)
         return ret;
@@ -382,7 +382,7 @@
     struct intel_pipeline_shader *cs = &pipeline->cs;
     XGL_RESULT ret;
 
-    ret = intel_pipeline_shader_compile(cs,
+    ret = intel_pipeline_shader_compile(cs, pipeline->dev->gpu,
             intel_shader(info->compute.cs.shader)->ir);
     if (ret != XGL_SUCCESS)
         return ret;