i965: Modify some error messages to refer to "vec4" instead of "vs".

These messages are in code that is shared between the VS and GS
back-ends, so use the terminology "vec4" to avoid confusion.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
index c1ef81dae69f72a510646a27eb083c8aecce7fc9..51e88d24383a19416e72217c8932740b80a433e6 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
@@ -327,7 +327,7 @@ vec4_generator::generate_tex(vec4_instruction *inst,
          }
          break;
       default:
-        assert(!"should not get here: invalid VS texture opcode");
+        assert(!"should not get here: invalid vec4 texture opcode");
         break;
       }
    } else {
@@ -356,7 +356,7 @@ vec4_generator::generate_tex(vec4_instruction *inst,
         assert(inst->mlen == 2);
         break;
       default:
-        assert(!"should not get here: invalid VS texture opcode");
+        assert(!"should not get here: invalid vec4 texture opcode");
         break;
       }
    }
@@ -1218,10 +1218,10 @@ vec4_generator::generate_vec4_instruction(vec4_instruction *instruction,
 
    default:
       if (inst->opcode < (int) ARRAY_SIZE(opcode_descs)) {
-         _mesa_problem(&brw->ctx, "Unsupported opcode in `%s' in VS\n",
+         _mesa_problem(&brw->ctx, "Unsupported opcode in `%s' in vec4\n",
                        opcode_descs[inst->opcode].name);
       } else {
-         _mesa_problem(&brw->ctx, "Unsupported opcode %d in VS", inst->opcode);
+         _mesa_problem(&brw->ctx, "Unsupported opcode %d in vec4", inst->opcode);
       }
       abort();
    }

diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
index 76b24ad720acf1eaef25ff119c9bbdce89f0ab9b..15a6cbdd256aaad3c78b7151814e77a108bb1a9b 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
@@ -3353,7 +3353,7 @@ vec4_visitor::fail(const char *format, ...)
    va_start(va, format);
    msg = ralloc_vasprintf(mem_ctx, format, va);
    va_end(va);
-   msg = ralloc_asprintf(mem_ctx, "VS compile failed: %s\n", msg);
+   msg = ralloc_asprintf(mem_ctx, "vec4 compile failed: %s\n", msg);
 
    this->fail_msg = msg;