From: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri, 5 Oct 2012 22:16:24 +0000 (-0700)
Subject: meta: Since mipmap output type is always vec4, don't sprintf it
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0e973b7498fc6e120af0d8305273e045fe96d398;p=mesa.git

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

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

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 7da0db79832..8b5cfe44ab3 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);
    }