diff options
| author | Dave Airlie <[email protected]> | 2011-09-27 10:08:34 +0100 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2011-09-27 20:02:02 +0100 |
| commit | 9f61e43b4903c6cf0ac03a479ec9ed7b15fd6ccf (patch) | |
| tree | 8985ff4b3c47899deb7604511ac168fa76e46f63 /src/gallium/state_trackers | |
| parent | 0527c11d7aa42bd74f4527d7299e3c18f37c4c44 (diff) | |
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 <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers')
4 files changed, 7 insertions, 7 deletions
diff --git a/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h b/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h index 6cb19330f22..6514146e367 100644 --- a/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h +++ b/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h @@ -228,10 +228,10 @@ struct GalliumD3D10Device : public GalliumD3D10ScreenImpl<threadsafe> samplerd.wrap_r = PIPE_TEX_WRAP_CLAMP_TO_EDGE; samplerd.wrap_s = PIPE_TEX_WRAP_CLAMP_TO_EDGE; samplerd.wrap_t = PIPE_TEX_WRAP_CLAMP_TO_EDGE; - samplerd.border_color[0] = 1.0f; - samplerd.border_color[1] = 1.0f; - samplerd.border_color[2] = 1.0f; - samplerd.border_color[3] = 1.0f; + samplerd.border_color.f[0] = 1.0f; + samplerd.border_color.f[1] = 1.0f; + samplerd.border_color.f[2] = 1.0f; + samplerd.border_color.f[3] = 1.0f; samplerd.min_lod = -FLT_MAX; samplerd.max_lod = FLT_MAX; samplerd.max_anisotropy = 1; diff --git a/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_screen.h b/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_screen.h index 3674731b1e1..4405d33ea8a 100644 --- a/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_screen.h +++ b/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_screen.h @@ -553,7 +553,7 @@ struct GalliumD3D11ScreenImpl : public GalliumD3D11Screen state.wrap_t = d3d11_to_pipe_wrap[sampler_desc->AddressV]; state.wrap_r = d3d11_to_pipe_wrap[sampler_desc->AddressW]; state.lod_bias = sampler_desc->MipLODBias; - memcpy(state.border_color, sampler_desc->BorderColor, sizeof(state.border_color)); + memcpy(state.border_color.f, sampler_desc->BorderColor, sizeof(state.border_color)); state.min_lod = sampler_desc->MinLOD; state.max_lod = sampler_desc->MaxLOD; diff --git a/src/gallium/state_trackers/vega/api_filters.c b/src/gallium/state_trackers/vega/api_filters.c index 6be460c495c..af824d91bd2 100644 --- a/src/gallium/state_trackers/vega/api_filters.c +++ b/src/gallium/state_trackers/vega/api_filters.c @@ -194,7 +194,7 @@ static void execute_filter(struct vg_context *ctx, case VG_TILE_FILL: tex_wrap = PIPE_TEX_WRAP_CLAMP_TO_BORDER; /* copy border color */ - memcpy(sampler.border_color, ctx->state.vg.tile_fill_color, + memcpy(sampler.border_color.f, ctx->state.vg.tile_fill_color, sizeof(sampler.border_color)); break; case VG_TILE_PAD: diff --git a/src/gallium/state_trackers/vega/paint.c b/src/gallium/state_trackers/vega/paint.c index ea551811fcd..40b4b2502f1 100644 --- a/src/gallium/state_trackers/vega/paint.c +++ b/src/gallium/state_trackers/vega/paint.c @@ -652,7 +652,7 @@ VGint paint_bind_samplers(struct vg_paint *paint, struct pipe_sampler_state **sa } break; case VG_PAINT_TYPE_PATTERN: { - memcpy(paint->pattern.sampler.border_color, + memcpy(paint->pattern.sampler.border_color.f, ctx->state.vg.tile_fill_color, sizeof(VGfloat) * 4); paint->pattern.sampler.min_img_filter = image_sampler_filter(ctx); |