Mesa (master): u_simple_shaders: try to un-break the Windows build

Nicolai Hähnle nh at kemper.freedesktop.org
Wed Nov 16 12:26:02 UTC 2016


Module: Mesa
Branch: master
Commit: fb17b7f99dc30a1c976f0f99cfe6572c538a381f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fb17b7f99dc30a1c976f0f99cfe6572c538a381f

Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date:   Wed Nov 16 11:26:11 2016 +0100

u_simple_shaders: try to un-break the Windows build

Acked-by: Edward O'Callaghan <funfunctor at folklore1984.net>

---

 src/gallium/auxiliary/util/u_simple_shaders.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_simple_shaders.c b/src/gallium/auxiliary/util/u_simple_shaders.c
index b46ec58..8be31be 100644
--- a/src/gallium/auxiliary/util/u_simple_shaders.c
+++ b/src/gallium/auxiliary/util/u_simple_shaders.c
@@ -41,6 +41,7 @@
 #include "util/u_simple_shaders.h"
 #include "util/u_debug.h"
 #include "util/u_memory.h"
+#include "util/u_string.h"
 #include "tgsi/tgsi_dump.h"
 #include "tgsi/tgsi_strings.h"
 #include "tgsi/tgsi_ureg.h"
@@ -595,8 +596,8 @@ util_make_fs_blit_msaa_gen(struct pipe_context *pipe,
    assert(tgsi_tex == TGSI_TEXTURE_2D_MSAA ||
           tgsi_tex == TGSI_TEXTURE_2D_ARRAY_MSAA);
 
-   snprintf(text, sizeof(text), shader_templ, type, samp_type,
-            output_semantic, conversion_decl, type, conversion, output_mask);
+   util_snprintf(text, sizeof(text), shader_templ, type, samp_type,
+                 output_semantic, conversion_decl, type, conversion, output_mask);
 
    if (!tgsi_text_translate(text, tokens, ARRAY_SIZE(tokens))) {
       puts(text);




More information about the mesa-commit mailing list