diff options
| author | Marek Olšák <[email protected]> | 2013-02-01 21:09:31 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-02-06 14:31:23 +0100 |
| commit | 499f7de12e3484f75d30dd314b00c76cb37d8d9f (patch) | |
| tree | 53e724cb5d029365ecc2d322041ff930aa79931b /src/gallium/drivers/r300/r300_texture.c | |
| parent | f40a7fc34a601195191b1b2ffef55818a4086d5f (diff) | |
r300g: fix blending with RGBX formats
Change DST_ALPHA to ONE.
Diffstat (limited to 'src/gallium/drivers/r300/r300_texture.c')
| -rw-r--r-- | src/gallium/drivers/r300/r300_texture.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/gallium/drivers/r300/r300_texture.c b/src/gallium/drivers/r300/r300_texture.c index 327dbac700b..b33c2f37a42 100644 --- a/src/gallium/drivers/r300/r300_texture.c +++ b/src/gallium/drivers/r300/r300_texture.c @@ -742,24 +742,28 @@ static uint32_t r300_translate_colormask_swizzle(enum pipe_format format) case PIPE_FORMAT_R32G32_FLOAT: return COLORMASK_GRRG; + case PIPE_FORMAT_B5G5R5X1_UNORM: + case PIPE_FORMAT_B4G4R4X4_UNORM: + case PIPE_FORMAT_B8G8R8X8_UNORM: + /*case PIPE_FORMAT_B8G8R8X8_SNORM:*/ + return COLORMASK_BGRX; + case PIPE_FORMAT_B5G6R5_UNORM: case PIPE_FORMAT_B5G5R5A1_UNORM: - case PIPE_FORMAT_B5G5R5X1_UNORM: case PIPE_FORMAT_B4G4R4A4_UNORM: - case PIPE_FORMAT_B4G4R4X4_UNORM: case PIPE_FORMAT_B8G8R8A8_UNORM: /*case PIPE_FORMAT_B8G8R8A8_SNORM:*/ - case PIPE_FORMAT_B8G8R8X8_UNORM: - /*case PIPE_FORMAT_B8G8R8X8_SNORM:*/ case PIPE_FORMAT_B10G10R10A2_UNORM: return COLORMASK_BGRA; case PIPE_FORMAT_R8G8B8X8_UNORM: /*case PIPE_FORMAT_R8G8B8X8_SNORM:*/ + case PIPE_FORMAT_R10G10B10X2_SNORM: + return COLORMASK_RGBX; + case PIPE_FORMAT_R8G8B8A8_UNORM: case PIPE_FORMAT_R8G8B8A8_SNORM: case PIPE_FORMAT_R10G10B10A2_UNORM: - case PIPE_FORMAT_R10G10B10X2_SNORM: case PIPE_FORMAT_R16_UNORM: case PIPE_FORMAT_R16G16B16A16_UNORM: case PIPE_FORMAT_R16_SNORM: |