Mesa (master): r600g: Get rid of the unused "family" parameter to r600_is_vertex_format_supported().
Henri Verbeet
hverbeet at kemper.freedesktop.org
Mon Jul 4 23:59:42 UTC 2011
Module: Mesa
Branch: master
Commit: 865f9272189697932d96a318f60efb99344ab944
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=865f9272189697932d96a318f60efb99344ab944
Author: Henri Verbeet <hverbeet at gmail.com>
Date: Tue Jul 5 01:58:46 2011 +0200
r600g: Get rid of the unused "family" parameter to r600_is_vertex_format_supported().
Signed-off-by: Henri Verbeet <hverbeet at gmail.com>
---
src/gallium/drivers/r600/r600_pipe.c | 10 +++-------
src/gallium/drivers/r600/r600_state_inlines.h | 3 +--
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index 8f3a175..ac41449 100644
--- 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 eb6fb65..7185254 100644
--- 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);
More information about the mesa-commit
mailing list