diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-09-27 10:08:34 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-09-27 20:02:02 +0100 |
| commit | 9f61e43b4903c6cf0ac03a479ec9ed7b15fd6ccf (patch) | |
| tree | 8985ff4b3c47899deb7604511ac168fa76e46f63 /src/gallium/drivers/r300 | |
| parent | 0527c11d7aa42bd74f4527d7299e3c18f37c4c44 (diff) | |
| download | external_mesa3d-9f61e43b4903c6cf0ac03a479ec9ed7b15fd6ccf.zip external_mesa3d-9f61e43b4903c6cf0ac03a479ec9ed7b15fd6ccf.tar.gz external_mesa3d-9f61e43b4903c6cf0ac03a479ec9ed7b15fd6ccf.tar.bz2 | |
gallium: move border color to be a color union
EXT_texture_integer also specifies border color should be a color
union, the values are used according to the texture sampler format.
(update docs)
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/gallium/drivers/r300')
| -rw-r--r-- | src/gallium/drivers/r300/r300_state_derived.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/r300/r300_state_derived.c b/src/gallium/drivers/r300/r300_state_derived.c index 45c11fc..daeb4d71 100644 --- a/src/gallium/drivers/r300/r300_state_derived.c +++ b/src/gallium/drivers/r300/r300_state_derived.c @@ -762,7 +762,7 @@ static void r300_merge_textures_and_samplers(struct r300_context* r300) /* Set the border color. */ texstate->border_color = r300_get_border_color(view->base.format, - sampler->state.border_color, + sampler->state.border_color.f, r300->screen->caps.is_r500); /* determine min/max levels */ |