diff options
| author | Kenneth Graunke <[email protected]> | 2012-02-08 16:40:31 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2012-02-29 14:57:26 -0800 |
| commit | e9bcdc2c37501dc6c7dce8960ec74ccb9f8b09e8 (patch) | |
| tree | bafafbf9e090df91a8950367fc604156fc8a12ff | |
| parent | e568b00562cf38afd779560c7431a94672531e95 (diff) | |
i965: Enable the GL_ARB_draw_instanced extension.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_draw.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_extensions.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c index e919f3e5e8a..da37b181f6e 100644 --- a/src/mesa/drivers/dri/i965/brw_draw.c +++ b/src/mesa/drivers/dri/i965/brw_draw.c @@ -191,7 +191,7 @@ static void brw_emit_prim(struct brw_context *brw, vertex_access_type); OUT_BATCH(verts_per_instance); OUT_BATCH(start_vertex_location); - OUT_BATCH(1); // instance count + OUT_BATCH(prim->num_instances); OUT_BATCH(0); // start instance location OUT_BATCH(base_vertex_location); ADVANCE_BATCH(); @@ -247,7 +247,7 @@ static void gen7_emit_prim(struct brw_context *brw, OUT_BATCH(hw_prim | vertex_access_type); OUT_BATCH(verts_per_instance); OUT_BATCH(start_vertex_location); - OUT_BATCH(1); // instance count + OUT_BATCH(prim->num_instances); OUT_BATCH(0); // start instance location OUT_BATCH(base_vertex_location); ADVANCE_BATCH(); diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c index 0ce452fe0be..c4c32ffde5d 100644 --- a/src/mesa/drivers/dri/intel/intel_extensions.c +++ b/src/mesa/drivers/dri/intel/intel_extensions.c @@ -43,6 +43,7 @@ intelInitExtensions(struct gl_context *ctx) struct intel_context *intel = intel_context(ctx); ctx->Extensions.ARB_draw_elements_base_vertex = true; + ctx->Extensions.ARB_draw_instanced = true; ctx->Extensions.ARB_explicit_attrib_location = true; ctx->Extensions.ARB_framebuffer_object = true; ctx->Extensions.ARB_half_float_pixel = true; |