Merge remote branch 'origin/master' into lp-setup-llvm

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

diff --git a/src/mesa/drivers/dri/i965/gen6_depthstencil.c b/src/mesa/drivers/dri/i965/gen6_depthstencil.c
index 4924f0fd5592981da19e2acddd0a7e42c824ce49..96e6eade6b73127b52580b5e94dad144eb52848d 100644 (file)
--- a/src/mesa/drivers/dri/i965/gen6_depthstencil.c
+++ b/src/mesa/drivers/dri/i965/gen6_depthstencil.c
@@ -41,7 +41,7 @@ static void
 depth_stencil_state_populate_key(struct brw_context *brw,
                                 struct brw_depth_stencil_state_key *key)
 {
-   GLcontext *ctx = &brw->intel.ctx;
+   struct gl_context *ctx = &brw->intel.ctx;
    const unsigned back = ctx->Stencil._BackFace;
 
    memset(key, 0, sizeof(*key));
@@ -77,12 +77,12 @@ depth_stencil_state_populate_key(struct brw_context *brw,
 /**
  * Creates the state cache entry for the given DEPTH_STENCIL_STATE state key.
  */
-static dri_bo *
+static drm_intel_bo *
 depth_stencil_state_create_from_key(struct brw_context *brw,
                                    struct brw_depth_stencil_state_key *key)
 {
    struct gen6_depth_stencil_state ds;
-   dri_bo *bo;
+   drm_intel_bo *bo;
 
    memset(&ds, 0, sizeof(ds));
 
@@ -143,7 +143,7 @@ prepare_depth_stencil_state(struct brw_context *brw)
 
    depth_stencil_state_populate_key(brw, &key);
 
-   dri_bo_unreference(brw->cc.depth_stencil_state_bo);
+   drm_intel_bo_unreference(brw->cc.depth_stencil_state_bo);
    brw->cc.depth_stencil_state_bo = brw_search_cache(&brw->cache,
                                                     BRW_DEPTH_STENCIL_STATE,
                                                     &key, sizeof(key),