diff options
| author | Eric Anholt <[email protected]> | 2014-07-18 13:06:01 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2014-08-11 14:40:45 -0700 |
| commit | a3cd3c0d198374647df3db83198e8ce0cddcb6b7 (patch) | |
| tree | ad6f36cbf7b4c8bf081b0ea4c62620ef62e97282 /src/gallium/drivers/vc4/vc4_context.h | |
| parent | a02c658908384b81e9d27e2555ba2fce2cc0f6a8 (diff) | |
vc4: Switch simulator to using kernel validator
This ensures that when I'm using the simulator, I get a closer match to
what behavior on real hardware will be. It lets me rapidly iterate on the
kernel validation code (which otherwise has a several-minute turnaround
time), and helps catch buffer overflow bugs in the userspace driver
faster.
Diffstat (limited to 'src/gallium/drivers/vc4/vc4_context.h')
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_context.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/gallium/drivers/vc4/vc4_context.h b/src/gallium/drivers/vc4/vc4_context.h index c125d1b0c5d..ee9ddcfd82b 100644 --- a/src/gallium/drivers/vc4/vc4_context.h +++ b/src/gallium/drivers/vc4/vc4_context.h @@ -29,6 +29,8 @@ #include "pipe/p_state.h" #include "util/u_slab.h" +#define __user +#include "vc4_drm.h" #include "vc4_bufmgr.h" #include "vc4_resource.h" #include "vc4_cl.h" @@ -119,6 +121,9 @@ struct vc4_context { struct vc4_cl rcl; struct vc4_cl shader_rec; struct vc4_cl bo_handles; +#ifdef USE_VC4_SIMULATOR + struct vc4_cl bo_pointers; +#endif uint32_t shader_rec_count; struct vc4_bo *tile_alloc; @@ -186,9 +191,9 @@ void vc4_draw_init(struct pipe_context *pctx); void vc4_state_init(struct pipe_context *pctx); void vc4_program_init(struct pipe_context *pctx); void vc4_simulator_init(struct vc4_screen *screen); -void vc4_simulator_flush(struct vc4_context *vc4, - struct vc4_surface *color_surf); -void *vc4_simulator_alloc(struct vc4_screen *screen, uint32_t size); +int vc4_simulator_flush(struct vc4_context *vc4, + struct drm_vc4_submit_cl *args, + struct vc4_surface *color_surf); void vc4_get_uniform_bo(struct vc4_context *vc4, struct vc4_compiled_shader *shader, |