wined3d: Update GLSL spam filter for recent fglrx versions.

Matteo Bruni matteo.mystral at gmail.com
Wed Aug 3 10:31:27 CDT 2011


Users tend to get confused by those messages on the terminal. Since we
already have code to filter irrelevant GLSL compiler messages, let's
update it.
-------------- next part --------------
From b05e93594ed8742913e731d91faf69cc20cf2f69 Mon Sep 17 00:00:00 2001
From: Matteo Bruni <mbruni at codeweavers.com>
Date: Tue, 19 Jul 2011 20:19:55 +0200
Subject: wined3d: Update GLSL spam filter for recent fglrx versions.

---
 dlls/wined3d/glsl_shader.c |   17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 2fec8b9..6cb75b4 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -203,18 +203,11 @@ static void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLhandleA
 
     static const char * const spam[] =
     {
-        "Vertex shader was successfully compiled to run on hardware.\n",    /* fglrx          */
-        "Fragment shader was successfully compiled to run on hardware.\n",  /* fglrx, with \n */
-        "Fragment shader was successfully compiled to run on hardware.",    /* fglrx, no \n   */
-        "Fragment shader(s) linked, vertex shader(s) linked. \n ",          /* fglrx, with \n */
-        "Fragment shader(s) linked, vertex shader(s) linked. \n",           /* fglrx, with \n */
-        "Fragment shader(s) linked, vertex shader(s) linked.",              /* fglrx, no \n   */
-        "Vertex shader(s) linked, no fragment shader(s) defined. \n ",      /* fglrx, with \n */
-        "Vertex shader(s) linked, no fragment shader(s) defined. \n",       /* fglrx, with \n */
-        "Vertex shader(s) linked, no fragment shader(s) defined.",          /* fglrx, no \n   */
-        "Fragment shader(s) linked, no vertex shader(s) defined. \n ",      /* fglrx, with \n */
-        "Fragment shader(s) linked, no vertex shader(s) defined. \n",       /* fglrx, with \n */
-        "Fragment shader(s) linked, no vertex shader(s) defined.",          /* fglrx, no \n   */
+        "Vertex shader was successfully compiled to run on hardware.\n",    /* fglrx */
+        "Fragment shader was successfully compiled to run on hardware.\n",  /* fglrx */
+        "Vertex shader(s) linked, fragment shader(s) linked.\n",            /* fglrx */
+        "Vertex shader(s) linked.\n",                                       /* fglrx */
+        "Fragment shader(s) linked.\n",                                     /* fglrx */
     };
 
     if (!TRACE_ON(d3d_shader) && !FIXME_ON(d3d_shader)) return;
-- 
1.7.3.4


More information about the wine-patches mailing list