[965] Remove AUB file support.
authorEric Anholt <eric@anholt.net>
Wed, 26 Sep 2007 20:57:08 +0000 (13:57 -0700)
committerEric Anholt <eric@anholt.net>
Thu, 27 Sep 2007 17:16:08 +0000 (10:16 -0700)
This code existed to dump logs of hardware access to be replayed in simulation.
Since we have real hardware now, it's not really needed.

23 files changed:
src/mesa/drivers/dri/i965/Makefile
src/mesa/drivers/dri/i965/brw_aub.c [deleted file]
src/mesa/drivers/dri/i965/brw_aub.h [deleted file]
src/mesa/drivers/dri/i965/brw_aub_playback.c [deleted file]
src/mesa/drivers/dri/i965/brw_context.c
src/mesa/drivers/dri/i965/brw_context.h
src/mesa/drivers/dri/i965/brw_curbe.c
src/mesa/drivers/dri/i965/brw_draw.c
src/mesa/drivers/dri/i965/brw_draw_upload.c
src/mesa/drivers/dri/i965/brw_program.c
src/mesa/drivers/dri/i965/brw_state_batch.c
src/mesa/drivers/dri/i965/brw_state_cache.c
src/mesa/drivers/dri/i965/brw_state_pool.c
src/mesa/drivers/dri/i965/brw_vtbl.c
src/mesa/drivers/dri/i965/bufmgr.h
src/mesa/drivers/dri/i965/bufmgr_fake.c
src/mesa/drivers/dri/i965/intel_batchbuffer.c
src/mesa/drivers/dri/i965/intel_buffer_objects.c
src/mesa/drivers/dri/i965/intel_buffers.c
src/mesa/drivers/dri/i965/intel_context.c
src/mesa/drivers/dri/i965/intel_context.h
src/mesa/drivers/dri/i965/intel_ioctl.c
src/mesa/drivers/dri/i965/intel_regions.c

index 15a6752e0ff5e923b9d232295784f05ffb6ef6aa..5748d7ff05ed33e27deac7b4168fc597937a45dc 100644 (file)
@@ -22,8 +22,6 @@ DRIVER_SOURCES = \
        intel_tex.c \
        intel_tex_layout.c \
        intel_tex_validate.c \
-       brw_aub.c \
-       brw_aub_playback.c \
        brw_cc.c \
        brw_clip.c \
        brw_clip_line.c \
