summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/i965/brw_draw.c4
-rw-r--r--src/mesa/drivers/dri/intel/intel_extensions.c1
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;