#include "main/mtypes.h"
#include "program/prog_parameter.h"
+#include "main/shaderapi.h"
#include "brw_context.h"
#include "brw_state.h"
-
-
-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)
-{
- 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->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(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(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(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;
-}
+#include "intel_buffer_objects.h"
/* Creates a new VS constant buffer reflecting the current VS program's
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,
};
{
struct gl_context *ctx = &brw->ctx;
/* _NEW_PROGRAM */
- struct gl_shader_program *prog = ctx->Shader.CurrentProgram[MESA_SHADER_VERTEX];
+ struct gl_program *prog = ctx->_Shader->CurrentProgram[MESA_SHADER_VERTEX];
- if (!prog)
- return;
-
- /* 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,
};
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_BATCH | BRW_NEW_ATOMIC_BUFFER,
- .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,
};
projects / mesa.git / blobdiff