From 0426d3c0c85b652c2c4e8509f709863e08644295 Mon Sep 17 00:00:00 2001 From: Nicolai Haehnle Date: Mon, 26 Mar 2007 22:20:46 +0200 Subject: [PATCH] r300: Remove a warning when vertex programs produce an unused output As far as we know, the hardware prefers outputs packed tightly together with no holes caused by outputs that are not even read by the fragment program. Therefore, we slightly rewrite vertex programs in this case. It would be interesting to test this interaction between vertex programs and fragment programs further, because some of that rewrite may be unnecessary. However, play it safe for now and don't change the current behaviour. --- src/mesa/drivers/dri/r300/r300_vertprog.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.c b/src/mesa/drivers/dri/r300/r300_vertprog.c index b453e31..52fd1de 100644 --- a/src/mesa/drivers/dri/r300/r300_vertprog.c +++ b/src/mesa/drivers/dri/r300/r300_vertprog.c @@ -331,10 +331,9 @@ static unsigned long op_operands(enum prog_opcode opcode) static GLboolean valid_dst(struct r300_vertex_program *vp, struct prog_dst_register *dst) { - if(dst->File == PROGRAM_OUTPUT && vp->outputs[dst->Index] == -1){ - WARN_ONCE("Output %d not used by fragment program\n", dst->Index); + if(dst->File == PROGRAM_OUTPUT && vp->outputs[dst->Index] == -1) { return GL_FALSE; - }else if(dst->File == PROGRAM_ADDRESS) { + } else if(dst->File == PROGRAM_ADDRESS) { assert(dst->Index == 0); } -- 2.7.4