r600g: Get rid of the unused "family" parameter to r600_is_vertex_format_supported().

Signed-off-by: Henri Verbeet <hverbeet@gmail.com>

diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index 8f3a175587eb9bb705b396a9322cf8d01005bb23..ac41449a30117f03dc61ec54b8b8f10e25258fb9 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -547,13 +547,9 @@ static boolean r600_is_format_supported(struct pipe_screen* screen,
                retval |= PIPE_BIND_DEPTH_STENCIL;
        }
 
-       if (usage & PIPE_BIND_VERTEX_BUFFER) {
-               struct r600_screen *rscreen = (struct r600_screen *)screen;
-               enum radeon_family family = r600_get_family(rscreen->radeon);
-
-               if (r600_is_vertex_format_supported(format, family)) {
-                       retval |= PIPE_BIND_VERTEX_BUFFER;
-               }
+       if ((usage & PIPE_BIND_VERTEX_BUFFER) &&
+           r600_is_vertex_format_supported(format)) {
+               retval |= PIPE_BIND_VERTEX_BUFFER;
        }
 
        if (usage & PIPE_BIND_TRANSFER_READ)

diff --git a/src/gallium/drivers/r600/r600_state_inlines.h b/src/gallium/drivers/r600/r600_state_inlines.h
index eb6fb6594b2d481450c920434cd0cd6d87e7e0e8..71852543e56f2b076e67b4137a66030aa9280de9 100644 (file)
--- a/src/gallium/drivers/r600/r600_state_inlines.h
+++ b/src/gallium/drivers/r600/r600_state_inlines.h
@@ -576,8 +576,7 @@ static INLINE boolean r600_is_zs_format_supported(enum pipe_format format)
        return r600_translate_dbformat(format) != ~0;
 }
 
-static INLINE boolean r600_is_vertex_format_supported(enum pipe_format format,
-                                                     enum radeon_family family)
+static INLINE boolean r600_is_vertex_format_supported(enum pipe_format format)
 {
        unsigned i;
        const struct util_format_description *desc = util_format_description(format);