diff options
| author | Eric Anholt <[email protected]> | 2009-12-21 14:28:18 -0800 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2010-02-25 10:53:08 -0800 |
| commit | 1489f108f4a9b53b42d3d4123da64ccdb7aafdde (patch) | |
| tree | d8bfae2b965b54ca4e3f84b639119da30a1408af | |
| parent | 591a996ab6a8ef96a46e88317071330d94c4138f (diff) | |
i965: Fix up some Sandybridge define checks for the structure rebase.
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_draw_upload.c | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c index e6bfc567af8..f0a4e8ad65d 100644 --- a/src/mesa/drivers/dri/i965/brw_draw_upload.c +++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c @@ -536,7 +536,7 @@ static void brw_emit_vertices(struct brw_context *brw) struct brw_vertex_element *input = brw->vb.enabled[i]; uint32_t dw0; - if (IS_GEN6(intel->intelScreen->deviceID)) { + if (intel->gen >= 6) { dw0 = GEN6_VB0_ACCESS_VERTEXDATA | (i << GEN6_VB0_INDEX_SHIFT); } else { @@ -549,7 +549,7 @@ static void brw_emit_vertices(struct brw_context *brw) OUT_RELOC(input->bo, I915_GEM_DOMAIN_VERTEX, 0, input->offset); - if (intel->is_ironlake) { + if (intel->is_ironlake || intel->gen >= 6) { OUT_RELOC(input->bo, I915_GEM_DOMAIN_VERTEX, 0, input->bo->size - 1); @@ -592,7 +592,7 @@ static void brw_emit_vertices(struct brw_context *brw) (0 << BRW_VE0_SRC_OFFSET_SHIFT)); } - if (intel->is_ironlake) + if (intel->is_ironlake || intel->gen >= 6) OUT_BATCH((comp0 << BRW_VE1_COMPONENT_0_SHIFT) | (comp1 << BRW_VE1_COMPONENT_1_SHIFT) | (comp2 << BRW_VE1_COMPONENT_2_SHIFT) | diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index 8af7a233851..767ad8c9d2c 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -612,6 +612,8 @@ intelInitContext(struct intel_context *intel, if (IS_GEN6(intel->intelScreen->deviceID)) { intel->gen = 6; + intel->needs_ff_sync = GL_TRUE; + intel->has_luminance_srgb = GL_TRUE; } else if (IS_965(intel->intelScreen->deviceID)) { intel->gen = 4; } else if (IS_9XX(intel->intelScreen->deviceID)) { |