X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fi965%2Fbrw_vs_surface_state.c;h=289c791b872db2bf8a42d95716043eb6597c79a3;hb=e81de67d858ce2d6bde9f4c7b06a05ec3c1f4f2b;hp=36653be11b9d75c86a71d6bb17b321e9dac787aa;hpb=bea9b8e306e8424ffacbdfc99ca2fc91f1c9912b;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 36653be11b9..289c791b872 100644 --- a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c @@ -31,76 +31,12 @@ #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_pull_constants(struct brw_context *brw, - GLbitfield brw_new_constbuf, - const struct gl_program *prog, - struct brw_stage_state *stage_state, - const struct brw_stage_prog_data *prog_data, - bool dword_pitch) -{ - int i; - uint32_t surf_index = prog_data->binding_table.pull_constants_start; - - 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; - } - return; - } - - /* Updates the ParamaterValues[i] pointers for all parameters of the - * basic type of PROGRAM_STATE_VAR. - */ - _mesa_load_state_parameters(&brw->ctx, prog->Parameters); - - /* CACHE_NEW_*_PROG | _NEW_PROGRAM_CONSTANTS */ - uint32_t size = prog_data->nr_pull_params * 4; - drm_intel_bo *const_bo = NULL; - uint32_t const_offset; - gl_constant_value *constants = intel_upload_space(brw, size, 64, - &const_bo, &const_offset); - - STATIC_ASSERT(sizeof(gl_constant_value) == sizeof(float)); - - 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->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); - } - } - - brw_create_constant_surface(brw, const_bo, const_offset, size, - &stage_state->surf_offset[surf_index], - dword_pitch); - drm_intel_bo_unreference(const_bo); - - brw->state.dirty.brw |= brw_new_constbuf; -} - /* Creates a new VS constant buffer reflecting the current VS program's * constants, if needed by the VS program. @@ -114,23 +50,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_stage_prog_data *prog_data = &brw->vs.prog_data->base.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_pull_constants(brw, BRW_NEW_VS_CONSTBUF, &vp->program.Base, - stage_state, prog_data, false); + 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, + BRW_NEW_VERTEX_PROGRAM | + BRW_NEW_VS_PROG_DATA, }, .emit = brw_upload_vs_pull_constants, }; @@ -140,48 +77,43 @@ 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_NEW_UNIFORM_BUFFER | + BRW_NEW_VS_PROG_DATA, }, .emit = brw_upload_vs_ubo_surfaces, }; static void -brw_upload_vs_abo_surfaces(struct brw_context *brw) +brw_upload_vs_image_surfaces(struct brw_context *brw) { - struct gl_context *ctx = &brw->ctx; - /* _NEW_PROGRAM */ - struct gl_shader_program *prog = - ctx->_Shader->CurrentProgram[MESA_SHADER_VERTEX]; + /* BRW_NEW_VERTEX_PROGRAM */ + 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_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_abo_surfaces = { +const struct brw_tracked_state brw_vs_image_surfaces = { .dirty = { - .mesa = _NEW_PROGRAM, - .brw = BRW_NEW_ATOMIC_BUFFER | - BRW_NEW_BATCH, - .cache = CACHE_NEW_VS_PROG, + .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_abo_surfaces, + .emit = brw_upload_vs_image_surfaces, };