diff options
| author | José Fonseca <jfonseca@vmware.com> | 2010-03-02 16:00:34 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2010-03-02 16:00:34 +0000 |
| commit | 2998cad9ce0c2c60078a28e6a0f3f3bbda3a6535 (patch) | |
| tree | 05e79ae0d434100c0136247320dd887e40da87a5 /src/gallium/drivers/r300/r300_state.c | |
| parent | faf8215bae70f020420242dc812ef141fdcf5417 (diff) | |
| parent | 8598cebf43ea4e1098dbab13b037dd1de216b8b5 (diff) | |
Merge branch 'gallium-format-cleanup'
Diffstat (limited to 'src/gallium/drivers/r300/r300_state.c')
| -rw-r--r-- | src/gallium/drivers/r300/r300_state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c index b732380a14..a983ec7b5b 100644 --- a/src/gallium/drivers/r300/r300_state.c +++ b/src/gallium/drivers/r300/r300_state.c @@ -356,7 +356,7 @@ static void r300_set_blend_color(struct pipe_context* pipe, (struct r300_blend_color_state*)r300->blend_color_state.state; union util_color uc; - util_pack_color(color->color, PIPE_FORMAT_A8R8G8B8_UNORM, &uc); + util_pack_color(color->color, PIPE_FORMAT_B8G8R8A8_UNORM, &uc); state->blend_color = uc.ui; /* XXX if FP16 blending is enabled, we should use the FP16 format */ @@ -868,7 +868,7 @@ static void* sampler->filter1 |= r300_anisotropy(state->max_anisotropy); - util_pack_color(state->border_color, PIPE_FORMAT_A8R8G8B8_UNORM, &uc); + util_pack_color(state->border_color, PIPE_FORMAT_B8G8R8A8_UNORM, &uc); sampler->border_color = uc.ui; /* R500-specific fixups and optimizations */ |