diff --git a/src/mesa/drivers/dri/i965/brw_aub.c b/src/mesa/drivers/dri/i965/brw_aub.c
deleted file mode 100644 (file)
index c549f7a..0000000
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- Copyright (C) Intel Corp.  2006.  All Rights Reserved.
- Intel funded Tungsten Graphics (http://www.tungstengraphics.com) to
- develop this 3D driver.
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- The above copyright notice and this permission notice (including the
- next paragraph) shall be included in all copies or substantial
- portions of the Software.
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- **********************************************************************/
- /*
-  * Authors:
-  *   Keith Whitwell <keith@tungstengraphics.com>
-  */
-
-#include "brw_context.h"
-#include "brw_aub.h"
-#include "intel_regions.h"
-#include <stdio.h>
-
-extern char *__progname;
-
-
-/* Registers to control page table
- */
-#define PGETBL_CTL       0x2020
-#define PGETBL_ENABLED   0x1
-
-#define NR_GTT_ENTRIES  65536  /* 256 mb */
-
-#define FAIL                                                                           \
-do {                                                                                   \
-   fprintf(stderr, "failed to write aub data at %s/%d\n", __FUNCTION__, __LINE__);     \
-   exit(1);                                                                            \
-} while (0)
-
-
-/* Emit the headers at the top of each aubfile.  Initialize the GTT.
- */
-static void init_aubfile( FILE *aub_file )
-{   
-   struct aub_file_header fh;
-   struct aub_block_header bh;
-   unsigned int data;
-
-   static int nr;
-   
-   nr++;
-
-   /* Emit the aub header:
-    */
-   memset(&fh, 0, sizeof(fh));
-
-   fh.instruction_type = AUB_FILE_HEADER;
-   fh.minor = 0x0;
-   fh.major = 0x7;
-   memcpy(fh.application, __progname, sizeof(fh.application));
-   fh.day = (nr>>24) & 0xff;
-   fh.month = 0x0;
-   fh.year = 0x0;
-   fh.timezone = 0x0;
-   fh.second = nr & 0xff;
-   fh.minute = (nr>>8) & 0xff;
-   fh.hour = (nr>>16) & 0xff;
-   fh.comment_length = 0x0;   
-
-   if (fwrite(&fh, sizeof(fh), 1, aub_file) < 1) 
-      FAIL;
-         
-   /* Setup the GTT starting at main memory address zero (!):
-    */
-   memset(&bh, 0, sizeof(bh));
-   
-   bh.instruction_type = AUB_BLOCK_HEADER;
-   bh.operation = BH_MMI0_WRITE32;
-   bh.type = 0x0;
-   bh.address_space = ADDR_GTT;        /* ??? */
-   bh.general_state_type = 0x0;
-   bh.surface_state_type = 0x0;
-   bh.address = PGETBL_CTL;
-   bh.length = 0x4;
-
-   if (fwrite(&bh, sizeof(bh), 1, aub_file) < 1) 
-      FAIL;
-
-   data = 0x0 | PGETBL_ENABLED;
-
-   if (fwrite(&data, sizeof(data), 1, aub_file) < 1) 
-      FAIL;
-}
-
-
-static void init_aub_gtt( struct brw_context *brw,
-                         GLuint start_offset, 
-                         GLuint size )
-{
-   FILE *aub_file = brw->intel.aub_file;
-   struct aub_block_header bh;
-   unsigned int i;
-
-   assert(start_offset + size < NR_GTT_ENTRIES * 4096);
-
-
-   memset(&bh, 0, sizeof(bh));
-   
-   bh.instruction_type = AUB_BLOCK_HEADER;
-   bh.operation = BH_DATA_WRITE;
-   bh.type = 0x0;
-   bh.address_space = ADDR_MAIN;
-   bh.general_state_type = 0x0;
-   bh.surface_state_type = 0x0;
-   bh.address =  start_offset / 4096 * 4;
-   bh.length = size / 4096 * 4;
-
-   if (fwrite(&bh, sizeof(bh), 1, aub_file) < 1) 
-      FAIL;
-
-   for (i = 0; i < size / 4096; i++) {
-      GLuint data = brw->next_free_page | 1;
-
-      brw->next_free_page += 4096;
-
-      if (fwrite(&data, sizeof(data), 1, aub_file) < 1) 
-        FAIL;
-   }
-
-}
-
-static void write_block_header( FILE *aub_file,
-                               struct aub_block_header *bh,
-                               const GLuint *data,
-                               GLuint sz )
-{
-   sz = (sz + 3) & ~3;
-
-   if (fwrite(bh, sizeof(*bh), 1, aub_file) < 1) 
-      FAIL;
-
-   if (fwrite(data, sz, 1, aub_file) < 1) 
-      FAIL;
-
-   fflush(aub_file);
-}
-
-
-static void write_dump_bmp( FILE *aub_file,
-                           struct aub_dump_bmp *db )
-{
-   if (fwrite(db, sizeof(*db), 1, aub_file) < 1) 
-      FAIL;
-
-   fflush(aub_file);
-}
-
-
-
-static void brw_aub_gtt_data( struct intel_context *intel,
-                             GLuint offset,
-                             const void *data,
-                             GLuint sz,
-                             GLuint type,
-                             GLuint state_type )
-{
-   struct aub_block_header bh;
-
-   bh.instruction_type = AUB_BLOCK_HEADER;
-   bh.operation = BH_DATA_WRITE;
-   bh.type = type;
-   bh.address_space = ADDR_GTT;
-   bh.pad0 = 0;
-
-   if (type == DW_GENERAL_STATE) {
-      bh.general_state_type = state_type;
-      bh.surface_state_type = 0;
-   }
-   else {
-      bh.general_state_type = 0;
-      bh.surface_state_type = state_type;
-   }
-
-   bh.pad1 = 0;
-   bh.address = offset;
-   bh.length = sz;
-
-   write_block_header(intel->aub_file, &bh, data, sz);
-}
-
-
-
-static void brw_aub_gtt_cmds( struct intel_context *intel,
-                             GLuint offset,
-                             const void *data,
-                             GLuint sz )
-{
-   struct brw_context *brw = brw_context(&intel->ctx);
-   struct aub_block_header bh;   
-   GLuint type = CW_PRIMARY_RING_A;
-   
-
-   bh.instruction_type = AUB_BLOCK_HEADER;
-   bh.operation = BH_COMMAND_WRITE;
-   bh.type = type;
-   bh.address_space = ADDR_GTT;
-   bh.pad0 = 0;
-   bh.general_state_type = 0;
-   bh.surface_state_type = 0;
-   bh.pad1 = 0;
-   bh.address = offset;
-   bh.length = sz;
-
-   write_block_header(brw->intel.aub_file, &bh, data, sz);
-}
-
-static void brw_aub_dump_bmp( struct intel_context *intel,
-                             GLuint buffer )
-{
-   struct brw_context *brw = brw_context(&intel->ctx);
-   intelScreenPrivate *intelScreen = brw->intel.intelScreen;
-   struct aub_dump_bmp db;
-   GLuint format;
-
-   if (intelScreen->cpp == 4)
-      format = 0x7;
-   else
-      format = 0x3;
-
-
-   if (buffer == 0) {
-      db.instruction_type = AUB_DUMP_BMP;
-      db.xmin = 0;
-      db.ymin = 0;
-      db.format = format;
-      db.bpp = intelScreen->cpp * 8;
-      db.pitch = intelScreen->front.pitch / intelScreen->cpp;
-      db.xsize = intelScreen->width;
-      db.ysize = intelScreen->height;
-      db.addr = intelScreen->front.offset;
-      db.unknown = 0x0;                /* 4: xmajor tiled, 0: not tiled */
-
-      write_dump_bmp(brw->intel.aub_file, &db);
-   }
-   else {
-      db.instruction_type = AUB_DUMP_BMP;
-      db.xmin = 0;
-      db.ymin = 0;
-      db.format = format;
-      db.bpp = intel->back_region->cpp * 8;
-      db.pitch = intel->back_region->pitch;
-      db.xsize = intel->back_region->pitch;
-      db.ysize = intel->back_region->height;
-      db.addr = intelScreen->back.offset;
-      db.unknown = intel->back_region->tiled ? 0x4 : 0x0;
-
-      write_dump_bmp(brw->intel.aub_file, &db);
-   }
-}
-
-/* Attempt to prevent monster aubfiles by closing and reopening when
- * the state pools wrap.
- */
-static void brw_aub_wrap( struct intel_context *intel )
-{
-   struct brw_context *brw = brw_context(&intel->ctx);   
-   if (intel->aub_file) {
-      brw_aub_destroy(brw);
-      brw_aub_init(brw);
-   }
-   brw->wrap = 1;              /* ??? */
-}
-
-
-int brw_aub_init( struct brw_context *brw )
-{
-   struct intel_context *intel = &brw->intel;
-   intelScreenPrivate *intelScreen = intel->intelScreen;
-   char filename[80];
-   int val;
-   static int i = 0;
-
-   i++;
-
-   if (_mesa_getenv("INTEL_REPLAY"))
-      return 0;
-
-   if (_mesa_getenv("INTEL_AUBFILE")) {
-      val = snprintf(filename, sizeof(filename), "%s%d.aub", _mesa_getenv("INTEL_AUBFILE"), i%4);
-      _mesa_printf("--> Aub file: %s\n", filename);
-      brw->intel.aub_file = fopen(filename, "w");
-   }
-   else if (_mesa_getenv("INTEL_AUB")) {
-      val = snprintf(filename, sizeof(filename), "%s.aub", __progname);
-      if (val < 0 || val > sizeof(filename)) 
-        strcpy(filename, "default.aub");   
-   
-      _mesa_printf("--> Aub file: %s\n", filename);
-      brw->intel.aub_file = fopen(filename, "w");
-   }
-   else {
-      return 0;
-   }
-
-   if (!brw->intel.aub_file) {
-      _mesa_printf("couldn't open aubfile\n");
-      exit(1);
-   }
-
-   brw->intel.vtbl.aub_commands = brw_aub_gtt_cmds;
-   brw->intel.vtbl.aub_dump_bmp = brw_aub_dump_bmp;
-   brw->intel.vtbl.aub_gtt_data = brw_aub_gtt_data;
-   brw->intel.vtbl.aub_wrap = brw_aub_wrap;
-   
-   init_aubfile(brw->intel.aub_file);
-
-   /* The GTT is located starting address zero in main memory.  Pages
-    * to populate the gtt start after this point.
-    */
-   brw->next_free_page = (NR_GTT_ENTRIES * 4 + 4095) & ~4095;
-
-   /* More or less correspond with all the agp regions mapped by the
-    * driver:
-    */
-   init_aub_gtt(brw, 0, 4096*4); /* so new fulsim doesn't crash */
-   init_aub_gtt(brw, intelScreen->front.offset, intelScreen->back.size);
-   init_aub_gtt(brw, intelScreen->back.offset, intelScreen->back.size);
-   init_aub_gtt(brw, intelScreen->depth.offset, intelScreen->back.size);
-   init_aub_gtt(brw, intelScreen->tex.offset, intelScreen->tex.size);
-
-   return 0;
-}
-
-void brw_aub_destroy( struct brw_context *brw )
-{
-   if (brw->intel.aub_file) {
-      fclose(brw->intel.aub_file);
-      brw->intel.aub_file = NULL;
-   }
-}
diff --git a/src/mesa/drivers/dri/i965/brw_aub.h b/src/mesa/drivers/dri/i965/brw_aub.h
deleted file mode 100644 (file)
index 198e36d..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- Copyright (C) Intel Corp.  2006.  All Rights Reserved.
- Intel funded Tungsten Graphics (http://www.tungstengraphics.com) to
- develop this 3D driver.
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- The above copyright notice and this permission notice (including the
- next paragraph) shall be included in all copies or substantial
- portions of the Software.
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- **********************************************************************/
- /*
-  * Authors:
-  *   Keith Whitwell <keith@tungstengraphics.com>
-  */
-
-#ifndef BRW_AUB_H
-#define BRW_AUB_H
-
-struct aub_file_header {
-   unsigned int instruction_type;
-   unsigned int pad0:16;
-   unsigned int minor:8;
-   unsigned int major:8;
-   unsigned char application[8*4];
-   unsigned int day:8;
-   unsigned int month:8;
-   unsigned int year:16;
-   unsigned int timezone:8;
-   unsigned int second:8;
-   unsigned int minute:8;
-   unsigned int hour:8;
-   unsigned int comment_length:16;   
-   unsigned int pad1:16;
-};
-
-struct aub_block_header {
-   unsigned int instruction_type;
-   unsigned int operation:8;
-   unsigned int type:8;
-   unsigned int address_space:8;
-   unsigned int pad0:8;
-   unsigned int general_state_type:8;
-   unsigned int surface_state_type:8;
-   unsigned int pad1:16;
-   unsigned int address;
-   unsigned int length;
-};
-
-struct aub_dump_bmp {
-   unsigned int instruction_type;
-   unsigned int xmin:16;
-   unsigned int ymin:16;
-   unsigned int pitch:16;
-   unsigned int bpp:8;
-   unsigned int format:8;
-   unsigned int xsize:16;
-   unsigned int ysize:16;
-   unsigned int addr;
-   unsigned int unknown;
-};
-
-enum bh_operation {
-   BH_COMMENT,
-   BH_DATA_WRITE,
-   BH_COMMAND_WRITE,
-   BH_MMI0_WRITE32,
-   BH_END_SCENE,
-   BH_CONFIG_MEMORY_MAP,
-   BH_MAX_OPERATION
-};
-
-enum command_write_type {
-   CW_HWB_RING = 1,
-   CW_PRIMARY_RING_A,
-   CW_PRIMARY_RING_B,          /* XXX - disagreement with listaub! */
-   CW_PRIMARY_RING_C,
-   CW_MAX_TYPE
-};
-
-enum data_write_type {
-   DW_NOTYPE,
-   DW_BATCH_BUFFER,
-   DW_BIN_BUFFER,
-   DW_BIN_POINTER_LIST,
-   DW_SLOW_STATE_BUFFER,
-   DW_VERTEX_BUFFER,
-   DW_2D_MAP,
-   DW_CUBE_MAP,
-   DW_INDIRECT_STATE_BUFFER,
-   DW_VOLUME_MAP,
-   DW_1D_MAP,
-   DW_CONSTANT_BUFFER,
-   DW_CONSTANT_URB_ENTRY,
-   DW_INDEX_BUFFER,
-   DW_GENERAL_STATE,
-   DW_SURFACE_STATE,
-   DW_MEDIA_OBJECT_INDIRECT_DATA,
-   DW_MAX_TYPE
-};
-
-enum data_write_general_state_type {
-   DWGS_NOTYPE,
-   DWGS_VERTEX_SHADER_STATE,
-   DWGS_GEOMETRY_SHADER_STATE ,
-   DWGS_CLIPPER_STATE,
-   DWGS_STRIPS_FANS_STATE,
-   DWGS_WINDOWER_IZ_STATE,
-   DWGS_COLOR_CALC_STATE,
-   DWGS_CLIPPER_VIEWPORT_STATE,        /* was 0x7 */
-   DWGS_STRIPS_FANS_VIEWPORT_STATE,
-   DWGS_COLOR_CALC_VIEWPORT_STATE, /* was 0x9 */
-   DWGS_SAMPLER_STATE,
-   DWGS_KERNEL_INSTRUCTIONS,
-   DWGS_SCRATCH_SPACE,
-   DWGS_SAMPLER_DEFAULT_COLOR,
-   DWGS_INTERFACE_DESCRIPTOR,
-   DWGS_VLD_STATE,
-   DWGS_VFE_STATE,
-   DWGS_MAX_TYPE
-};
-
-enum data_write_surface_state_type {
-   DWSS_NOTYPE,
-   DWSS_BINDING_TABLE_STATE,
-   DWSS_SURFACE_STATE,
-   DWSS_MAX_TYPE
-};
-
-enum memory_map_type {
-   MM_DEFAULT,
-   MM_DYNAMIC,
-   MM_MAX_TYPE
-};
-
-enum address_space {
-   ADDR_GTT,
-   ADDR_LOCAL,
-   ADDR_MAIN,
-   ADDR_MAX
-};
-
-
-#define AUB_FILE_HEADER 0xe085000b
-#define AUB_BLOCK_HEADER 0xe0c10003
-#define AUB_DUMP_BMP 0xe09e0004
-
-struct brw_context;
-struct intel_context;
-
-int brw_aub_init( struct brw_context *brw );
-void brw_aub_destroy( struct brw_context *brw );
-
-int brw_playback_aubfile(struct brw_context *brw,
-                        const char *filename);
-
-#endif
diff --git a/src/mesa/drivers/dri/i965/brw_aub_playback.c b/src/mesa/drivers/dri/i965/brw_aub_playback.c
deleted file mode 100644 (file)
index 2433d50..0000000
+++ /dev/null
@@ -1,443 +0,0 @@
-
-#include <stdio.h>
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#include "brw_aub.h"
-#include "brw_defines.h"
-#include "brw_context.h"
-#include "intel_ioctl.h"
-#include "bufmgr.h"
-
-struct aub_state {
-   struct intel_context *intel;
-   const char *map;
-   unsigned int csr;
-   unsigned int sz;
-};
-
-
-static int gobble( struct aub_state *s, int size )
-{
-   if (s->csr + size > s->sz) {
-      _mesa_printf("EOF in %s\n", __FUNCTION__);
-      return 1;
-   }
-
-   s->csr += size;
-   return 0;
-}
-
-static void flush_and_fence( struct aub_state *s )
-{
-   struct intel_context *intel = s->intel;
-   GLuint buf[2];
-
-   buf[0] = intel->vtbl.flush_cmd();
-   buf[1] = 0;
-
-   intel_cmd_ioctl(intel, (char *)&buf, sizeof(buf));
-      
-   intelWaitIrq( intel, intelEmitIrqLocked( intel ));
-}
-
-static void flush_cmds( struct aub_state *s,
-                       const void *data,
-                       int len )
-{
-   DBG("%s %d\n", __FUNCTION__, len);
-
-   if (len & 0x4) {
-      unsigned int *tmp = malloc(len + 4);
-      DBG("padding to octword\n");
-      memcpy(tmp, data, len);
-      tmp[len/4] = MI_NOOP;
-      flush_cmds(s, tmp, len+4);
-      free(tmp);
-      return;
-   }
-
-   /* For ring data, just send off immediately via an ioctl.
-    * This differs slightly from how the stream was executed
-    * initially as this would have been a batchbuffer.
-    */
-   intel_cmd_ioctl(s->intel, (void *)data, len);
-
-   if (1)
-      flush_and_fence(s);
-}
-
-static const char *pstrings[] = {
-   "none",
-   "POINTLIST",
-   "LINELIST",
-   "LINESTRIP",
-   "TRILIST",
-   "TRISTRIP",
-   "TRIFAN",
-   "QUADLIST",
-   "QUADSTRIP",
-   "LINELIST_ADJ",
-   "LINESTRIP_ADJ",
-   "TRILIST_ADJ",
-   "TRISTRIP_ADJ",
-   "TRISTRIP_REVERSE",
-   "POLYGON",
-   "RECTLIST",
-   "LINELOOP",
-   "POINTLIST_BF",
-   "LINESTRIP_CONT",
-   "LINESTRIP_BF",
-   "LINESTRIP_CONT_BF",
-   "TRIFAN_NOSTIPPLE",
-};
-
-static void do_3d_prim( struct aub_state *s,
-                       const void *data,
-                       int len )
-{
-   struct brw_3d_primitive prim;
-   const struct brw_3d_primitive *orig = data;
-   int i;
-
-   assert(len == sizeof(prim));
-   memcpy(&prim, data, sizeof(prim));
-
-#define START 0
-#define BLOCK (12*28)
-
-   if (orig->verts_per_instance < BLOCK)
-      flush_cmds(s, &prim, sizeof(prim));
-   else {
-      for (i = START; i + BLOCK < orig->verts_per_instance; i += BLOCK/2) {
-        prim.start_vert_location = i;
-        prim.verts_per_instance = BLOCK;
-        _mesa_printf("%sprim %d/%s verts %d..%d (of %d)\n", 
-                     prim.header.indexed ? "INDEXED " : "",
-                     prim.header.topology, pstrings[prim.header.topology%16],
-                     prim.start_vert_location, 
-                     prim.start_vert_location + prim.verts_per_instance,
-                     orig->verts_per_instance);
-        flush_cmds(s, &prim, sizeof(prim));
-      }
-   }
-}
-
-
-
-static struct {
-   int cmd;
-   const char *name;
-   int has_length;
-} cmd_info[] = {
-   { 0, "NOOP", 0 },
-   { 0x5410, "XY_COLOR_BLT_RGB", 1 },
-   { 0x5430, "XY_COLOR_BLT_RGBA", 1 },
-   { 0x54d0, "XY_SRC_COPY_BLT_RGB", 1 },
-   { 0x54f0, "XY_SRC_COPY_BLT_RGBA", 1 },
-   { CMD_URB_FENCE, "URB_FENCE",  1 },
-   { CMD_CONST_BUFFER_STATE, "CONST_BUFFER_STATE",  1 },
-   { CMD_CONST_BUFFER, "CONST_BUFFER",  1 },
-   { CMD_STATE_BASE_ADDRESS, "STATE_BASE_ADDRESS",  1 },
-   { CMD_STATE_INSN_POINTER, "STATE_INSN_POINTER",  1 },
-   { CMD_PIPELINE_SELECT, "PIPELINE_SELECT", 0, },
-   { CMD_PIPELINED_STATE_POINTERS, "PIPELINED_STATE_POINTERS", 1 },
-   { CMD_BINDING_TABLE_PTRS, "BINDING_TABLE_PTRS", 1 },
-   { CMD_VERTEX_BUFFER, "VERTEX_BUFFER", 1 },
-   { CMD_VERTEX_ELEMENT, "VERTEX_ELEMENT", 1 },
-   { CMD_INDEX_BUFFER, "INDEX_BUFFER", 1 },
-   { CMD_VF_STATISTICS, "VF_STATISTICS", 0 },
-   { CMD_DRAW_RECT, "DRAW_RECT", 1 },
-   { CMD_BLEND_CONSTANT_COLOR, "BLEND_CONSTANT_COLOR", 1 },
-   { CMD_CHROMA_KEY, "CHROMA_KEY", 1 },
-   { CMD_DEPTH_BUFFER, "DEPTH_BUFFER", 1 },
-   { CMD_POLY_STIPPLE_OFFSET, "POLY_STIPPLE_OFFSET", 1 },
-   { CMD_POLY_STIPPLE_PATTERN, "POLY_STIPPLE_PATTERN", 1 },
-   { CMD_LINE_STIPPLE_PATTERN, "LINE_STIPPLE_PATTERN", 1 },
-   { CMD_GLOBAL_DEPTH_OFFSET_CLAMP, "GLOBAL_DEPTH_OFFSET_CLAMP", 1 },
-   { CMD_PIPE_CONTROL, "PIPE_CONTROL", 1 },
-   { CMD_MI_FLUSH, "MI_FLUSH", 0 },
-   { CMD_3D_PRIM, "3D_PRIM", 1 },
-};
-
-#define NR_CMDS (sizeof(cmd_info)/sizeof(cmd_info[0]))
-
-
-static int find_command( unsigned int cmd )
-{
-   int i;
-
-   for (i = 0; i < NR_CMDS; i++) 
-      if (cmd == cmd_info[i].cmd) 
-        return i;
-
-   return -1;
-}
-
-
-
-static int parse_commands( struct aub_state *s,
-                          const unsigned int *data,
-                          int len )
-{
-   while (len) {
-      int cmd = data[0] >> 16;
-      int dwords;
-      int i;
-
-      i = find_command(cmd);
-
-      if (i < 0) {
-        _mesa_printf("couldn't find info for cmd %x\n", cmd);
-        return 1;
-      }
-
-      if (cmd_info[i].has_length)
-        dwords = (data[0] & 0xff) + 2;
-      else
-        dwords = 1;
-
-      _mesa_printf("%s (%d dwords) 0x%x\n", cmd_info[i].name, dwords, data[0]);
-
-      if (len < dwords * 4) {
-        _mesa_printf("EOF in %s (%d bytes)\n", __FUNCTION__, len);
-        return 1;
-      }
-
-
-      if (0 && cmd == CMD_3D_PRIM)
-        do_3d_prim(s, data, dwords * 4);
-      else
-        flush_cmds(s, data, dwords * 4);
-
-      data += dwords;
-      len -= dwords * 4;
-   }
-
-   return 0;
-}
-
-
-
-static void parse_data_write( struct aub_state *s,
-                            const struct aub_block_header *bh,
-                            void *dest,
-                            const unsigned int *data,
-                            int len )
-{
-   switch (bh->type) {
-   case DW_GENERAL_STATE:
-      switch (bh->general_state_type) {
-      case DWGS_VERTEX_SHADER_STATE: {
-        struct brw_vs_unit_state vs;
-        assert(len == sizeof(vs));
-
-        _mesa_printf("DWGS_VERTEX_SHADER_STATE\n");
-        memcpy(&vs, data, sizeof(vs));
-
-/*      vs.vs6.vert_cache_disable = 1;  */
-/*      vs.thread4.max_threads = 4;  */
-
-        memcpy(dest, &vs, sizeof(vs));
-        return;
-      }
-      case DWGS_CLIPPER_STATE: {
-        struct brw_clip_unit_state clip;
-        assert(len == sizeof(clip));
-
-        _mesa_printf("DWGS_CLIPPER_STATE\n");
-        memcpy(&clip, data, sizeof(clip));
-
-/*      clip.thread4.max_threads = 0; */
-/*      clip.clip5.clip_mode = BRW_CLIPMODE_REJECT_ALL;   */
-
-        memcpy(dest, &clip, sizeof(clip));
-        return;
-      }
-
-      case DWGS_NOTYPE:
-      case DWGS_GEOMETRY_SHADER_STATE:
-      case DWGS_STRIPS_FANS_STATE:
-        break;
-
-      case DWGS_WINDOWER_IZ_STATE: {
-           struct brw_wm_unit_state wm;
-           assert(len == sizeof(wm));
-
-           _mesa_printf("DWGS_WINDOWER_IZ_STATE\n");
-           memcpy(&wm, data, sizeof(wm));
-
-/*         wm.wm5.max_threads = 10; */
-
-           memcpy(dest, &wm, sizeof(wm));
-           return;
-        }
-
-      case DWGS_COLOR_CALC_STATE:
-      case DWGS_CLIPPER_VIEWPORT_STATE:
-      case DWGS_STRIPS_FANS_VIEWPORT_STATE:
-      case DWGS_COLOR_CALC_VIEWPORT_STATE:
-      case DWGS_SAMPLER_STATE:
-      case DWGS_KERNEL_INSTRUCTIONS:
-      case DWGS_SCRATCH_SPACE:
-      case DWGS_SAMPLER_DEFAULT_COLOR:
-      case DWGS_INTERFACE_DESCRIPTOR:
-      case DWGS_VLD_STATE:
-      case DWGS_VFE_STATE:
-      default:
-        break;
-      }
-      break;
-   case DW_SURFACE_STATE:
-      break;
-   case DW_1D_MAP:
-   case DW_2D_MAP:
-   case DW_CUBE_MAP:
-   case DW_VOLUME_MAP:
-   case DW_CONSTANT_BUFFER:
-   case DW_CONSTANT_URB_ENTRY:
-   case DW_VERTEX_BUFFER:
-   case DW_INDEX_BUFFER:
-   default:
-      break;
-   }
-
-   memcpy(dest, data, len);
-}
-
-
-/* In order to work, the memory layout has to be the same as the X
- * server which created the aubfile.
- */
-static int parse_block_header( struct aub_state *s )
-{
-   struct aub_block_header *bh = (struct aub_block_header *)(s->map + s->csr);
-   void *data = (void *)(bh + 1);
-   unsigned int len = (bh->length + 3) & ~3;
-
-   _mesa_printf("block header at 0x%x\n", s->csr);
-
-   if (s->csr + len + sizeof(*bh) > s->sz) {
-      _mesa_printf("EOF in data in %s\n", __FUNCTION__);
-      return 1;
-   }
-
-   if (bh->address_space == ADDR_GTT) {
-
-      switch (bh->operation)
-      {
-      case BH_DATA_WRITE: {
-        void *dest = bmFindVirtual( s->intel, bh->address, len );
-        if (dest == NULL) {
-           _mesa_printf("Couldn't find virtual address for offset %x\n", bh->address);
-           return 1;
-        }
-
-#if 1
-        parse_data_write(s, bh, dest, data, len);
-#else
-        memcpy(dest, data, len);
-#endif
-        break;
-      }
-      case BH_COMMAND_WRITE:
-#if 0
-        intel_cmd_ioctl(s->intel, (void *)data, len);
-#else
-        if (parse_commands(s, data, len) != 0)
-           _mesa_printf("parse_commands failed\n");
-#endif
-        break;
-      default:
-        break;
-      }
-   }
-
-   s->csr += sizeof(*bh) + len;
-   return 0;
-}
-
-
-#define AUB_FILE_HEADER 0xe085000b
-#define AUB_BLOCK_HEADER 0xe0c10003
-#define AUB_DUMP_BMP 0xe09e0004
-
-int brw_playback_aubfile(struct brw_context *brw,
-                        const char *filename)
-{
-   struct intel_context *intel = &brw->intel;
-   struct aub_state state;
-   struct stat sb;
-   int fd;
-   int retval = 0;
-
-   state.intel = intel;
-
-   fd = open(filename, O_RDONLY, 0);
-   if (fd < 0) {
-      _mesa_printf("couldn't open aubfile: %s\n", filename);
-      return 1;
-   }
-
-   if (fstat(fd, &sb) != 0) {
-      _mesa_printf("couldn't open %s\n", filename);
-      return 1;
-   }
-
-   state.csr = 0;
-   state.sz = sb.st_size;
-   state.map = mmap(NULL, sb.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
-   
-   if (state.map == NULL) {
-      _mesa_printf("couldn't mmap %s\n", filename);
-      return 1;
-   }
-
-   LOCK_HARDWARE(intel); 
-   {
-      /* Make sure we don't confuse anything that might happen to be
-       * going on with the hardware:
-       */
-/*       bmEvictAll(intel); */
-/*       intel->vtbl.lost_hardware(intel); */
-      
-
-      /* Replay the aubfile item by item: 
-       */
-      while (retval == 0 && 
-            state.csr != state.sz) {
-        unsigned int insn = *(unsigned int *)(state.map + state.csr);
-
-        switch (insn) {
-        case AUB_FILE_HEADER:
-           retval = gobble(&state, sizeof(struct aub_file_header));
-           break;
-        
-        case AUB_BLOCK_HEADER:   
-           retval = parse_block_header(&state);
-           break;
-        
-        case AUB_DUMP_BMP:
-           retval = gobble(&state, sizeof(struct aub_dump_bmp));
-           break;
-        
-        default:
-           _mesa_printf("unknown instruction %x\n", insn);
-           retval = 1;
-           break;
-        }
-      }
-   }
-   UNLOCK_HARDWARE(intel);
-   return retval;
-}
-
-
-
-
-
-
-                 
index 397a9bd3f5cd2c36abf60d26929d566117533783..0ccdd8a6610f98a311d461b62cf98ddbc4416760 100644 (file)
@@ -31,7 +31,6 @@
 
 
 #include "brw_context.h"
-#include "brw_aub.h"
 #include "brw_defines.h"
 #include "brw_draw.h"
 #include "brw_vs.h"
@@ -135,8 +134,6 @@ GLboolean brwCreateContext( const __GLcontextModes *mesaVis,
 
    driInitExtensions( ctx, brw_extensions, GL_FALSE );
 
-   brw_aub_init( brw );
-
    brw_init_attribs( brw );
    brw_init_metaops( brw );
    brw_init_state( brw );
@@ -156,14 +153,6 @@ GLboolean brwCreateContext( const __GLcontextModes *mesaVis,
 
    brw_FrameBufferTexInit( brw );
 
-   {
-      const char *filename = getenv("INTEL_REPLAY");
-      if (filename) {
-        brw_playback_aubfile(brw, filename);
-        exit(0);
-      }
-   }
-
    return GL_TRUE;
 }
 
index 08fdc545205c2dda9a869f14b990138975637d11..aa797b72ce624fa810c58b402a1fb04285bd692a 100644 (file)
@@ -277,9 +277,6 @@ struct brw_cache {
    GLuint key_size;            /* for fixed-size keys */
    GLuint aux_size;
 
-   GLuint aub_type;
-   GLuint aub_sub_type;
-   
    GLuint last_addr;                   /* offset of active item */
 };
 
index 5bf0ed536ba3a88b1490e6843fec1c5bdf1d5fac..d3c88c1dca0dc5eb5e477661c3cf8cf1e46209f8 100644 (file)
@@ -42,7 +42,6 @@
 #include "brw_defines.h"
 #include "brw_state.h"
 #include "brw_util.h"
-#include "brw_aub.h"
 
 
 /* Partition the CURBE between the various users of constant values:
@@ -315,13 +314,11 @@ static void upload_constant_buffer(struct brw_context *brw)
 
       /* Copy data to the buffer:
        */
-      bmBufferSubDataAUB(&brw->intel,
-                        pool->buffer,
-                        brw->curbe.gs_offset, 
-                        bufsz, 
-                        buf,
-                        DW_CONSTANT_BUFFER,
-                        0);
+      bmBufferSubData(&brw->intel,
+                     pool->buffer,
+                     brw->curbe.gs_offset,
+                     bufsz,
+                     buf);
    }
 
    /* TODO: only emit the constant_buffer packet when necessary, ie:
index 5ca9b2f549a276191960dc661b3a04d4e4cba569..b23b35798886a5841ff5f569f4deec3828108ec7 100644 (file)
@@ -36,7 +36,6 @@
 #include "brw_draw.h"
 #include "brw_defines.h"
 #include "brw_context.h"
-#include "brw_aub.h"
 #include "brw_state.h"
 #include "brw_fallback.h"
 
@@ -468,11 +467,6 @@ void brw_draw_prims( GLcontext *ctx,
        _swsetup_Wakeup(ctx);
       _tnl_draw_prims(ctx, arrays, prim, nr_prims, ib, min_index, max_index);
    }
-
-   if (intel->aub_file && (INTEL_DEBUG & DEBUG_SYNC)) {
-      intelFinish( &intel->ctx );
-      intel->aub_wrap = 1;
-   }
 }
 
 
index dc289ca9ae784581a8d43dd0228106a0bc17784c..fc2e3035af1023028d7b4af835430be3e1614b5e 100644 (file)
@@ -36,7 +36,6 @@
 #include "brw_draw.h"
 #include "brw_defines.h"
 #include "brw_context.h"
-#include "brw_aub.h"
 #include "brw_state.h"
 #include "brw_fallback.h"
 
index f7b1d3181055d69b4b857d2016824a4fcedab269..8e8fea48e9f63f7c68951b00fbe2befa0a023f10 100644 (file)
@@ -36,7 +36,6 @@
 #include "tnl/tnl.h"
 
 #include "brw_context.h"
-#include "brw_aub.h"
 #include "brw_util.h"
 
 static void brwBindProgram( GLcontext *ctx,
index 909b0acd12199e5b79e85a4de26fd0feea52ed6b..b78b51328a28a9898e13733d02c6e88226f0a2ac 100644 (file)
@@ -32,7 +32,6 @@
 
 
 #include "brw_state.h"
-#include "brw_aub.h"
 #include "intel_batchbuffer.h"
 #include "imports.h"
 
index 71c6938f9a3a445dbd3c30933164908e8837e6f2..98d765ac0e05c86c49eb9ccdd61eebad27ade616 100644 (file)
@@ -31,7 +31,6 @@
       
 
 #include "brw_state.h"
-#include "brw_aub.h"
 #include "intel_batchbuffer.h"
 #include "imports.h"
 
@@ -188,13 +187,11 @@ GLuint brw_upload_cache( struct brw_cache *cache,
 
    /* Copy data to the buffer:
     */
-   bmBufferSubDataAUB(&cache->brw->intel,
-                     cache->pool->buffer,
-                     offset, 
-                     data_size, 
-                     data,
-                     cache->aub_type,
-                     cache->aub_sub_type);
+   bmBufferSubData(&cache->brw->intel,
+                  cache->pool->buffer,
+                  offset,
+                  data_size,
+                  data);
    
 
    cache->brw->state.dirty.cache |= 1<<cache->id;
@@ -227,17 +224,17 @@ GLuint brw_cache_data(struct brw_cache *cache,
    return brw_cache_data_sz(cache, data, cache->key_size);
 }
 
-
-
-
+enum pool_type {
+   DW_SURFACE_STATE,
+   DW_GENERAL_STATE
+};
 
 static void brw_init_cache( struct brw_context *brw, 
                            const char *name,
                            GLuint id,
                            GLuint key_size,
                            GLuint aux_size,
-                           GLuint aub_type,
-                           GLuint aub_sub_type )
+                           enum pool_type pool_type)
 {
    struct brw_cache *cache = &brw->cache[id];
    cache->brw = brw;
@@ -254,9 +251,7 @@ static void brw_init_cache( struct brw_context *brw,
 
    cache->key_size = key_size;
    cache->aux_size = aux_size;
-   cache->aub_type = aub_type;
-   cache->aub_sub_type = aub_sub_type;
-   switch (aub_type) {
+   switch (pool_type) {
    case DW_GENERAL_STATE: cache->pool = &brw->pool[BRW_GS_POOL]; break;
    case DW_SURFACE_STATE: cache->pool = &brw->pool[BRW_SS_POOL]; break;
    default: assert(0); break;
@@ -271,136 +266,119 @@ void brw_init_caches( struct brw_context *brw )
                  BRW_CC_VP,
                  sizeof(struct brw_cc_viewport),
                  0,
-                 DW_GENERAL_STATE,
-                 DWGS_COLOR_CALC_VIEWPORT_STATE);
+                 DW_GENERAL_STATE);
 
    brw_init_cache(brw,
                  "CC_UNIT",
                  BRW_CC_UNIT,
                  sizeof(struct brw_cc_unit_state),
                  0,
-                 DW_GENERAL_STATE,
-                 DWGS_COLOR_CALC_STATE);
+                 DW_GENERAL_STATE);
 
    brw_init_cache(brw,
                  "WM_PROG",
                  BRW_WM_PROG,
                  sizeof(struct brw_wm_prog_key),
                  sizeof(struct brw_wm_prog_data),
-                 DW_GENERAL_STATE,
-                 DWGS_KERNEL_INSTRUCTIONS);
+                 DW_GENERAL_STATE);
 
    brw_init_cache(brw,
                  "SAMPLER_DEFAULT_COLOR",
                  BRW_SAMPLER_DEFAULT_COLOR,
                  sizeof(struct brw_sampler_default_color),
                  0,
-                 DW_GENERAL_STATE,
-                 DWGS_SAMPLER_DEFAULT_COLOR);
+                 DW_GENERAL_STATE);
 
    brw_init_cache(brw,
                  "SAMPLER",
                  BRW_SAMPLER,
                  0,            /* variable key/data size */
                  0,
-                 DW_GENERAL_STATE,
-                 DWGS_SAMPLER_STATE);
+                 DW_GENERAL_STATE);
 
    brw_init_cache(brw,
                  "WM_UNIT",
                  BRW_WM_UNIT,
                  sizeof(struct brw_wm_unit_state),
                  0,
-                 DW_GENERAL_STATE,
-                 DWGS_WINDOWER_IZ_STATE);
+                 DW_GENERAL_STATE);
 
    brw_init_cache(brw,
                  "SF_PROG",
                  BRW_SF_PROG,
                  sizeof(struct brw_sf_prog_key),
                  sizeof(struct brw_sf_prog_data),
-                 DW_GENERAL_STATE,
-                 DWGS_KERNEL_INSTRUCTIONS);
+                 DW_GENERAL_STATE);
 
    brw_init_cache(brw,
                  "SF_VP",
                  BRW_SF_VP,
                  sizeof(struct brw_sf_viewport),
                  0,
-                 DW_GENERAL_STATE,
-                 DWGS_STRIPS_FANS_VIEWPORT_STATE);
+                 DW_GENERAL_STATE);
 
    brw_init_cache(brw,
                  "SF_UNIT",
                  BRW_SF_UNIT,
                  sizeof(struct brw_sf_unit_state),
                  0,
-                 DW_GENERAL_STATE,
-                 DWGS_STRIPS_FANS_STATE);
+                 DW_GENERAL_STATE);
 
    brw_init_cache(brw,
                  "VS_UNIT",
                  BRW_VS_UNIT,
                  sizeof(struct brw_vs_unit_state),
                  0,
-                 DW_GENERAL_STATE,
-                 DWGS_VERTEX_SHADER_STATE);
+                 DW_GENERAL_STATE);
 
    brw_init_cache(brw,
                  "VS_PROG",
                  BRW_VS_PROG,
                  sizeof(struct brw_vs_prog_key),
                  sizeof(struct brw_vs_prog_data),
-                 DW_GENERAL_STATE,
-                 DWGS_KERNEL_INSTRUCTIONS);
+                 DW_GENERAL_STATE);
 
    brw_init_cache(brw,
                  "CLIP_UNIT",
                  BRW_CLIP_UNIT,
                  sizeof(struct brw_clip_unit_state),
                  0,
-                 DW_GENERAL_STATE,
-                 DWGS_CLIPPER_STATE);
+                 DW_GENERAL_STATE);
 
    brw_init_cache(brw,
                  "CLIP_PROG",
                  BRW_CLIP_PROG,
                  sizeof(struct brw_clip_prog_key),
                  sizeof(struct brw_clip_prog_data),
-                 DW_GENERAL_STATE,
-                 DWGS_KERNEL_INSTRUCTIONS);
+                 DW_GENERAL_STATE);
 
    brw_init_cache(brw,
                  "GS_UNIT",
                  BRW_GS_UNIT,
                  sizeof(struct brw_gs_unit_state),
                  0,
-                 DW_GENERAL_STATE,
-                 DWGS_GEOMETRY_SHADER_STATE);
+                 DW_GENERAL_STATE);
 
    brw_init_cache(brw,
                  "GS_PROG",
                  BRW_GS_PROG,
                  sizeof(struct brw_gs_prog_key),
                  sizeof(struct brw_gs_prog_data),
-                 DW_GENERAL_STATE,
-                 DWGS_KERNEL_INSTRUCTIONS);
+                 DW_GENERAL_STATE);
 
    brw_init_cache(brw,
                  "SS_SURFACE",
                  BRW_SS_SURFACE,
                  sizeof(struct brw_surface_state),
                  0,
-                 DW_SURFACE_STATE,
-                 DWSS_SURFACE_STATE);
+                 DW_SURFACE_STATE);
 
    brw_init_cache(brw,
                  "SS_SURF_BIND",
                  BRW_SS_SURF_BIND,
                  sizeof(struct brw_surface_binding_table),
                  0,
-                 DW_SURFACE_STATE,
-                 DWSS_BINDING_TABLE_STATE);
+                 DW_SURFACE_STATE);
 }
 
 
