i965: verify format width in blorp_get_client_bo

[mesa.git] / src / mesa / tnl / t_vertex_generic.c

diff --git a/src/mesa/tnl/t_vertex_generic.c b/src/mesa/tnl/t_vertex_generic.c
index 079d473fc7c9cd04754041c94bde0e7580205c6d..7f871a4f68678c3e06f49215e1bde690a4bb6b4f 100644 (file)
--- a/src/mesa/tnl/t_vertex_generic.c
+++ b/src/mesa/tnl/t_vertex_generic.c
@@ -28,15 +28,14 @@
 
 #include "main/glheader.h"
 #include "main/context.h"
-#include "main/colormac.h"
-#include "util/simple_list.h"
+#include "main/macros.h"
 #include "swrast/s_chan.h"
 #include "t_context.h"
 #include "t_vertex.h"
 
 
 #if 0
-#define DEBUG_INSERT printf("%s\n", __FUNCTION__)
+#define DEBUG_INSERT printf("%s\n", __func__)
 #else
 #define DEBUG_INSERT
 #endif
@@ -1026,7 +1025,7 @@ void _tnl_generic_interp( struct gl_context *ctx,
 
    if (tnl->NeedNdcCoords) {
       const GLfloat *dstclip = VB->ClipPtr->data[edst];
-      if (dstclip[3] != 0.0) {
+      if (dstclip[3] != 0.0f) {
         const GLfloat w = 1.0f / dstclip[3];
         GLfloat pos[4];