diff options
Diffstat (limited to 'src/gallium/drivers/r300/r300_screen.c')
| -rw-r--r-- | src/gallium/drivers/r300/r300_screen.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c index 13cd04a80c..b892c084c0 100644 --- a/src/gallium/drivers/r300/r300_screen.c +++ b/src/gallium/drivers/r300/r300_screen.c @@ -152,12 +152,12 @@ static int r300_get_param(struct pipe_screen* pscreen, int param) } else { return 0; } + case PIPE_CAP_MAX_CONST_BUFFERS: + return 1; + case PIPE_CAP_MAX_CONST_BUFFER_SIZE: + return 256; case PIPE_CAP_INDEP_BLEND_ENABLE: - if (r300screen->caps->is_r500) { - return 1; - } else { - return 0; - } + return 0; case PIPE_CAP_INDEP_BLEND_FUNC: return 0; case PIPE_CAP_TGSI_FS_COORD_ORIGIN_UPPER_LEFT: @@ -220,9 +220,6 @@ static boolean r300_is_format_supported(struct pipe_screen* screen, switch (format) { /* Supported formats. */ /* Colorbuffer */ - case PIPE_FORMAT_A4R4G4B4_UNORM: - case PIPE_FORMAT_R5G6B5_UNORM: - case PIPE_FORMAT_A1R5G5B5_UNORM: case PIPE_FORMAT_A8_UNORM: case PIPE_FORMAT_L8_UNORM: retval = usage & @@ -246,6 +243,9 @@ static boolean r300_is_format_supported(struct pipe_screen* screen, break; /* Colorbuffer or texture */ + case PIPE_FORMAT_R5G6B5_UNORM: + case PIPE_FORMAT_A1R5G5B5_UNORM: + case PIPE_FORMAT_A4R4G4B4_UNORM: case PIPE_FORMAT_A8R8G8B8_UNORM: case PIPE_FORMAT_X8R8G8B8_UNORM: case PIPE_FORMAT_R8G8B8A8_UNORM: @@ -281,7 +281,7 @@ static boolean r300_is_format_supported(struct pipe_screen* screen, case PIPE_FORMAT_X8Z24_UNORM: SCREEN_DBG(r300_screen(screen), DBG_TEX, "r300: Note: Got unsupported format: %s in %s\n", - pf_name(format), __FUNCTION__); + util_format_name(format), __FUNCTION__); return FALSE; /* XXX Add all remaining gallium-supported formats, @@ -290,7 +290,7 @@ static boolean r300_is_format_supported(struct pipe_screen* screen, default: /* Unknown format... */ debug_printf("r300: Warning: Got unknown format: %s in %s\n", - pf_name(format), __FUNCTION__); + util_format_name(format), __FUNCTION__); break; } |