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/cmd.c

diff --git a/icd/intel/cmd.c b/icd/intel/cmd.c
index 06767ea..7efaf5e 100644
--- a/icd/intel/cmd.c
+++ b/icd/intel/cmd.c
@@ -115,8 +115,9 @@
     writer->item_used = 0;
 
     writer->ptr = intel_bo_map(writer->bo, true);
-    if (!writer->ptr)
-        return VK_ERROR_UNKNOWN;
+    if (!writer->ptr) {
+        return VK_ERROR_MEMORY_MAP_FAILED;
+    }
 
     return VK_SUCCESS;
 }
@@ -162,7 +163,7 @@
     if (!new_ptr) {
         intel_bo_unref(new_bo);
         cmd_writer_discard(cmd, which);
-        cmd_fail(cmd, VK_ERROR_UNKNOWN);
+        cmd_fail(cmd, VK_ERROR_VALIDATION_FAILED);
         return;
     }
 
@@ -271,7 +272,8 @@
         break;
     default:
         /* TODOVV: Add validation check for this */
-        return VK_ERROR_UNKNOWN;
+        assert(0 && "icd: Invalid queue_family_index");
+        return VK_ERROR_VALIDATION_FAILED;
         break;
     }
 
@@ -365,11 +367,8 @@
     struct intel_winsys *winsys = cmd->dev->winsys;
     uint32_t i;
 
-    /* no matching intel_cmd_begin() */
-    if (!cmd->writers[INTEL_CMD_WRITER_BATCH].ptr) {
-        /* TODOVV: Move this to validation layer */
-        return VK_ERROR_UNKNOWN;
-    }
+    /* draw_state: no matching intel_cmd_begin() */
+    assert(cmd->writers[INTEL_CMD_WRITER_BATCH].ptr && "icd: no matching intel_cmd_begin");
 
     cmd_batch_end(cmd);
 
@@ -393,7 +392,7 @@
                 (struct intel_bo *) reloc->target, reloc->target_offset,
                 reloc->flags, &presumed_offset);
         if (err) {
-            cmd_fail(cmd, VK_ERROR_UNKNOWN);
+            cmd_fail(cmd, VK_ERROR_OUT_OF_DEVICE_MEMORY);
             break;
         }
 
@@ -415,7 +414,7 @@
                 reloc->flags & ~INTEL_CMD_RELOC_TARGET_IS_WRITER,
                 &presumed_offset);
         if (err) {
-            cmd_fail(cmd, VK_ERROR_UNKNOWN);
+            cmd_fail(cmd, VK_ERROR_OUT_OF_DEVICE_MEMORY);
             break;
         }
 
@@ -433,8 +432,9 @@
     if (intel_winsys_can_submit_bo(winsys,
                 &cmd->writers[INTEL_CMD_WRITER_BATCH].bo, 1))
         return VK_SUCCESS;
-    else
-        return VK_ERROR_UNKNOWN;
+    else {
+        assert(0 && "intel_winsys_can_submit_bo failed");
+    }
 }
 
 static void pool_destroy(struct intel_obj *obj)