Mesa (master): meta: Since mipmap output type is always vec4, don' t sprintf it

[Ian Romanick]

Module: Mesa
Branch: master
Commit: 0e973b7498fc6e120af0d8305273e045fe96d398
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0e973b7498fc6e120af0d8305273e045fe96d398

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Fri Oct  5 15:16:24 2012 -0700

meta: Since mipmap output type is always vec4, don't sprintf it

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>

---

 src/mesa/drivers/common/meta.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 7da0db7..8b5cfe4 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -3147,7 +3147,7 @@ setup_glsl_generate_mipmap(struct gl_context *ctx,
          "#version 130\n"
          "uniform %s texSampler;\n"
          "in vec3 texCoords;\n"
-         "out %s out_color;\n"
+         "out vec4 out_color;\n"
          "\n"
          "void main()\n"
          "{\n"
@@ -3155,7 +3155,7 @@ setup_glsl_generate_mipmap(struct gl_context *ctx,
          "}\n";
 
       fs_source = ralloc_asprintf(mem_ctx, fs_template,
-                                  sampler->type, "vec4",
+                                  sampler->type,
                                   sampler->texcoords);
    }