diff options
Diffstat (limited to 'src/mesa/drivers/dri')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_state.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vs_surface_state.c | 63 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_constant_state.c | 64 |
3 files changed, 65 insertions, 64 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_state.h b/src/mesa/drivers/dri/i965/brw_state.h index d72f32fbd79..ab91d96df8a 100644 --- a/src/mesa/drivers/dri/i965/brw_state.h +++ b/src/mesa/drivers/dri/i965/brw_state.h @@ -233,7 +233,7 @@ void brw_emit_sampler_state(struct brw_context *brw, bool non_normalized_coordinates, uint32_t border_color_offset); -/* brw_vs_surface_state.c */ +/* gen6_constant_state.c */ void brw_upload_pull_constants(struct brw_context *brw, GLbitfield64 brw_new_constbuf, 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 23f841ecc31..24c22e087d9 100644 --- a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c @@ -37,69 +37,6 @@ #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, - GLbitfield64 brw_new_constbuf, - const struct gl_program *prog, - struct brw_stage_state *stage_state, - const struct brw_stage_prog_data *prog_data) -{ - unsigned 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->ctx.NewDriverState |= 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); - - /* 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); - - 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]); - brw_bo_unreference(const_bo); - - brw->ctx.NewDriverState |= brw_new_constbuf; -} - /* Creates a new VS constant buffer reflecting the current VS program's * constants, if needed by the VS program. diff --git a/src/mesa/drivers/dri/i965/gen6_constant_state.c b/src/mesa/drivers/dri/i965/gen6_constant_state.c index 72f00d56404..9bb79cf849f 100644 --- a/src/mesa/drivers/dri/i965/gen6_constant_state.c +++ b/src/mesa/drivers/dri/i965/gen6_constant_state.c @@ -123,3 +123,67 @@ gen6_upload_push_constants(struct brw_context *brw, stage_state->push_constants_dirty = true; } + + +/** + * 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, + GLbitfield64 brw_new_constbuf, + const struct gl_program *prog, + struct brw_stage_state *stage_state, + const struct brw_stage_prog_data *prog_data) +{ + unsigned 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->ctx.NewDriverState |= 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); + + /* 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); + + 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]); + brw_bo_unreference(const_bo); + + brw->ctx.NewDriverState |= brw_new_constbuf; +} |