diff options
| author | Vinson Lee <vlee@vmware.com> | 2009-12-27 22:39:31 -0800 |
|---|---|---|
| committer | Vinson Lee <vlee@vmware.com> | 2009-12-27 22:39:31 -0800 |
| commit | bf63b9d7a942bfbeef0b2b765bfc346c93de6fb7 (patch) | |
| tree | 45d63c739b5d6eb77b8064ec3e91a70aef28ea58 /src/gallium/state_trackers/vega/vg_context.c | |
| parent | 9d3092d1344cac0dafaa4b39d09d987812751e40 (diff) | |
st/vega: Silence compiler warnings.
Diffstat (limited to 'src/gallium/state_trackers/vega/vg_context.c')
| -rw-r--r-- | src/gallium/state_trackers/vega/vg_context.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/gallium/state_trackers/vega/vg_context.c b/src/gallium/state_trackers/vega/vg_context.c index 571e6b67d1..00d23f5c22 100644 --- a/src/gallium/state_trackers/vega/vg_context.c +++ b/src/gallium/state_trackers/vega/vg_context.c @@ -232,10 +232,7 @@ static void update_clip_state(struct vg_context *ctx) struct pipe_blend_state *blend = &ctx->state.g3d.blend; struct pipe_framebuffer_state *fb = &ctx->state.g3d.fb; int i; -<<<<<<< HEAD:src/gallium/state_trackers/vega/vg_context.c -======= ->>>>>>> mesa_7_6_branch:src/gallium/state_trackers/vega/vg_context.c dsa->depth.writemask = 1;/*glDepthMask(TRUE);*/ dsa->depth.func = PIPE_FUNC_ALWAYS; dsa->depth.enabled = 1; |