index b9926f2a5d7e13eab06773c55db74a720265c14b..708ae857ab5158007b11dc809e772fa204587c6e 100644 (file)
@@ -126,10 +126,7 @@ void brw_pool_check_wrap( struct brw_context *brw,
                          struct brw_mem_pool *pool )
 {
    if (pool->offset > (pool->size * 3) / 4) {
-      if (brw->intel.aub_file)
-        brw->intel.aub_wrap = 1;
-      else
-        brw->state.dirty.brw |= BRW_NEW_CONTEXT;
+      brw->state.dirty.brw |= BRW_NEW_CONTEXT;
    }
 
 }
index 786f30e641efb23f5182ab7aedd3f0d42cdeabdf..d8cb1688023f10a67ad6ef3ab7560e0ae26dcc25 100644 (file)
@@ -47,7 +47,6 @@
 
 #include "brw_draw.h"
 #include "brw_state.h"
-#include "brw_aub.h"
 #include "brw_fallback.h"
 #include "brw_vs.h"
 
@@ -60,8 +59,6 @@ static void brw_destroy_context( struct intel_context *intel )
    GLcontext *ctx = &intel->ctx;
    struct brw_context *brw = brw_context(&intel->ctx);
 
-   brw_aub_destroy(brw);
-
    brw_destroy_metaops(brw);
    brw_destroy_state(brw);
    brw_draw_destroy( brw );
