Merge remote-tracking branch 'origin/master' into pipe-video

Conflicts:
	src/gallium/drivers/r600/r600_state.c

2 files changed, 2 insertions, 3 deletions

diff --git a/src/gallium/auxiliary/draw/draw_context.h b/src/gallium/auxiliary/draw/draw_context.h
index 7db75b71b43..5523e44563b 100644
--- a/src/gallium/auxiliary/draw/draw_context.h
+++ b/src/gallium/auxiliary/draw/draw_context.h
@@ -243,7 +243,7 @@ boolean draw_need_pipeline(const struct draw_context *draw,
                            unsigned prim );
 
 static INLINE int
-draw_get_shader_param(unsigned shader, enum pipe_cap param)
+draw_get_shader_param(unsigned shader, enum pipe_shader_cap param)
 {
    switch(shader) {
    case PIPE_SHADER_VERTEX:
diff --git a/src/gallium/auxiliary/draw/draw_vertex.c b/src/gallium/auxiliary/draw/draw_vertex.c
index a4f5e882c0a..a1b2b8ff975 100644
--- a/src/gallium/auxiliary/draw/draw_vertex.c
+++ b/src/gallium/auxiliary/draw/draw_vertex.c
@@ -60,10 +60,9 @@ draw_compute_vertex_size(struct vertex_info *vinfo)
 void
 draw_dump_emitted_vertex(const struct vertex_info *vinfo, const uint8_t *data)
 {
-   unsigned i, j;
+   unsigned i;
 
    for (i = 0; i < vinfo->num_attribs; i++) {
-      j = vinfo->attrib[i].src_index;
       switch (vinfo->attrib[i].emit) {
       case EMIT_OMIT:
          debug_printf("EMIT_OMIT:");