nv40: fix a couple of typos

src/mesa/pipe/nv40/nv40_state.c

@@ -210,9 +210,9 @@ nv40_sampler_state_create(struct pipe_context *pipe,
 	}
 
 
-	ps->wrap = ((wrap_mode(cso->wrap_r) << NV40TCL_TEX_WRAP_S_SHIFT) |
+	ps->wrap = ((wrap_mode(cso->wrap_s) << NV40TCL_TEX_WRAP_S_SHIFT) |
 		    (wrap_mode(cso->wrap_t) << NV40TCL_TEX_WRAP_T_SHIFT) |
-		    (wrap_mode(cso->wrap_s) << NV40TCL_TEX_WRAP_R_SHIFT));
+		    (wrap_mode(cso->wrap_r) << NV40TCL_TEX_WRAP_R_SHIFT));
 	ps->filt = filter;
 	ps->bcol = ((float_to_ubyte(cso->border_color[3]) << 24) |
 		    (float_to_ubyte(cso->border_color[0]) << 16) |

src/mesa/pipe/nv40/nv40_state_tex.c

@@ -33,6 +33,7 @@ nv40_texture_formats[] = {
 //	_(RGBA_DXT1   , 0x86,   S1,   S1,   S1,   S1, X, Y, Z, W, 0x00, 0x00),
 //	_(RGBA_DXT3   , 0x87,   S1,   S1,   S1,   S1, X, Y, Z, W, 0x00, 0x00),
 //	_(RGBA_DXT5   , 0x88,   S1,   S1,   S1,   S1, X, Y, Z, W, 0x00, 0x00),
+	{},
 };
 
 static struct nv40_texture_format *