nouveau: is_format_supported() interface changes

This commit is contained in:
Ben Skeggs 2008-07-23 14:14:55 +10:00
parent 704dca40c4
commit 39793a262f
5 changed files with 29 additions and 44 deletions

View file

@ -79,10 +79,11 @@ nv04_screen_get_paramf(struct pipe_screen *screen, int param)
static boolean
nv04_screen_is_format_supported(struct pipe_screen *screen,
enum pipe_format format, uint type)
enum pipe_format format,
enum pipe_texture_target target,
unsigned tex_usage, unsigned geom_flags)
{
switch (type) {
case PIPE_SURFACE:
if (tex_usage & PIPE_TEXTURE_USAGE_RENDER_TARGET) {
switch (format) {
case PIPE_FORMAT_A8R8G8B8_UNORM:
case PIPE_FORMAT_R5G6B5_UNORM:
@ -91,8 +92,7 @@ nv04_screen_is_format_supported(struct pipe_screen *screen,
default:
break;
}
break;
case PIPE_TEXTURE:
} else {
switch (format) {
case PIPE_FORMAT_A8R8G8B8_UNORM:
case PIPE_FORMAT_X8R8G8B8_UNORM:
@ -104,10 +104,7 @@ nv04_screen_is_format_supported(struct pipe_screen *screen,
default:
break;
}
break;
default:
assert(0);
};
}
return FALSE;
}

View file

@ -82,10 +82,11 @@ nv10_screen_get_paramf(struct pipe_screen *screen, int param)
static boolean
nv10_screen_is_format_supported(struct pipe_screen *screen,
enum pipe_format format, uint type)
enum pipe_format format,
enum pipe_texture_target target,
unsigned tex_usage, unsigned geom_flags)
{
switch (type) {
case PIPE_SURFACE:
if (tex_usage & PIPE_TEXTURE_USAGE_RENDER_TARGET) {
switch (format) {
case PIPE_FORMAT_A8R8G8B8_UNORM:
case PIPE_FORMAT_R5G6B5_UNORM:
@ -95,8 +96,7 @@ nv10_screen_is_format_supported(struct pipe_screen *screen,
default:
break;
}
break;
case PIPE_TEXTURE:
} else {
switch (format) {
case PIPE_FORMAT_A8R8G8B8_UNORM:
case PIPE_FORMAT_A1R5G5B5_UNORM:
@ -109,10 +109,7 @@ nv10_screen_is_format_supported(struct pipe_screen *screen,
default:
break;
}
break;
default:
assert(0);
};
}
return FALSE;
}

View file

@ -86,10 +86,11 @@ nv30_screen_get_paramf(struct pipe_screen *pscreen, int param)
static boolean
nv30_screen_surface_format_supported(struct pipe_screen *pscreen,
enum pipe_format format, uint type)
enum pipe_format format,
enum pipe_texture_target target,
unsigned tex_usage, unsigned geom_flags)
{
switch (type) {
case PIPE_SURFACE:
if (tex_usage & PIPE_TEXTURE_USAGE_RENDER_TARGET) {
switch (format) {
case PIPE_FORMAT_A8R8G8B8_UNORM:
case PIPE_FORMAT_R5G6B5_UNORM:
@ -99,8 +100,7 @@ nv30_screen_surface_format_supported(struct pipe_screen *pscreen,
default:
break;
}
break;
case PIPE_TEXTURE:
} else {
switch (format) {
case PIPE_FORMAT_A8R8G8B8_UNORM:
case PIPE_FORMAT_A1R5G5B5_UNORM:
@ -116,10 +116,7 @@ nv30_screen_surface_format_supported(struct pipe_screen *pscreen,
default:
break;
}
break;
default:
assert(0);
};
}
return FALSE;
}

View file

@ -91,10 +91,11 @@ nv40_screen_get_paramf(struct pipe_screen *pscreen, int param)
static boolean
nv40_screen_surface_format_supported(struct pipe_screen *pscreen,
enum pipe_format format, uint type)
enum pipe_format format,
enum pipe_texture_target target,
unsigned tex_usage, unsigned geom_flags)
{
switch (type) {
case PIPE_SURFACE:
if (tex_usage & PIPE_TEXTURE_USAGE_RENDER_TARGET) {
switch (format) {
case PIPE_FORMAT_A8R8G8B8_UNORM:
case PIPE_FORMAT_R5G6B5_UNORM:
@ -104,8 +105,7 @@ nv40_screen_surface_format_supported(struct pipe_screen *pscreen,
default:
break;
}
break;
case PIPE_TEXTURE:
} else {
switch (format) {
case PIPE_FORMAT_A8R8G8B8_UNORM:
case PIPE_FORMAT_A1R5G5B5_UNORM:
@ -125,10 +125,7 @@ nv40_screen_surface_format_supported(struct pipe_screen *pscreen,
default:
break;
}
break;
default:
assert(0);
};
}
return FALSE;
}

View file

@ -34,10 +34,11 @@
static boolean
nv50_screen_is_format_supported(struct pipe_screen *pscreen,
enum pipe_format format, uint type)
enum pipe_format format,
enum pipe_texture_target target,
unsigned tex_usage, unsigned geom_flags)
{
switch (type) {
case PIPE_SURFACE:
if (tex_usage & PIPE_TEXTURE_USAGE_RENDER_TARGET) {
switch (format) {
case PIPE_FORMAT_A8R8G8B8_UNORM:
case PIPE_FORMAT_R5G6B5_UNORM:
@ -47,8 +48,7 @@ nv50_screen_is_format_supported(struct pipe_screen *pscreen,
default:
break;
}
break;
case PIPE_TEXTURE:
} else {
switch (format) {
case PIPE_FORMAT_A8R8G8B8_UNORM:
case PIPE_FORMAT_A1R5G5B5_UNORM:
@ -62,9 +62,6 @@ nv50_screen_is_format_supported(struct pipe_screen *pscreen,
default:
break;
}
break;
default:
assert(0);
}
return FALSE;