X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fi965%2Fbrw_vs_surface_state.c;h=e3fa6386941c41b82d98b2ae74615464db9a4f69;hb=877128505431adaf817dc8069172ebe4a1cdf5d8;hp=6c0b690818f139f3a13e02ebc86d5b873f2961a5;hpb=2f41a601455e6e0366e28b6b84871842cb4bd341;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 6c0b690818f..e3fa6386941 100644 --- a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c @@ -1,6 +1,6 @@ /* Copyright (C) Intel Corp. 2006. All Rights Reserved. - Intel funded Tungsten Graphics (http://www.tungstengraphics.com) to + Intel funded Tungsten Graphics to develop this 3D driver. Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +26,7 @@ **********************************************************************/ /* * Authors: - * Keith Whitwell + * Keith Whitwell */ #include "main/mtypes.h" @@ -35,65 +35,85 @@ #include "brw_context.h" #include "brw_state.h" -/* Creates a new VS constant buffer reflecting the current VS program's - * constants, if needed by the VS program. - * - * Otherwise, constants go through the CURBEs using the brw_constant_buffer - * state atom. - */ -static void -brw_upload_vs_pull_constants(struct brw_context *brw) + +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) { - struct intel_context *intel = &brw->intel; - /* BRW_NEW_VERTEX_PROGRAM */ - struct brw_vertex_program *vp = - (struct brw_vertex_program *) brw->vertex_program; int i; + uint32_t surf_index = prog_data->base.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->intel.ctx, vp->program.Base.Parameters); - - /* CACHE_NEW_VS_PROG */ - if (!brw->vs.prog_data->nr_pull_params) { - if (brw->vs.const_bo) { - drm_intel_bo_unreference(brw->vs.const_bo); - brw->vs.const_bo = NULL; - brw->vs.surf_offset[SURF_INDEX_VERT_CONST_BUFFER] = 0; - brw->state.dirty.brw |= BRW_NEW_VS_CONSTBUF; + _mesa_load_state_parameters(&brw->ctx, prog->Parameters); + + if (!prog_data->nr_pull_params) { + if (stage_state->const_bo) { + drm_intel_bo_unreference(stage_state->const_bo); + stage_state->const_bo = NULL; + stage_state->surf_offset[surf_index] = 0; + brw->state.dirty.brw |= brw_new_constbuf; } return; } /* _NEW_PROGRAM_CONSTANTS */ - drm_intel_bo_unreference(brw->vs.const_bo); - uint32_t size = brw->vs.prog_data->nr_pull_params * 4; - brw->vs.const_bo = drm_intel_bo_alloc(intel->bufmgr, "vp_const_buffer", - size, 64); - - drm_intel_gem_bo_map_gtt(brw->vs.const_bo); - for (i = 0; i < brw->vs.prog_data->nr_pull_params; i++) { - memcpy(brw->vs.const_bo->virtual + i * 4, - brw->vs.prog_data->pull_param[i], + drm_intel_bo_unreference(stage_state->const_bo); + uint32_t size = prog_data->nr_pull_params * 4; + stage_state->const_bo = drm_intel_bo_alloc(brw->bufmgr, "vec4_const_buffer", + size, 64); + + drm_intel_gem_bo_map_gtt(stage_state->const_bo); + + for (i = 0; i < prog_data->nr_pull_params; i++) { + memcpy(stage_state->const_bo->virtual + i * 4, + prog_data->pull_param[i], 4); } if (0) { - for (i = 0; i < ALIGN(brw->vs.prog_data->nr_pull_params, 4) / 4; i++) { - float *row = (float *)brw->vs.const_bo->virtual + i * 4; - printf("vs const surface %3d: %4.3f %4.3f %4.3f %4.3f\n", + for (i = 0; i < ALIGN(prog_data->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]); } } - drm_intel_gem_bo_unmap_gtt(brw->vs.const_bo); + drm_intel_gem_bo_unmap_gtt(stage_state->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; +} + + +/* Creates a new VS constant buffer reflecting the current VS program's + * constants, if needed by the VS program. + * + * Otherwise, constants go through the CURBEs using the brw_constant_buffer + * state atom. + */ +static void +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; - const int surf = SURF_INDEX_VERT_CONST_BUFFER; - intel->vtbl.create_constant_surface(brw, brw->vs.const_bo, 0, size, - &brw->vs.surf_offset[surf]); + /* CACHE_NEW_VS_PROG */ + const struct brw_vec4_prog_data *prog_data = &brw->vs.prog_data->base; - brw->state.dirty.brw |= BRW_NEW_VS_CONSTBUF; + /* _NEW_PROGRAM_CONSTANTS */ + brw_upload_vec4_pull_constants(brw, BRW_NEW_VS_CONSTBUF, &vp->program.Base, + stage_state, prog_data); } const struct brw_tracked_state brw_vs_pull_constants = { @@ -108,77 +128,46 @@ const struct brw_tracked_state brw_vs_pull_constants = { static void brw_upload_vs_ubo_surfaces(struct brw_context *brw) { - struct gl_context *ctx = &brw->intel.ctx; + struct gl_context *ctx = &brw->ctx; /* _NEW_PROGRAM */ struct gl_shader_program *prog = ctx->Shader.CurrentVertexProgram; if (!prog) return; + /* CACHE_NEW_VS_PROG */ brw_upload_ubo_surfaces(brw, prog->_LinkedShaders[MESA_SHADER_VERTEX], - &brw->vs.surf_offset[SURF_INDEX_VS_UBO(0)]); + &brw->vs.base, &brw->vs.prog_data->base.base); } const struct brw_tracked_state brw_vs_ubo_surfaces = { .dirty = { - .mesa = (_NEW_PROGRAM | - _NEW_BUFFER_OBJECT), - .brw = BRW_NEW_BATCH, - .cache = 0, + .mesa = _NEW_PROGRAM, + .brw = BRW_NEW_BATCH | BRW_NEW_UNIFORM_BUFFER, + .cache = CACHE_NEW_VS_PROG, }, .emit = brw_upload_vs_ubo_surfaces, }; -/** - * Constructs the binding table for the WM surface state, which maps unit - * numbers to surface state objects. - */ static void -brw_vs_upload_binding_table(struct brw_context *brw) +brw_upload_vs_abo_surfaces(struct brw_context *brw) { - uint32_t *bind; - int i; - - if (INTEL_DEBUG & DEBUG_SHADER_TIME) { - gen7_create_shader_time_surface(brw, &brw->vs.surf_offset[SURF_INDEX_VS_SHADER_TIME]); - - assert(brw->vs.prog_data->num_surfaces <= SURF_INDEX_VS_SHADER_TIME); - brw->vs.prog_data->num_surfaces = SURF_INDEX_VS_SHADER_TIME; - } - - /* CACHE_NEW_VS_PROG: Skip making a binding table if we don't use textures or - * pull constants. - */ - if (brw->vs.prog_data->num_surfaces == 0) { - if (brw->vs.bind_bo_offset != 0) { - brw->state.dirty.brw |= BRW_NEW_VS_BINDING_TABLE; - brw->vs.bind_bo_offset = 0; - } - return; - } - - /* Might want to calculate nr_surfaces first, to avoid taking up so much - * space for the binding table. - */ - bind = brw_state_batch(brw, AUB_TRACE_BINDING_TABLE, - sizeof(uint32_t) * BRW_MAX_VS_SURFACES, - 32, &brw->vs.bind_bo_offset); + struct gl_context *ctx = &brw->ctx; + /* _NEW_PROGRAM */ + struct gl_shader_program *prog = ctx->Shader.CurrentVertexProgram; - /* BRW_NEW_SURFACES and BRW_NEW_VS_CONSTBUF */ - for (i = 0; i < BRW_MAX_VS_SURFACES; i++) { - bind[i] = brw->vs.surf_offset[i]; + if (prog) { + /* CACHE_NEW_VS_PROG */ + brw_upload_abo_surfaces(brw, prog, &brw->vs.base, + &brw->vs.prog_data->base.base); } - - brw->state.dirty.brw |= BRW_NEW_VS_BINDING_TABLE; } -const struct brw_tracked_state brw_vs_binding_table = { +const struct brw_tracked_state brw_vs_abo_surfaces = { .dirty = { - .mesa = 0, - .brw = (BRW_NEW_BATCH | - BRW_NEW_VS_CONSTBUF | - BRW_NEW_SURFACES), - .cache = CACHE_NEW_VS_PROG + .mesa = _NEW_PROGRAM, + .brw = BRW_NEW_BATCH | BRW_NEW_ATOMIC_BUFFER, + .cache = CACHE_NEW_VS_PROG, }, - .emit = brw_vs_upload_binding_table, + .emit = brw_upload_vs_abo_surfaces, };