diff options
Diffstat (limited to 'src/gallium/drivers/crocus/crocus_context.h')
| -rw-r--r-- | src/gallium/drivers/crocus/crocus_context.h | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/src/gallium/drivers/crocus/crocus_context.h b/src/gallium/drivers/crocus/crocus_context.h index 38366896183..eea21ff55b3 100644 --- a/src/gallium/drivers/crocus/crocus_context.h +++ b/src/gallium/drivers/crocus/crocus_context.h @@ -29,7 +29,7 @@ #include "util/u_threaded_context.h" #include "intel/blorp/blorp.h" #include "intel/dev/intel_debug.h" -#include "intel/compiler/brw_compiler.h" +#include "intel/compiler/elk/elk_compiler.h" #include "crocus_batch.h" #include "crocus_fence.h" #include "crocus_resource.h" @@ -50,8 +50,8 @@ struct blorp_params; #define CROCUS_MAX_CLIP_PLANES 8 enum crocus_param_domain { - BRW_PARAM_DOMAIN_BUILTIN = 0, - BRW_PARAM_DOMAIN_IMAGE, + ELK_PARAM_DOMAIN_BUILTIN = 0, + ELK_PARAM_DOMAIN_IMAGE, }; enum { @@ -59,12 +59,12 @@ enum { DRI_CONF_BO_REUSE_ALL }; -#define BRW_PARAM(domain, val) (BRW_PARAM_DOMAIN_##domain << 24 | (val)) -#define BRW_PARAM_DOMAIN(param) ((uint32_t)(param) >> 24) -#define BRW_PARAM_VALUE(param) ((uint32_t)(param) & 0x00ffffff) -#define BRW_PARAM_IMAGE(idx, offset) BRW_PARAM(IMAGE, ((idx) << 8) | (offset)) -#define BRW_PARAM_IMAGE_IDX(value) (BRW_PARAM_VALUE(value) >> 8) -#define BRW_PARAM_IMAGE_OFFSET(value)(BRW_PARAM_VALUE(value) & 0xf) +#define ELK_PARAM(domain, val) (ELK_PARAM_DOMAIN_##domain << 24 | (val)) +#define ELK_PARAM_DOMAIN(param) ((uint32_t)(param) >> 24) +#define ELK_PARAM_VALUE(param) ((uint32_t)(param) & 0x00ffffff) +#define ELK_PARAM_IMAGE(idx, offset) ELK_PARAM(IMAGE, ((idx) << 8) | (offset)) +#define ELK_PARAM_IMAGE_IDX(value) (ELK_PARAM_VALUE(value) >> 8) +#define ELK_PARAM_IMAGE_OFFSET(value)(ELK_PARAM_VALUE(value) & 0xf) /** * Dirty flags. When state changes, we flag some combination of these @@ -364,7 +364,7 @@ struct crocus_binding_table { * as well as program data and other packets needed by state upload. * * There can be several crocus_compiled_shader variants per API-level shader - * (crocus_uncompiled_shader), due to state-based recompiles (brw_*_prog_key). + * (crocus_uncompiled_shader), due to state-based recompiles (elk_*_prog_key). */ struct crocus_compiled_shader { /** Reference to the uploaded assembly. */ @@ -374,11 +374,11 @@ struct crocus_compiled_shader { uint32_t map_size; /** The program data (owned by the program cache hash table) */ - struct brw_stage_prog_data *prog_data; + struct elk_stage_prog_data *prog_data; uint32_t prog_data_size; /** A list of system values to be uploaded as uniforms. */ - enum brw_param_builtin *system_values; + enum elk_param_builtin *system_values; unsigned num_system_values; /** Number of constbufs expected by the shader. */ @@ -442,7 +442,7 @@ struct crocus_context { struct threaded_context *thrctx; /** A debug callback for KHR_debug output. */ - struct pipe_debug_callback dbg; + struct util_debug_callback dbg; /** A device reset status callback for notifying that the GPU is hosed. */ struct pipe_device_reset_callback reset; @@ -511,7 +511,7 @@ struct crocus_context { struct { struct crocus_uncompiled_shader *uncompiled[MESA_SHADER_STAGES]; struct crocus_compiled_shader *prog[MESA_SHADER_STAGES]; - struct brw_vue_map *last_vue_map; + struct intel_vue_map *last_vue_map; struct crocus_bo *cache_bo; uint32_t cache_next_offset; @@ -584,8 +584,8 @@ struct crocus_context { bool primitive_restart; unsigned cut_index; - enum pipe_prim_type reduced_prim_mode:8; - enum pipe_prim_type prim_mode:8; + enum mesa_prim reduced_prim_mode:8; + enum mesa_prim prim_mode:8; bool prim_is_points_or_lines; uint8_t vertices_per_patch; uint8_t patch_vertices; @@ -604,7 +604,7 @@ struct crocus_context { * Array of aux usages for drawing, altered to account for any * self-dependencies from resources bound for sampling and rendering. */ - enum isl_aux_usage draw_aux_usage[BRW_MAX_DRAW_BUFFERS]; + enum isl_aux_usage draw_aux_usage[ELK_MAX_DRAW_BUFFERS]; /** Aux usage of the fb's depth buffer (which may or may not exist). */ enum isl_aux_usage hiz_usage; @@ -681,7 +681,7 @@ struct crocus_context { uint64_t svbi; } state; - /* BRW_NEW_URB_ALLOCATIONS: + /* ELK_NEW_URB_ALLOCATIONS: */ struct { uint32_t vsize; /* vertex size plus header in urb registers */ @@ -754,10 +754,10 @@ struct crocus_context { }; #define perf_debug(dbg, ...) do { \ - if (INTEL_DEBUG & DEBUG_PERF) \ + if (INTEL_DEBUG(DEBUG_PERF)) \ dbg_printf(__VA_ARGS__); \ if (unlikely(dbg)) \ - pipe_debug_message(dbg, PERF_INFO, __VA_ARGS__); \ + util_debug_message(dbg, PERF_INFO, __VA_ARGS__); \ } while(0) @@ -770,9 +770,10 @@ void crocus_init_blit_functions(struct pipe_context *ctx); void crocus_init_clear_functions(struct pipe_context *ctx); void crocus_init_program_functions(struct pipe_context *ctx); void crocus_init_resource_functions(struct pipe_context *ctx); +void crocus_init_perfquery_functions(struct pipe_context *ctx); bool crocus_update_compiled_shaders(struct crocus_context *ice); void crocus_update_compiled_compute_shader(struct crocus_context *ice); -void crocus_fill_cs_push_const_buffer(struct brw_cs_prog_data *cs_prog_data, +void crocus_fill_cs_push_const_buffer(struct elk_cs_prog_data *cs_prog_data, unsigned threads, uint32_t *dst); @@ -910,10 +911,10 @@ struct crocus_compiled_shader *crocus_upload_shader(struct crocus_context *ice, const void *key, const void *assembly, uint32_t asm_size, - struct brw_stage_prog_data *, + struct elk_stage_prog_data *, uint32_t prog_data_size, uint32_t *streamout, - enum brw_param_builtin *sysv, + enum elk_param_builtin *sysv, unsigned num_system_values, unsigned num_cbufs, const struct crocus_binding_table *bt); @@ -929,7 +930,7 @@ bool crocus_blorp_upload_shader(struct blorp_batch *blorp_batch, uint32_t stage, const void *key, uint32_t key_size, const void *kernel, uint32_t kernel_size, - const struct brw_stage_prog_data *prog_data, + const void *prog_data, uint32_t prog_data_size, uint32_t *kernel_out, void *prog_data_out); |