diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2009-12-08 19:26:20 +0100 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2009-12-08 19:26:20 +0100 |
| commit | 4ebc54795dc93f7eee200312abfa2da1b49506e3 (patch) | |
| tree | 3303b9bd235763ddfe55603f3e16d54fc41d83c5 /src/gallium/drivers/svga/svga_pipe_sampler.c | |
| parent | bc7567d9665924650c43c661d07ae9a922554bee (diff) | |
| parent | ee1720b99dfb5964962f2346406a4e3e88374a68 (diff) | |
Merge branch 'gallium-strict-aliasing'
Diffstat (limited to 'src/gallium/drivers/svga/svga_pipe_sampler.c')
| -rw-r--r-- | src/gallium/drivers/svga/svga_pipe_sampler.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/drivers/svga/svga_pipe_sampler.c b/src/gallium/drivers/svga/svga_pipe_sampler.c index b4e57c5d15..78053e755e 100644 --- a/src/gallium/drivers/svga/svga_pipe_sampler.c +++ b/src/gallium/drivers/svga/svga_pipe_sampler.c @@ -101,6 +101,7 @@ svga_create_sampler_state(struct pipe_context *pipe, { struct svga_context *svga = svga_context(pipe); struct svga_sampler_state *cso = CALLOC_STRUCT( svga_sampler_state ); + union util_color uc; cso->mipfilter = translate_mip_filter(sampler->min_mip_filter); cso->magfilter = translate_img_filter( sampler->mag_img_filter ); @@ -121,8 +122,8 @@ svga_create_sampler_state(struct pipe_context *pipe, ubyte a = float_to_ubyte(sampler->border_color[3]); util_pack_color_ub( r, g, b, a, - PIPE_FORMAT_B8G8R8A8_UNORM, - &cso->bordercolor ); + PIPE_FORMAT_B8G8R8A8_UNORM, &uc); + cso->bordercolor = uc.ui; } /* No SVGA3D support for: |