commit ac544f3737b45a5b35251100a3396aa8be397d8d
author Courtney Goeltzenleuchter <courtney@LunarG.com> Mon Sep 14 18:01:17 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Thu Sep 17 15:32:11 2015 -0600
tree be741b65a14d3f9590e7580dcd479744eab81234
parent 74c4ce9c4fa101c0989a29cf918e799fa67adcec

bug-14538: Remove validation error codes

https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14538

icd/intel/shader.c

diff --git a/icd/intel/shader.c b/icd/intel/shader.c
index 18b2412..471cf51 100644
--- a/icd/intel/shader.c
+++ b/icd/intel/shader.c
@@ -43,8 +43,6 @@
                                      const VkShaderModuleCreateInfo *info,
                                      struct intel_shader_module **sm_ret)
 {
-    const struct icd_spv_header *spv =
-        (const struct icd_spv_header *) info->pCode;
     struct intel_shader_module *sm;
 
     sm = (struct intel_shader_module *) intel_base_create(&dev->base.handle,
@@ -52,17 +50,6 @@
     if (!sm)
         return VK_ERROR_OUT_OF_HOST_MEMORY;
 
-    /* TODOVV: Move test to validation layer */
-    if (info->codeSize < sizeof(*spv)) {
-//        return VK_ERROR_INVALID_MEMORY_SIZE;
-        return VK_ERROR_UNKNOWN;
-    }
-    /* TODOVV: Move test to validation layer */
-    if (spv->magic != ICD_SPV_MAGIC) {
-//        return VK_ERROR_BAD_SHADER_CODE;
-        return VK_ERROR_UNKNOWN;
-    }
-
     sm->code_size = info->codeSize;
     sm->code = malloc(info->codeSize);
     if (!sm->code) {
@@ -126,7 +113,7 @@
         shader_destroy(&sh->obj);
         /* TODOVV: Can this move to validation layer? */
 //        return VK_ERROR_BAD_SHADER_CODE;
-        return VK_ERROR_UNKNOWN;
+        return VK_ERROR_VALIDATION_FAILED;
     }
 
     sh->obj.destroy = shader_destroy;