[Mesa-dev] [PATCH] i965: Modify some error messages to refer to "vec4" instead of "vs".

[Kenneth Graunke]

On 01/17/2014 02:14 PM, Paul Berry wrote:
> These messages are in code that is shared between the VS and GS
> back-ends, so use the terminology "vec4" to avoid confusion.
> ---
>  src/mesa/drivers/dri/i965/brw_vec4_generator.cpp | 8 ++++----
>  src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp   | 2 +-
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
> index c1ef81d..51e88d2 100644
> --- 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 3b8cef6..81906e8 100644
> --- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
> @@ -3343,7 +3343,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;
>  
> 

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>