commit ef5b116f9621e6e3fd4a27b65fc689b060652cd4
author Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Oct 10 16:29:46 2014 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Oct 31 15:29:16 2014 -0600
tree 31a68585ad29e8f167f425ffa632644166b537a4
parent d4ee38db1be4c20451328283b3bb3dc7d2ccadaf

intel: Support GLSL compiling in less intrusive way

Removed all the extension semantics. Support for compiling GLSL in the
driver is intended to be a tempory feature and these changes minimize
the impact on the driver and make it easier to remove in the future.

icd/intel/shader.c

diff --git a/icd/intel/shader.c b/icd/intel/shader.c
index 9e4a312..0f94002 100644
--- a/icd/intel/shader.c
+++ b/icd/intel/shader.c
@@ -30,32 +30,7 @@
 #include "shader.h"
 #include "compiler/shader/compiler_interface.h"
 
-static XGL_RESULT shader_parse_glsl(struct intel_shader *sh,
-                                   const struct intel_gpu *gpu,
-                                   const XGL_INTEL_COMPILE_GLSL *glsl_header,
-                                   XGL_SIZE size)
-{
-    struct intel_ir *ir;
-
-    ir = icd_alloc(sizeof(*ir), 0, XGL_SYSTEM_ALLOC_INTERNAL_SHADER);
-    if (!ir)
-        return XGL_ERROR_OUT_OF_MEMORY;
-
-    ir->size = size;
-
-    // invoke our program creation as well
-    ir->shader_program = shader_create_program_glsl(sh, glsl_header);
-    if (!ir->shader_program)
-        return XGL_ERROR_BAD_SHADER_CODE;
-
-    // TODO: set necessary shader information. This should really
-    // happen as result of create_program call.
-    sh->ir = ir;
-
-    return XGL_SUCCESS;
-}
-
-static XGL_RESULT shader_parse_bil(struct intel_shader *sh,
+static XGL_RESULT shader_parse(struct intel_shader *sh,
                                    const struct intel_gpu *gpu,
                                    const struct icd_bil_header *bil,
                                    XGL_SIZE size)
@@ -69,7 +44,7 @@
     ir->size = size - sizeof(*bil);
 
     // invoke our program creation as well
-    ir->shader_program = shader_create_program_bil(sh, bil, size);
+    ir->shader_program = shader_create_program(sh, bil, size);
     if (!ir->shader_program)
         return XGL_ERROR_BAD_SHADER_CODE;
 
@@ -105,28 +80,19 @@
     if (!sh)
         return XGL_ERROR_OUT_OF_MEMORY;
 
-    if (dev->exts[INTEL_EXT_COMPILE_GLSL] &&
-        info->sType == (XGL_STRUCTURE_TYPE) XGL_INTEL_STRUCTURE_TYPE_SHADER_CREATE_INFO) {
-        // use GLSL compiler extension
-        ret = shader_parse_glsl(sh, dev->gpu, info->pCode, info->codeSize);
-        if (ret != XGL_SUCCESS) {
-            shader_destroy(&sh->obj);
-            return ret;
-        }
-    } else {
-        if (info->codeSize < sizeof(*bil))
-            return XGL_ERROR_INVALID_MEMORY_SIZE;
-        if (bil->magic != ICD_BIL_MAGIC)
-            return XGL_ERROR_BAD_SHADER_CODE;
+    if (info->codeSize < sizeof(*bil))
+        return XGL_ERROR_INVALID_MEMORY_SIZE;
+    if (bil->magic != ICD_BIL_MAGIC)
+        return XGL_ERROR_BAD_SHADER_CODE;
 
 
-        ret = shader_parse_bil(sh, dev->gpu, bil, info->codeSize);
-        if (ret != XGL_SUCCESS) {
-            shader_destroy(&sh->obj);
-            return ret;
-        }
+    ret = shader_parse(sh, dev->gpu, bil, info->codeSize);
+    if (ret != XGL_SUCCESS) {
+        shader_destroy(&sh->obj);
+        return ret;
     }
 
+
     sh->obj.destroy = shader_destroy;
 
     *sh_ret = sh;