Merge branch 'glsl-pp-rework-2'

[mesa.git] / src / glsl / pp / sl_pp_error.c

diff --git a/src/glsl/pp/sl_pp_error.c b/src/glsl/pp/sl_pp_error.c
index d42568d23dc7698cc07468710e4fc68629b3124e..a9eeff98ba59a58fd290b6c7a56821db2f1e3a75 100644 (file)
--- a/src/glsl/pp/sl_pp_error.c
+++ b/src/glsl/pp/sl_pp_error.c
@@ -26,7 +26,9 @@
  **************************************************************************/
 
 #include <stdlib.h>
+#include <string.h>
 #include "sl_pp_process.h"
+#include "sl_pp_public.h"
 
 
 void
@@ -239,8 +241,12 @@ sl_pp_process_error(struct sl_pp_context *context,
          s = sl_pp_context_cstr(context, input[i].data.identifier);
          break;
 
-      case SL_PP_NUMBER:
-         s = sl_pp_context_cstr(context, input[i].data.number);
+      case SL_PP_UINT:
+         s = sl_pp_context_cstr(context, input[i].data._uint);
+         break;
+
+      case SL_PP_FLOAT:
+         s = sl_pp_context_cstr(context, input[i].data._float);
          break;
 
       case SL_PP_OTHER: