AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

svga: Factor out the format conversion table entry lookup.

Browse Source 
Seemed like a sensible cleanup, while I was looking at whether I could
make the table sparse.

To make the svga table not require fixups on every new gallium format,
we may want to change how it's populated.

Acked-by: Jose Fonseca <jfonseca@vmware.com>
Reviewed-by: Charmaine Lee <charmainel@vmware.com>
This commit is contained in:
Eric Anholt
2019-08-12 16:50:50 -07:00
parent 5167e94f23
commit 42efa789b5
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/svga/svga_format.c
+25 -16
View File
@@ -384,6 +384,16 @@ static const struct vgpu10_format_entry format_conversion_table[] =
};
static const struct vgpu10_format_entry *
svga_format_entry(enum pipe_format format)
{
assert(format < ARRAY_SIZE(format_conversion_table));
if (format >= ARRAY_SIZE(format_conversion_table))
return &format_conversion_table[PIPE_FORMAT_NONE];
else
return &format_conversion_table[format];
}
/**
* Translate a gallium vertex format to a vgpu10 vertex format.
* Also, return any special vertex format flags.
@@ -393,12 +403,10 @@ svga_translate_vertex_format_vgpu10(enum pipe_format format,
SVGA3dSurfaceFormat *svga_format,
unsigned *vf_flags)
{
assert(format < ARRAY_SIZE(format_conversion_table));
if (format >= ARRAY_SIZE(format_conversion_table)) {
format = PIPE_FORMAT_NONE;
}
*svga_format = format_conversion_table[format].vertex_format;
*vf_flags = format_conversion_table[format].flags;
const struct vgpu10_format_entry *entry = svga_format_entry(format);
*svga_format = entry->vertex_format;
*vf_flags = entry->flags;
}
@@ -413,12 +421,10 @@ svga_translate_texture_buffer_view_format(enum pipe_format format,
SVGA3dSurfaceFormat *svga_format,
unsigned *tf_flags)
{
assert(format < ARRAY_SIZE(format_conversion_table));
if (format >= ARRAY_SIZE(format_conversion_table)) {
format = PIPE_FORMAT_NONE;
}
*svga_format = format_conversion_table[format].view_format;
*tf_flags = format_conversion_table[format].flags;
const struct vgpu10_format_entry *entry = svga_format_entry(format);
*svga_format = entry->view_format;
*tf_flags = entry->flags;
}
@@ -453,15 +459,17 @@ svga_translate_format(const struct svga_screen *ss,
enum pipe_format format,
unsigned bind)
{
const struct vgpu10_format_entry *entry = svga_format_entry(format);
if (ss->sws->have_vgpu10) {
if (bind & (PIPE_BIND_VERTEX_BUFFER | PIPE_BIND_INDEX_BUFFER)) {
return format_conversion_table[format].vertex_format;
return entry->vertex_format;
}
else if (bind & PIPE_BIND_SCANOUT) {
return svga_translate_screen_target_format_vgpu10(format);
}
else {
return format_conversion_table[format].pixel_format;
return entry->pixel_format;
}
}
@@ -1914,8 +1922,9 @@ svga_format_is_integer(SVGA3dSurfaceFormat format)
boolean
svga_format_support_gen_mips(enum pipe_format format)
{
assert(format < ARRAY_SIZE(format_conversion_table));
return ((format_conversion_table[format].flags & TF_GEN_MIPS) > 0);
const struct vgpu10_format_entry *entry = svga_format_entry(format);
return (entry->flags & TF_GEN_MIPS) > 0;
}