#include "main/mtypes.h"
#include "brw_context.h"
-#include "brw_state.h"
#include "brw_defines.h"
/**
/** Generic, undecoded state buffer debug printout */
static void
-state_struct_out(const char *name, dri_bo *buffer, unsigned int state_size)
+state_struct_out(const char *name, drm_intel_bo *buffer, unsigned int state_size)
{
int i;
if (buffer == NULL)
return;
- dri_bo_map(buffer, GL_FALSE);
+ drm_intel_bo_map(buffer, GL_FALSE);
for (i = 0; i < state_size / 4; i++) {
state_out(name, buffer->virtual, buffer->offset, i,
"dword %d\n", i);
}
- dri_bo_unmap(buffer);
+ drm_intel_bo_unmap(buffer);
}
static const char *
int i;
for (i = 0; i < brw->wm.nr_surfaces; i++) {
- dri_bo *surf_bo = brw->wm.surf_bo[i];
+ drm_intel_bo *surf_bo = brw->wm.surf_bo[i];
unsigned int surfoff;
struct brw_surface_state *surf;
char name[20];
fprintf(stderr, " WM SS%d: NULL\n", i);
continue;
}
- dri_bo_map(surf_bo, GL_FALSE);
- surfoff = surf_bo->offset;
- surf = (struct brw_surface_state *)(surf_bo->virtual);
+ drm_intel_bo_map(surf_bo, GL_FALSE);
+ surfoff = surf_bo->offset + brw->wm.surf_offset[i];
+ surf = (struct brw_surface_state *)(surf_bo->virtual + brw->wm.surf_offset[i]);
sprintf(name, "WM SS%d", i);
state_out(name, surf, surfoff, 0, "%s %s\n",
state_out(name, surf, surfoff, 5, "x,y offset: %d,%d\n",
surf->ss5.x_offset, surf->ss5.y_offset);
- dri_bo_unmap(surf_bo);
+ drm_intel_bo_unmap(surf_bo);
}
}
if (brw->sf.vp_bo == NULL)
return;
- dri_bo_map(brw->sf.vp_bo, GL_FALSE);
+ drm_intel_bo_map(brw->sf.vp_bo, GL_FALSE);
vp = brw->sf.vp_bo->virtual;
vp_off = brw->sf.vp_bo->offset;
state_out(name, vp, vp_off, 7, "bottom right = %d,%d\n",
vp->scissor.xmax, vp->scissor.ymax);
- dri_bo_unmap(brw->sf.vp_bo);
+ drm_intel_bo_unmap(brw->sf.vp_bo);
}
-static void brw_debug_prog(const char *name, dri_bo *prog)
+static void brw_debug_prog(const char *name, drm_intel_bo *prog)
{
unsigned int i;
uint32_t *data;
if (prog == NULL)
return;
- dri_bo_map(prog, GL_FALSE);
+ drm_intel_bo_map(prog, GL_FALSE);
data = prog->virtual;
break;
}
- dri_bo_unmap(prog);
+ drm_intel_bo_unmap(prog);
}