i965/urb: fixes division by zero

[mesa.git] / src / mesa / drivers / dri / i965 / brw_fs_validate.cpp

diff --git a/src/mesa/drivers/dri/i965/brw_fs_validate.cpp b/src/mesa/drivers/dri/i965/brw_fs_validate.cpp
index d0e04f3bf471aeb6cdcf1296fee90c027a9d3967..90edd023b303378a7ccc182fdb88b270f403e6a6 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_fs_validate.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_validate.cpp
@@ -32,7 +32,7 @@
 
 #define fsv_assert(cond) \
    if (!(cond)) { \
-      fprintf(stderr, "ASSERT: FS validation failed!\n"); \
+      fprintf(stderr, "ASSERT: Scalar %s validation failed!\n", stage_abbrev); \
       dump_instruction(inst, stderr); \
       fprintf(stderr, "%s:%d: %s\n", __FILE__, __LINE__, #cond); \
       abort(); \
@@ -42,15 +42,15 @@ void
 fs_visitor::validate()
 {
    foreach_block_and_inst (block, fs_inst, inst, cfg) {
-      if (inst->dst.file == GRF) {
+      if (inst->dst.file == VGRF) {
          fsv_assert(inst->dst.reg_offset + inst->regs_written <=
-                    alloc.sizes[inst->dst.reg]);
+                    alloc.sizes[inst->dst.nr]);
       }
 
       for (unsigned i = 0; i < inst->sources; i++) {
-         if (inst->src[i].file == GRF) {
+         if (inst->src[i].file == VGRF) {
             fsv_assert(inst->src[i].reg_offset + inst->regs_read(i) <=
-                       (int)alloc.sizes[inst->src[i].reg]);
+                       (int)alloc.sizes[inst->src[i].nr]);
          }
       }
    }