summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i915
diff options
context:
space:
mode:
authorKurt Roeckx <[email protected]>2012-03-02 15:34:45 -0800
committerEric Anholt <[email protected]>2012-03-02 17:16:13 -0800
commit024ece7523f1735d2fca0067c0a3bdcf53fde8f9 (patch)
tree951cdbdf68ac5647f462377313006fd1cbcce0ac /src/mesa/drivers/dri/i915
parent33b07893e92dcee495908c549be872887096c894 (diff)
i915: Compute maximum number of verts using the actual batchbuffer size.
We were looking at the size of batch.map for how big the batchbuffer was, but on 865 we just use a single-page batchbuffer due to hardware limits. v2: Removed check for sizeof map < bo->size, since that's always false. [change by anholt] NOTE: This is a candidate for release branches. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=41495
Diffstat (limited to 'src/mesa/drivers/dri/i915')
-rw-r--r--src/mesa/drivers/dri/i915/intel_render.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_render.c b/src/mesa/drivers/dri/i915/intel_render.c
index a4041bea9ba..6afd7388e1e 100644
--- a/src/mesa/drivers/dri/i915/intel_render.c
+++ b/src/mesa/drivers/dri/i915/intel_render.c
@@ -125,9 +125,9 @@ static INLINE GLuint intel_get_vb_max(struct intel_context *intel)
{
GLuint ret;
- if (intel->intelScreen->no_vbo)
- ret = sizeof(intel->batch.map) - INTEL_NO_VBO_STATE_RESERVED;
- else
+ if (intel->intelScreen->no_vbo) {
+ ret = intel->batch.bo->size - INTEL_NO_VBO_STATE_RESERVED;
+ } else
ret = INTEL_VB_SIZE;
ret /= (intel->vertex_size * 4);
return ret;