index e748c0d6d0b9a68709a27285a7364dbccfa16801..b31c2e6d9bc4f69d8a4c015cec1949e6899989a6 100644 (file)
@@ -130,24 +130,6 @@ int bmBufferSubData(struct intel_context *,
                     unsigned size, 
                     const void *data );
 
-
-int bmBufferDataAUB(struct intel_context *, 
-                    struct buffer *buf, 
-                    unsigned size, 
-                    const void *data, 
-                    unsigned flags,
-                    unsigned aubtype,
-                    unsigned aubsubtype );
-
-int bmBufferSubDataAUB(struct intel_context *, 
-                       struct buffer *buf, 
-                       unsigned offset, 
-                       unsigned size, 
-                       const void *data,
-                       unsigned aubtype,
-                       unsigned aubsubtype );
-
-
 /* In this version, taking the offset will provoke an upload on
  * buffers not already resident in AGP:
  */
@@ -170,12 +152,6 @@ void *bmMapBuffer( struct intel_context *,
 void bmUnmapBuffer( struct intel_context *,
                    struct buffer *buf );
 
-void bmUnmapBufferAUB( struct intel_context *,
-                      struct buffer *buf,
-                      unsigned aubtype,
-                      unsigned aubsubtype );
-
-
 /* Pertains to all buffers who's offset has been taken since the last
  * fence or release.
  */
index 24ee11edd8c20f58d60495f14dc46541feec935a..a85121122fca8163c040cfc080dbb119672d473b 100644 (file)
@@ -85,7 +85,6 @@ struct buffer {
 
    unsigned mapped:1;          
    unsigned dirty:1;           
-   unsigned aub_dirty:1;       
    unsigned alignment:13;
    unsigned flags:16;
 
@@ -906,86 +905,6 @@ int bmBufferSubData(struct intel_context *intel,
    return retval;
 }
 
-
-
-int bmBufferDataAUB(struct intel_context *intel, 
-                    struct buffer *buf, 
-                    unsigned size, 
-                    const void *data, 
-                    unsigned flags,
-                    unsigned aubtype,
-                    unsigned aubsubtype )
-{
-   int retval = bmBufferData(intel, buf, size, data, flags);
-   
-
-   /* This only works because in this version of the buffer manager we
-    * allocate all buffers statically in agp space and so can emit the
-    * uploads to the aub file with the correct offsets as they happen.
-    */
-   if (retval == 0 && data && intel->aub_file) {
-
-      if (buf->block && !buf->dirty) {
-        intel->vtbl.aub_gtt_data(intel,
-                                     buf->block->mem->ofs,
-                                     buf->block->virtual,
-                                     size,
-                                     aubtype,
-                                     aubsubtype);
-        buf->aub_dirty = 0;
-      }
-   }
-   
-   return retval;
-}
-                      
-
-int bmBufferSubDataAUB(struct intel_context *intel, 
-                       struct buffer *buf, 
-                       unsigned offset, 
-                       unsigned size, 
-                       const void *data,
-                       unsigned aubtype,
-                       unsigned aubsubtype )
-{
-   int retval = bmBufferSubData(intel, buf, offset, size, data);
-   
-
-   /* This only works because in this version of the buffer manager we
-    * allocate all buffers statically in agp space and so can emit the
-    * uploads to the aub file with the correct offsets as they happen.
-    */
-   if (intel->aub_file) {
-      if (retval == 0 && buf->block && !buf->dirty)
-        intel->vtbl.aub_gtt_data(intel,
-                                     buf->block->mem->ofs + offset,
-                                     ((const char *)buf->block->virtual) + offset,
-                                     size,
-                                     aubtype,
-                                     aubsubtype);
-   }
-
-   return retval;
-}
-
-void bmUnmapBufferAUB( struct intel_context *intel, 
-                      struct buffer *buf,
-                      unsigned aubtype,
-                      unsigned aubsubtype )
-{
-   bmUnmapBuffer(intel, buf);
-
-   if (intel->aub_file) {
-      /* Hack - exclude the framebuffer mappings.  If you removed
-       * this, you'd get very big aubfiles, but you *would* be able to
-       * see fallback rendering.
-       */
-      if (buf->block  && !buf->dirty && buf->block->pool == &intel->bm->pool[0]) {
-        buf->aub_dirty = 1;
-      }
-   }
-}
-
 unsigned bmBufferOffset(struct intel_context *intel, 
                        struct buffer *buf)
 {
@@ -1197,26 +1116,7 @@ int bmValidateBuffers( struct intel_context *intel )
                         buf->backing_store, 
                         buf->size);
 
-              if (intel->aub_file) {
-                 intel->vtbl.aub_gtt_data(intel,
-                                              buf->block->mem->ofs,
-                                              buf->backing_store,
-                                              buf->size,
-                                              0,
-                                              0);
-              }
-
               buf->dirty = 0;
-              buf->aub_dirty = 0;
-           }
-           else if (buf->aub_dirty) {
-              intel->vtbl.aub_gtt_data(intel,
-                                           buf->block->mem->ofs,
-                                           buf->block->virtual,
-                                           buf->size,
-                                           0,
-                                           0);
-              buf->aub_dirty = 0;
            }
 
            block->referenced = 0;
index 64885ed9b4b73ff0fd8195c06919a6dc38408914..2aaa10e1c21bfe59ac343d7370ac69d3999e5c1a 100644 (file)
@@ -168,31 +168,12 @@ GLboolean intel_batchbuffer_flush( struct intel_batchbuffer *batch )
       goto out;
    }
 
