projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0242381
)
meta: Since mipmap output type is always vec4, don't sprintf it
author
Ian Romanick
<ian.d.romanick@intel.com>
Fri, 5 Oct 2012 22:16:24 +0000
(15:16 -0700)
committer
Ian Romanick
<ian.d.romanick@intel.com>
Mon, 8 Oct 2012 03:35:45 +0000
(20:35 -0700)
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>
src/mesa/drivers/common/meta.c
patch
|
blob
|
history
diff --git
a/src/mesa/drivers/common/meta.c
b/src/mesa/drivers/common/meta.c
index 7da0db79832a0e3c579dc0bebdfccb31786bbae6..8b5cfe44ab31a2f622a7bee332b0b390ee420a96 100644
(file)
--- 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);
}