drm/i965: Merge the constants into the surface stream.

As we can use an offset from the surface base for the constant buffers,
we need to fold the constants into the surface stream.

1 files changed, 3 insertions, 8 deletions

diff --git a/src/drm/cairo-drm-i965-private.h b/src/drm/cairo-drm-i965-private.h
index 84c7134b..e13ea78b 100644
--- a/src/drm/cairo-drm-i965-private.h
+++ b/src/drm/cairo-drm-i965-private.h
@@ -339,9 +339,8 @@ struct i965_stream {
 };
 
 #define I965_BATCH_SIZE (16 * 4096)
-#define I965_SURFACE_SIZE (16 * 4096)
 #define I965_GENERAL_SIZE (16 * 4096)
-#define I965_CONSTANT_SIZE (16 * 4096)
+#define I965_SURFACE_SIZE (32 * 4096)
 #define I965_VERTEX_SIZE (128 * 4096)
 
 #define I965_TILING_DEFAULT I915_TILING_Y
@@ -402,12 +401,12 @@ struct i965_device {
 
     i965_stream_t batch;
     uint8_t batch_base[I965_BATCH_SIZE];
-    struct drm_i915_gem_relocation_entry batch_relocations[1024];
+    struct drm_i915_gem_relocation_entry batch_relocations[2048];
 
     i965_stream_t surface;
     uint8_t surface_base[I965_SURFACE_SIZE];
     struct i965_pending_relocation surface_pending_relocations[1];
-    struct drm_i915_gem_relocation_entry surface_relocations[512];
+    struct drm_i915_gem_relocation_entry surface_relocations[1024];
 
     i965_stream_t general;
     uint8_t general_base[I965_GENERAL_SIZE];
@@ -417,10 +416,6 @@ struct i965_device {
     uint8_t vertex_base[I965_VERTEX_SIZE];
     struct i965_pending_relocation vertex_pending_relocations[512];
 
-    i965_stream_t constant;
-    uint8_t constant_base[I965_CONSTANT_SIZE];
-    struct i965_pending_relocation constant_pending_relocations[512];
-
     struct {
 	size_t gtt_size;