diff options
author | Eric Anholt <eric@anholt.net> | 2010-02-25 10:56:09 -0800 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2010-02-25 10:56:18 -0800 |
commit | 6a9705f41d4b6c43bc3459c69d021d0f042cd8ce (patch) | |
tree | 58288b96c8bcc3e89b9a7f9d93d466454c1aa5b9 /src/mesa/drivers/dri/intel/intel_clear.c | |
parent | b43cfa9c5eac505c0a5e82b6f3b6d57d54860045 (diff) | |
parent | 38c449409207c8948c1961a3132475bbd422f8f1 (diff) |
Merge branch 'sandybridge'
This brings in the initial code I've been working on for bringing up
OpenGL on Sandybridge in the i965 driver. It doesn't work yet.
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_clear.c')
-rw-r--r-- | src/mesa/drivers/dri/intel/intel_clear.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_clear.c b/src/mesa/drivers/dri/intel/intel_clear.c index ca78681538..03b24e2b51 100644 --- a/src/mesa/drivers/dri/intel/intel_clear.c +++ b/src/mesa/drivers/dri/intel/intel_clear.c @@ -133,6 +133,12 @@ intelClear(GLcontext *ctx, GLbitfield mask) } } + if (intel->gen >= 6) { + /* Blits are in a different ringbuffer so we don't use them. */ + tri_mask |= blit_mask; + blit_mask = 0; + } + /* SW fallback clearing */ swrast_mask = mask & ~tri_mask & ~blit_mask; |