Drop GLcontext typedef and use struct gl_context instead

[mesa.git] / src / mesa / drivers / dri / i965 / brw_gs.c

diff --git a/src/mesa/drivers/dri/i965/brw_gs.c b/src/mesa/drivers/dri/i965/brw_gs.c
index 94d93f3aa65bca5a4eb962ee9de8262e94ee2e0a..ad178d84b655446142fa2493e489b366be2fa358 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_gs.c
+++ b/src/mesa/drivers/dri/i965/brw_gs.c
@@ -60,7 +60,7 @@ static void compile_gs_prog( struct brw_context *brw,
     */
    c.nr_attrs = brw_count_bits(c.key.attrs);
 
-   if (intel->gen == 5)
+   if (intel->gen >= 5)
        c.nr_regs = (c.nr_attrs + 1) / 2 + 3;  /* are vertices packed, or reg-aligned? */
    else
        c.nr_regs = (c.nr_attrs + 1) / 2 + 1;  /* are vertices packed, or reg-aligned? */
@@ -85,12 +85,19 @@ static void compile_gs_prog( struct brw_context *brw,
     */
    switch (key->primitive) {
    case GL_QUADS:
+      /* Gen6: VF has already converted into polygon. */
+      if (intel->gen == 6)
+          return;
       brw_gs_quads( &c, key );
       break;
    case GL_QUAD_STRIP:
+      if (intel->gen == 6)
+          return;
       brw_gs_quad_strip( &c, key );
       break;
    case GL_LINE_LOOP:
+      /* XXX fix GS hang issue */
+      assert(intel->gen < 6);
       brw_gs_lines( &c );
       break;
    case GL_LINES:
@@ -134,7 +141,7 @@ static void compile_gs_prog( struct brw_context *brw,
 
    /* Upload
     */
-   dri_bo_unreference(brw->gs.prog_bo);
+   drm_intel_bo_unreference(brw->gs.prog_bo);
    brw->gs.prog_bo = brw_upload_cache_with_auxdata(&brw->cache, BRW_GS_PROG,
                                                   &c.key, sizeof(c.key),
                                                   NULL, 0,
@@ -160,7 +167,7 @@ static const GLenum gs_prim[GL_POLYGON+1] = {
 static void populate_key( struct brw_context *brw,
                          struct brw_gs_prog_key *key )
 {
-   GLcontext *ctx = &brw->intel.ctx;
+   struct gl_context *ctx = &brw->intel.ctx;
    memset(key, 0, sizeof(*key));
 
    /* CACHE_NEW_VS_PROG */
@@ -201,7 +208,7 @@ static void prepare_gs_prog(struct brw_context *brw)
    }
 
    if (brw->gs.prog_active) {
-      dri_bo_unreference(brw->gs.prog_bo);
+      drm_intel_bo_unreference(brw->gs.prog_bo);
       brw->gs.prog_bo = brw_search_cache(&brw->cache, BRW_GS_PROG,
                                         &key, sizeof(key),
                                         NULL, 0,