X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fi915simple%2Fi915_state_emit.c;h=6558cf1c3e5bb90a5afa2f9c9375d346e88d9927;hb=16a440f326a77b0834392eebc5c56c136059b7c9;hp=6f947d434682b5ba1437d0324897fcc6b65babe4;hpb=4abe1eb980ed76d2b2d3383eaab520d0aa2ae6f4;p=mesa.git

diff --git a/src/gallium/drivers/i915simple/i915_state_emit.c b/src/gallium/drivers/i915simple/i915_state_emit.c
index 6f947d43468..6558cf1c3e5 100644
--- a/src/gallium/drivers/i915simple/i915_state_emit.c
+++ b/src/gallium/drivers/i915simple/i915_state_emit.c
@@ -211,33 +211,51 @@ i915_emit_hardware_state(struct i915_context *i915 )
       struct pipe_surface *depth_surface = i915->framebuffer.zsbuf;
 
       if (cbuf_surface) {
-	 unsigned pitch = (cbuf_surface->pitch * cbuf_surface->cpp);
+	 unsigned cpitch = cbuf_surface->stride;
+	 unsigned ctile = BUF_3D_USE_FENCE;
+         struct i915_texture *tex = (struct i915_texture *)
+                                    cbuf_surface->texture;
+         struct pipe_buffer *buffer = tex->buffer;
+         assert(tex);
+
+	 if (tex && tex->tiled) {
+	    ctile = BUF_3D_TILED_SURFACE;
+	 }
 
 	 OUT_BATCH(_3DSTATE_BUF_INFO_CMD);
 
-	 OUT_BATCH(BUF_3D_ID_COLOR_BACK | 
-		   BUF_3D_PITCH(pitch) |  /* pitch in bytes */
-		   BUF_3D_USE_FENCE);
+	 OUT_BATCH(BUF_3D_ID_COLOR_BACK |
+		   BUF_3D_PITCH(cpitch) |  /* pitch in bytes */
+		   ctile);
 
-	 OUT_RELOC(cbuf_surface->buffer,
+	 OUT_RELOC(tex->buffer,
 		   I915_BUFFER_ACCESS_WRITE,
-		   0);
+		   cbuf_surface->offset);
       }
 
       /* What happens if no zbuf??
        */
       if (depth_surface) {
-	 unsigned zpitch = (depth_surface->pitch * depth_surface->cpp);
-			 
+	 unsigned zpitch = depth_surface->stride;
+	 unsigned ztile = BUF_3D_USE_FENCE;
+         struct i915_texture *tex = (struct i915_texture *)
+                                    depth_surface->texture;
+         struct pipe_buffer *buffer = tex->buffer;
+         assert(tex);
+
+	 if (tex && tex->tiled) {
+	    ztile = BUF_3D_TILED_SURFACE;
+	 }
+
 	 OUT_BATCH(_3DSTATE_BUF_INFO_CMD);
 
 	 OUT_BATCH(BUF_3D_ID_DEPTH |
 		   BUF_3D_PITCH(zpitch) |  /* pitch in bytes */
-		   BUF_3D_USE_FENCE);
+		   ztile);
 
-	 OUT_RELOC(depth_surface->buffer,
+	 OUT_RELOC(tex->buffer,
 		   I915_BUFFER_ACCESS_WRITE,
-		   0);
+		   depth_surface->offset);
       }
    
       {
@@ -376,6 +394,7 @@ i915_emit_hardware_state(struct i915_context *i915 )
    {
       uint w, h;
       boolean k = framebuffer_size(&i915->framebuffer, &w, &h);
+      (void)k;
       assert(k);
 
       OUT_BATCH(_3DSTATE_DRAW_RECT_CMD);