diff options
| author | Marek Olšák <maraeo@gmail.com> | 2011-04-08 04:37:19 +0200 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2011-04-08 04:38:36 +0200 |
| commit | 7984c2d42de50d1a44ab9832c8370ff1dee1c0e7 (patch) | |
| tree | cac3afdeb1e53afd264e322dd6a426c616dd61ff | |
| parent | 10ea8567f49f4daaa654b6e4c365a816f855073b (diff) | |
r300g: do not advertise R16F and RG16F on DRM < 2.8.0
| -rw-r--r-- | src/gallium/drivers/r300/r300_screen.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c index eb1b4523533..e1f5a9fd221 100644 --- a/src/gallium/drivers/r300/r300_screen.c +++ b/src/gallium/drivers/r300/r300_screen.c @@ -328,8 +328,9 @@ static boolean r300_is_format_supported(struct pipe_screen* screen, format == PIPE_FORMAT_RGTC2_SNORM || format == PIPE_FORMAT_LATC2_UNORM || format == PIPE_FORMAT_LATC2_SNORM; - boolean is_half_float = format == PIPE_FORMAT_R16_FLOAT || - format == PIPE_FORMAT_R16G16_FLOAT || + boolean is_r16f_rg16f = format == PIPE_FORMAT_R16_FLOAT || + format == PIPE_FORMAT_R16G16_FLOAT; + boolean is_half_float = is_r16f_rg16f || format == PIPE_FORMAT_R16G16B16_FLOAT || format == PIPE_FORMAT_R16G16B16A16_FLOAT; @@ -361,6 +362,8 @@ static boolean r300_is_format_supported(struct pipe_screen* screen, (is_r500 || !is_ati1n) && /* ATI2N is supported on r4xx-r5xx. */ (is_r400 || is_r500 || !is_ati2n) && + /* R16F and RG16F texture support was added in as late as DRM 2.8.0 */ + (drm_2_8_0 || !is_r16f_rg16f) && r300_is_sampler_format_supported(format)) { retval |= PIPE_BIND_SAMPLER_VIEW; } |