X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fi965%2Fbrw_vs_surface_state.c;h=23f841ecc3105fe8b1f10f55fe42411b7a8e3149;hb=646e1123859405da36c7a9920e0c5e270eb4979f;hp=82c19c75831333cff924cb8cabf23da6f4fcd736;hpb=ae8b066da5862b4cfc510b3a9a0e1273f9f6edd4;p=mesa.git diff --git a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c index 82c19c75831..23f841ecc31 100644 --- a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c @@ -31,65 +31,73 @@ #include "main/mtypes.h" #include "program/prog_parameter.h" +#include "main/shaderapi.h" #include "brw_context.h" #include "brw_state.h" +#include "intel_buffer_objects.h" - +/** + * Creates a temporary BO containing the pull constant data for the shader + * stage, and the SURFACE_STATE struct that points at it. + * + * Pull constants are GLSL uniforms (and other constant data) beyond what we + * could fit as push constants, or that have variable-index array access + * (which is easiest to support using pull constants, and avoids filling + * register space with mostly-unused data). + * + * Compare this path to brw_curbe.c for gen4/5 push constants, and + * gen6_vs_state.c for gen6+ push constants. + */ void -brw_upload_vec4_pull_constants(struct brw_context *brw, - GLbitfield brw_new_constbuf, - const struct gl_program *prog, - struct brw_stage_state *stage_state, - const struct brw_vec4_prog_data *prog_data) +brw_upload_pull_constants(struct brw_context *brw, + GLbitfield64 brw_new_constbuf, + const struct gl_program *prog, + struct brw_stage_state *stage_state, + const struct brw_stage_prog_data *prog_data) { - int i; - uint32_t surf_index = prog_data->base.binding_table.pull_constants_start; + unsigned i; + uint32_t surf_index = prog_data->binding_table.pull_constants_start; - /* Updates the ParamaterValues[i] pointers for all parameters of the - * basic type of PROGRAM_STATE_VAR. - */ - _mesa_load_state_parameters(&brw->ctx, prog->Parameters); - - if (!prog_data->base.nr_pull_params) { - if (stage_state->const_bo) { - drm_intel_bo_unreference(stage_state->const_bo); - stage_state->const_bo = NULL; + if (!prog_data->nr_pull_params) { + if (stage_state->surf_offset[surf_index]) { stage_state->surf_offset[surf_index] = 0; - brw->state.dirty.brw |= brw_new_constbuf; + brw->ctx.NewDriverState |= brw_new_constbuf; } return; } - /* _NEW_PROGRAM_CONSTANTS */ - drm_intel_bo_unreference(stage_state->const_bo); - uint32_t size = prog_data->base.nr_pull_params * 4; - stage_state->const_bo = drm_intel_bo_alloc(brw->bufmgr, "vec4_const_buffer", - size, 64); + /* Updates the ParamaterValues[i] pointers for all parameters of the + * basic type of PROGRAM_STATE_VAR. + */ + _mesa_load_state_parameters(&brw->ctx, prog->Parameters); + + /* BRW_NEW_*_PROG_DATA | _NEW_PROGRAM_CONSTANTS */ + uint32_t size = prog_data->nr_pull_params * 4; + struct brw_bo *const_bo = NULL; + uint32_t const_offset; + gl_constant_value *constants = intel_upload_space(brw, size, 64, + &const_bo, &const_offset); - drm_intel_gem_bo_map_gtt(stage_state->const_bo); + STATIC_ASSERT(sizeof(gl_constant_value) == sizeof(float)); - for (i = 0; i < prog_data->base.nr_pull_params; i++) { - memcpy(stage_state->const_bo->virtual + i * 4, - prog_data->base.pull_param[i], - 4); + for (i = 0; i < prog_data->nr_pull_params; i++) { + constants[i] = *prog_data->pull_param[i]; } if (0) { - for (i = 0; i < ALIGN(prog_data->base.nr_pull_params, 4) / 4; i++) { - float *row = (float *)stage_state->const_bo->virtual + i * 4; - printf("const surface %3d: %4.3f %4.3f %4.3f %4.3f\n", - i, row[0], row[1], row[2], row[3]); + for (i = 0; i < ALIGN(prog_data->nr_pull_params, 4) / 4; i++) { + const gl_constant_value *row = &constants[i * 4]; + fprintf(stderr, "const surface %3d: %4.3f %4.3f %4.3f %4.3f\n", + i, row[0].f, row[1].f, row[2].f, row[3].f); } } - drm_intel_gem_bo_unmap_gtt(stage_state->const_bo); + brw_create_constant_surface(brw, const_bo, const_offset, size, + &stage_state->surf_offset[surf_index]); + brw_bo_unreference(const_bo); - brw_create_constant_surface(brw, stage_state->const_bo, 0, size, - &stage_state->surf_offset[surf_index], - false); - - brw->state.dirty.brw |= brw_new_constbuf; + brw->ctx.NewDriverState |= brw_new_constbuf; } @@ -105,22 +113,24 @@ brw_upload_vs_pull_constants(struct brw_context *brw) struct brw_stage_state *stage_state = &brw->vs.base; /* BRW_NEW_VERTEX_PROGRAM */ - struct brw_vertex_program *vp = - (struct brw_vertex_program *) brw->vertex_program; + struct brw_program *vp = + (struct brw_program *) brw->programs[MESA_SHADER_VERTEX]; - /* CACHE_NEW_VS_PROG */ - const struct brw_vec4_prog_data *prog_data = &brw->vs.prog_data->base; + /* BRW_NEW_VS_PROG_DATA */ + const struct brw_stage_prog_data *prog_data = brw->vs.base.prog_data; + _mesa_shader_write_subroutine_indices(&brw->ctx, MESA_SHADER_VERTEX); /* _NEW_PROGRAM_CONSTANTS */ - brw_upload_vec4_pull_constants(brw, BRW_NEW_VS_CONSTBUF, &vp->program.Base, - stage_state, prog_data); + brw_upload_pull_constants(brw, BRW_NEW_VS_CONSTBUF, &vp->program, + stage_state, prog_data); } const struct brw_tracked_state brw_vs_pull_constants = { .dirty = { - .mesa = (_NEW_PROGRAM_CONSTANTS), - .brw = (BRW_NEW_BATCH | BRW_NEW_VERTEX_PROGRAM), - .cache = CACHE_NEW_VS_PROG, + .mesa = _NEW_PROGRAM_CONSTANTS, + .brw = BRW_NEW_BATCH | + BRW_NEW_VERTEX_PROGRAM | + BRW_NEW_VS_PROG_DATA, }, .emit = brw_upload_vs_pull_constants, }; @@ -130,22 +140,18 @@ brw_upload_vs_ubo_surfaces(struct brw_context *brw) { struct gl_context *ctx = &brw->ctx; /* _NEW_PROGRAM */ - struct gl_shader_program *prog = - ctx->Shader.CurrentProgram[MESA_SHADER_VERTEX]; - - if (!prog) - return; + struct gl_program *prog = ctx->_Shader->CurrentProgram[MESA_SHADER_VERTEX]; - /* CACHE_NEW_VS_PROG */ - brw_upload_ubo_surfaces(brw, prog->_LinkedShaders[MESA_SHADER_VERTEX], - &brw->vs.base, &brw->vs.prog_data->base.base); + /* BRW_NEW_VS_PROG_DATA */ + brw_upload_ubo_surfaces(brw, prog, &brw->vs.base, brw->vs.base.prog_data); } const struct brw_tracked_state brw_vs_ubo_surfaces = { .dirty = { .mesa = _NEW_PROGRAM, - .brw = BRW_NEW_BATCH | BRW_NEW_UNIFORM_BUFFER, - .cache = CACHE_NEW_VS_PROG, + .brw = BRW_NEW_BATCH | + BRW_NEW_UNIFORM_BUFFER | + BRW_NEW_VS_PROG_DATA, }, .emit = brw_upload_vs_ubo_surfaces, }; @@ -153,23 +159,46 @@ const struct brw_tracked_state brw_vs_ubo_surfaces = { static void brw_upload_vs_abo_surfaces(struct brw_context *brw) { - struct gl_context *ctx = &brw->ctx; /* _NEW_PROGRAM */ - struct gl_shader_program *prog = - ctx->Shader.CurrentProgram[MESA_SHADER_VERTEX]; + const struct gl_program *vp = brw->programs[MESA_SHADER_VERTEX]; - if (prog) { - /* CACHE_NEW_VS_PROG */ - brw_upload_abo_surfaces(brw, prog, &brw->vs.base, - &brw->vs.prog_data->base.base); + if (vp) { + /* BRW_NEW_VS_PROG_DATA */ + brw_upload_abo_surfaces(brw, vp, &brw->vs.base, brw->vs.base.prog_data); } } const struct brw_tracked_state brw_vs_abo_surfaces = { .dirty = { .mesa = _NEW_PROGRAM, - .brw = BRW_NEW_BATCH | BRW_NEW_ATOMIC_BUFFER, - .cache = CACHE_NEW_VS_PROG, + .brw = BRW_NEW_ATOMIC_BUFFER | + BRW_NEW_BATCH | + BRW_NEW_VS_PROG_DATA, }, .emit = brw_upload_vs_abo_surfaces, }; + +static void +brw_upload_vs_image_surfaces(struct brw_context *brw) +{ + /* BRW_NEW_VERTEX_PROGRAM */ + const struct gl_program *vp = brw->programs[MESA_SHADER_VERTEX]; + + if (vp) { + /* BRW_NEW_VS_PROG_DATA, BRW_NEW_IMAGE_UNITS, _NEW_TEXTURE */ + brw_upload_image_surfaces(brw, vp, &brw->vs.base, + brw->vs.base.prog_data); + } +} + +const struct brw_tracked_state brw_vs_image_surfaces = { + .dirty = { + .mesa = _NEW_TEXTURE, + .brw = BRW_NEW_BATCH | + BRW_NEW_AUX_STATE | + BRW_NEW_IMAGE_UNITS | + BRW_NEW_VERTEX_PROGRAM | + BRW_NEW_VS_PROG_DATA, + }, + .emit = brw_upload_vs_image_surfaces, +};