From: Ian Romanick <ian.d.roman...@intel.com>
Signed-off-by: Ian Romanick <ian.d.roman...@intel.com>
---
src/mesa/drivers/common/meta_blit.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/mesa/drivers/common/meta_blit.c
b/src/mesa/drivers/common/meta_blit.c
index da7cca6..08dd4a4 100644
--- a/src/mesa/drivers/common/meta_blit.c
+++ b/src/mesa/drivers/common/meta_blit.c
@@ -420,7 +420,7 @@ setup_glsl_msaa_blit_shader(struct gl_context *ctx,
* sample). Yes, this is ridiculous.
*/
char *sample_resolve;
- const char *merge_function;
+
name = ralloc_asprintf(mem_ctx, "%svec4 MSAA %s",
vec4_prefix,
dst_is_msaa ? "copy" : "resolve");
@@ -453,8 +453,6 @@ setup_glsl_msaa_blit_shader(struct gl_context *ctx,
"i%s(%s), gl_SampleID);",
texcoord_type, tex_coords);
- merge_function = "";
-
fs_source = ralloc_asprintf(mem_ctx,
"#version 130\n"
"#extension GL_ARB_texture_multisample:
require\n"
@@ -465,7 +463,6 @@ setup_glsl_msaa_blit_shader(struct gl_context *ctx,
"in %s texCoords;\n"
"out gvec4 out_color;\n"
"\n"
- "%s" /* merge_function */
"void main()\n"
"{\n"
"%s\n" /* sample_resolve */
@@ -474,9 +471,9 @@ setup_glsl_msaa_blit_shader(struct gl_context *ctx,
vec4_prefix,
sampler_array_suffix,
texcoord_type,
- merge_function,
sample_resolve);
} else {
+ const char *merge_function;
int i;
int step;
--
2.5.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
