commit 10b3251de1ec969caedb6773eda582b060a17ce0
author Steve K <srk@LunarG.com> Fri Oct 10 08:54:29 2014 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Oct 31 15:29:16 2014 -0600
tree 4eeaad0375d4516551ecb5ead3deb61829dff969
parent e2a5a09507b82fde7d04e5a2b0ff3ed6479b3756

Connect thin vertical BIL path.

icd/intel/shader.c

diff --git a/icd/intel/shader.c b/icd/intel/shader.c
index 3293275..9e4a312 100644
--- a/icd/intel/shader.c
+++ b/icd/intel/shader.c
@@ -44,7 +44,7 @@
     ir->size = size;
 
     // invoke our program creation as well
-    ir->shader_program = shader_create_program(sh, glsl_header);
+    ir->shader_program = shader_create_program_glsl(sh, glsl_header);
     if (!ir->shader_program)
         return XGL_ERROR_BAD_SHADER_CODE;
 
@@ -68,14 +68,13 @@
 
     ir->size = size - sizeof(*bil);
 
-    ir->kernel = icd_alloc(ir->size, 0, XGL_SYSTEM_ALLOC_INTERNAL_SHADER);
-    if (!ir->kernel) {
-        icd_free(ir);
-        return XGL_ERROR_OUT_OF_MEMORY;
-    }
+    // invoke our program creation as well
+    ir->shader_program = shader_create_program_bil(sh, bil, size);
+    if (!ir->shader_program)
+        return XGL_ERROR_BAD_SHADER_CODE;
 
-    // TODO: Translate BIL header to internal-IR
-
+    // TODO: set necessary shader information. This should really
+    // happen as result of create_program call.
     sh->ir = ir;
 
     return XGL_SUCCESS;