← Back to branch summary

~ubuntu-branches/ubuntu/precise/mesa/precise-updates

« back to all changes in this revision

Viewing changes to src/mesa/drivers/dri/i915/i915_state.c

  • Committer: Package Import Robot
  • Author(s): Robert Hooker
  • Date: 2012-02-02 12:05:48 UTC
  • mfrom: (1.7.1) (3.3.27 sid)
  • Revision ID: package-import@ubuntu.com-20120202120548-nvkma85jq0h4coix
Tags: 8.0~rc2-0ubuntu4
Drop drisearchdir handling, it is no longer needed with multiarch
and dri-alternates being removed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mesa/drivers/dri/i915/i915_state.c
35
35
#include "tnl/tnl.h"
36
36
#include "tnl/t_context.h"
37
37
 
38
 
#include "texmem.h"
39
 
 
40
38
#include "drivers/common/driverfuncs.h"
41
39
 
42
40
#include "intel_fbo.h"
210
208
   dw0 = i915->state.Ctx[I915_CTXREG_LIS5];
211
209
   dw1 = i915->state.Ctx[I915_CTXREG_LIS6];
212
210
 
213
 
   if (_mesa_rgba_logicop_enabled(ctx)) {
 
211
   if (ctx->Color.ColorLogicOpEnabled) {
214
212
      dw0 |= S5_LOGICOP_ENABLE;
215
213
      dw1 &= ~S6_CBUF_BLEND_ENABLE;
216
214
   }