i915tex: Adapt to HWZ userspace interface cleanup.

Also drop private copy of its definitions.

2 files changed, 2 insertions, 32 deletions

diff --git a/src/mesa/drivers/dri/i915tex/intel_context.h b/src/mesa/drivers/dri/i915tex/intel_context.h
index cf2165b69f..263542d862 100644
--- a/src/mesa/drivers/dri/i915tex/intel_context.h
+++ b/src/mesa/drivers/dri/i915tex/intel_context.h
@@ -43,35 +43,6 @@
 
 #include "intel_debug.h"
 
-#ifndef DRM_I915_HWZ
-
-#define DRM_I915_HWZ		0x11
-
-#define DRM_I915_HWZ_ALLOC	2
-#define DRM_I915_HWZ_RENDER	3
-
-typedef struct drm_i915_hwz {
-	unsigned int op;
-	union {
-		struct drm_i915_hwz_alloc {
-			unsigned int num_buffers;
-			unsigned int num_cliprects;
-			uint64_t cliprects;
-		} alloc;
-		struct drm_i915_hwz_render {
-			unsigned int bpl_num;
-			unsigned int batch_start;
-			int DR1;
-			int DR4;
-			unsigned int static_state_offset;
-			unsigned int static_state_size;
-			unsigned int wait_flips;
-		} render;
-	} arg;
-} drm_i915_hwz_t;
-
-#endif
-
 #define DV_PF_555  (1<<8)
 #define DV_PF_565  (2<<8)
 #define DV_PF_8888 (3<<8)
diff --git a/src/mesa/drivers/dri/i915tex/intel_ioctl.c b/src/mesa/drivers/dri/i915tex/intel_ioctl.c
index 042b818076..eaaab39c22 100644
--- a/src/mesa/drivers/dri/i915tex/intel_ioctl.c
+++ b/src/mesa/drivers/dri/i915tex/intel_ioctl.c
@@ -174,7 +174,7 @@ intel_cliprect_hwz_ioctl(struct intel_context *intel,
 			 GLuint pf_current_page, 
 			 GLuint start_offset,
 			 GLuint used,
-			 GLuint state_offset,
+			 GLuint state_start,
 			 GLuint state_size )
 {
    struct intel_framebuffer *intel_fb = intel_get_fb(intel);
@@ -195,9 +195,8 @@ intel_cliprect_hwz_ioctl(struct intel_context *intel,
 
 
    hwz.op = DRM_I915_HWZ_RENDER;
-   hwz.arg.render.bpl_num = pf_current_page;
    hwz.arg.render.batch_start = start_offset;
-   hwz.arg.render.static_state_offset = state_offset;
+   hwz.arg.render.static_state_start = state_start;
    hwz.arg.render.static_state_size = state_size;
    hwz.arg.render.DR1 = 0;
    hwz.arg.render.DR4 = ((((GLuint) intel->drawX) & 0xffff) |