-
-   if (intel->aub_file) {
-      /* Send buffered commands to aubfile as a single packet. 
-       */
-      intel_batchbuffer_map(batch);
-      ((int *)batch->ptr)[-1] = intel->vtbl.flush_cmd();
-      intel->vtbl.aub_commands(intel,
-                              offset, /* Fulsim wierdness - don't adjust */
-                              batch->map + batch->offset,
-                              used);
-      ((int *)batch->ptr)[-1] = MI_BATCH_BUFFER_END;
-      intel_batchbuffer_unmap(batch);
-   }
-
-
    /* Fire the batch buffer, which was uploaded above:
     */
    intel_batch_ioctl(batch->intel, 
                     offset + batch->offset,
                     used);
 
-   if (intel->aub_file && 
-       intel->ctx.DrawBuffer->_ColorDrawBufferMask[0] == BUFFER_BIT_FRONT_LEFT)
-      intel->vtbl.aub_dump_bmp( intel, 0 );
-
    /* Reset the buffer:
     */
  out:
index 015e433fd7a701866c0727e03b495eb29376a07b..3349284f5db25a9e644832c050cc8570c1b0eb98 100644 (file)
@@ -103,8 +103,7 @@ static void intel_bufferobj_data( GLcontext *ctx,
    obj->Size = size;
    obj->Usage = usage;
 
-   bmBufferDataAUB(intel, intel_obj->buffer, size, data, 0,
-                  0, 0);
+   bmBufferData(intel, intel_obj->buffer, size, data, 0);
 }
 
 
