mesa: drop fence type parameter from NewSyncObject()

[mesa.git] / src / mesa / drivers / dri / i915 / i830_texblend.c

diff --git a/src/mesa/drivers/dri/i915/i830_texblend.c b/src/mesa/drivers/dri/i915/i830_texblend.c
index ebfce7fe4fc529ca92c37082ecadf25844bc9cac..c29b5727fab30dd712799e76dd25587c23f8a566 100644 (file)
--- a/src/mesa/drivers/dri/i915/i830_texblend.c
+++ b/src/mesa/drivers/dri/i915/i830_texblend.c
@@ -28,7 +28,6 @@
 #include "main/glheader.h"
 #include "main/macros.h"
 #include "main/mtypes.h"
-#include "util/simple_list.h"
 #include "main/enums.h"
 #include "main/mm.h"
 
@@ -159,7 +158,7 @@ i830SetTexEnvCombine(struct i830_context * i830,
    };
 
    if (INTEL_DEBUG & DEBUG_TEXTURE)
-      fprintf(stderr, "%s\n", __FUNCTION__);
+      fprintf(stderr, "%s\n", __func__);
 
 
    /* The EXT version of the DOT3 extension does not support the
@@ -395,7 +394,7 @@ emit_texblend(struct i830_context *i830, GLuint unit, GLuint blendUnit,
 
 
    if (0)
-      fprintf(stderr, "%s unit %d\n", __FUNCTION__, unit);
+      fprintf(stderr, "%s unit %d\n", __func__, unit);
 
    /* Update i830->state.TexBlend
     */