summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2012-10-05 15:16:24 -0700
committerIan Romanick <[email protected]>2012-10-07 20:35:45 -0700
commit0e973b7498fc6e120af0d8305273e045fe96d398 (patch)
tree49a052f7b93e3f3b0e550cec89a7519597bd5b21 /src/mesa/drivers
parent0242381f06edb09dcf0eaacd6d26ccd8584700cc (diff)
meta: Since mipmap output type is always vec4, don't sprintf it
Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Anuj Phogat <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/common/meta.c4
1 files changed, 2 insertions, 2 deletions
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);
}