@@ -125,7 +124,7 @@ static void intel_bufferobj_subdata( GLcontext *ctx,
    struct intel_buffer_object *intel_obj = intel_buffer_object(obj);
 
    assert(intel_obj);
-   bmBufferSubDataAUB(intel, intel_obj->buffer, offset, size, data, 0, 0);
+   bmBufferSubData(intel, intel_obj->buffer, offset, size, data);
 }
 
 
@@ -181,7 +180,7 @@ static GLboolean intel_bufferobj_unmap( GLcontext *ctx,
    assert(intel_obj);
    assert(intel_obj->buffer);
    assert(obj->Pointer);
-   bmUnmapBufferAUB(intel, intel_obj->buffer, 0, 0);
+   bmUnmapBuffer(intel, intel_obj->buffer);
    obj->Pointer = NULL;
    return GL_TRUE;
 }
index d155c039d77872017e943b20df8ce262e5ed0249..6c8b07350265fba00fb0c449d80b5596a636edab 100644 (file)
@@ -450,12 +450,6 @@ void intelSwapBuffers( __DRIdrawablePrivate *dPriv )
         } else {
            intelCopyBuffer( dPriv, NULL );
         }
-        if (intel->aub_file) {
-           intelFlush(ctx);
-           intel->vtbl.aub_dump_bmp( intel, 1 );
-
-           intel->aub_wrap = 1;
-        }
       }
    } else {
       /* XXX this shouldn't be an error but we can't handle it for now */
index f3ec2b2eeef94d066b154a3cc70930053b1e9e6f..022819d58217ad514881b4144f98dd51f613e386 100644 (file)
@@ -668,13 +668,6 @@ void LOCK_HARDWARE( struct intel_context *intel )
 
    intel->locked = 1;
 
-   if (intel->aub_wrap) {
-      bm_fake_NotifyContendedLockTake( intel );
-      intel->vtbl.lost_hardware( intel );
-      intel->vtbl.aub_wrap(intel);
-      intel->aub_wrap = 0;
-   }
-
    if (bmError(intel)) {
       bmEvictAll(intel);
       intel->vtbl.lost_hardware( intel );
index 053d93a82b3237c629d118291a9ae4878df3d37b..06cfc6946d456c61d8d93f4bf7f79120e707c5e3 100644 (file)
@@ -109,20 +109,6 @@ struct intel_context
       void (*emit_flush)( struct intel_context *intel,
                          GLuint unused );
 
-      void (*aub_commands)( struct intel_context *intel, 
-                           GLuint offset,
-                           const void *buf,
-                           GLuint sz );
-      void (*aub_dump_bmp)( struct intel_context *intel, GLuint buffer );
-      void (*aub_wrap)( struct intel_context *intel );
-      void (*aub_gtt_data)( struct intel_context *intel, 
-                           GLuint offset,
-                           const void *src,
-                           GLuint size,
-                           GLuint aubtype, 
-                           GLuint aubsubtype);
-
-
       void (*reduced_primitive_state)( struct intel_context *intel, GLenum rprim );
 
       GLboolean (*check_vertex_size)( struct intel_context *intel, GLuint expected );
@@ -176,7 +162,6 @@ struct intel_context
    GLuint last_swap_fence;
    GLuint second_last_swap_fence;
    
-   GLboolean aub_wrap;
    GLuint stats_wm;
 
    struct intel_batchbuffer *batch;
@@ -238,8 +223,6 @@ struct intel_context
    __DRIscreenPrivate *driScreen;
    intelScreenPrivate *intelScreen; 
    volatile drmI830Sarea *sarea; 
-   
-   FILE *aub_file;
 
    GLuint lastStamp;
 
index 0a8e976f706a29f76892be48f8390d341ec0cd8f..e7e736079f4b49c60493eb9136b25cc5a0cdfb7a 100644 (file)
@@ -115,10 +115,6 @@ void intelWaitIrq( struct intel_context *intel, int seq )
       if ( ret ) {
         fprintf( stderr, "%s: drmI830IrqWait: %d\n", __FUNCTION__, ret );
 
-        if (intel->aub_file) {
-           intel->vtbl.aub_dump_bmp( intel, intel->ctx.Visual.doubleBufferMode ? 1 : 0 );
-        }
-
         exit(1);
       }
    }
index 835ecdd725768951858e1462309ed78bbc845953..b78eba898ffa8fb20690a83250220def035e2ce2 100644 (file)
@@ -64,7 +64,7 @@ void intel_region_unmap(struct intel_context *intel,
 {
    DBG("%s\n", __FUNCTION__);
    if (!--region->map_refcount) {
-      bmUnmapBufferAUB(intel, region->buffer, 0, 0);
+      bmUnmapBuffer(intel, region->buffer);
       region->map = NULL;
    }
 }
@@ -217,10 +217,10 @@ GLboolean intel_region_data(struct intel_context *intel,
        srcx == 0 &&
        srcy == 0) 
    {
-      return (bmBufferDataAUB(intel,
-                             dst->buffer,
-                             dst->cpp * width * dst->height,
-                             src, 0, 0, 0) == 0);
+      return (bmBufferData(intel,
+                          dst->buffer,
+                          dst->cpp * width * dst->height,
+                          src, 0) == 0);
    }
    else {
       GLubyte *map = intel_region_map(intel, dst);