[Mesa-dev] [PATCH 4/6] meta: Since mipmap output type is always vec4, don't sprintf it

Ian Romanick idr at freedesktop.org
Fri Oct 5 15:56:50 PDT 2012


From: Ian Romanick <ian.d.romanick at intel.com>

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
 src/mesa/drivers/common/meta.c | 4 ++--
 1 file 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);
    }
 
-- 
1.7.11.4



More information about the mesa-dev mailing list