*/
#include "main/mtypes.h"
-#include "main/texstore.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
#include "brw_context.h"
#include "brw_state.h"
* state atom.
*/
static void
-prepare_vs_constants(struct brw_context *brw)
+brw_upload_vs_pull_constants(struct brw_context *brw)
{
- GLcontext *ctx = &brw->intel.ctx;
- struct intel_context *intel = &brw->intel;
+ /* BRW_NEW_VERTEX_PROGRAM */
struct brw_vertex_program *vp =
(struct brw_vertex_program *) brw->vertex_program;
- const struct gl_program_parameter_list *params = vp->program.Base.Parameters;
- const int size = params->NumParameters * 4 * sizeof(GLfloat);
int i;
- if (vp->program.IsNVProgram)
- _mesa_load_tracked_matrices(ctx);
-
/* 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);
+ _mesa_load_state_parameters(&brw->ctx, vp->program.Base.Parameters);
- /* BRW_NEW_VERTEX_PROGRAM */
- if (!vp->use_const_buffer) {
+ /* CACHE_NEW_VS_PROG */
+ if (!brw->vs.prog_data->base.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;
}
return;
/* _NEW_PROGRAM_CONSTANTS */
drm_intel_bo_unreference(brw->vs.const_bo);
- brw->vs.const_bo = drm_intel_bo_alloc(intel->bufmgr, "vp_const_buffer",
+ uint32_t size = brw->vs.prog_data->base.nr_pull_params * 4;
+ brw->vs.const_bo = drm_intel_bo_alloc(brw->bufmgr, "vp_const_buffer",
size, 64);
drm_intel_gem_bo_map_gtt(brw->vs.const_bo);
- for (i = 0; i < params->NumParameters; i++) {
- memcpy(brw->vs.const_bo->virtual + i * 4 * sizeof(float),
- params->ParameterValues[i],
- 4 * sizeof(float));
+ for (i = 0; i < brw->vs.prog_data->base.nr_pull_params; i++) {
+ memcpy(brw->vs.const_bo->virtual + i * 4,
+ brw->vs.prog_data->base.pull_param[i],
+ 4);
+ }
+
+ if (0) {
+ for (i = 0; i < ALIGN(brw->vs.prog_data->base.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",
+ i, row[0], row[1], row[2], row[3]);
+ }
}
+
drm_intel_gem_bo_unmap_gtt(brw->vs.const_bo);
+
+ const int surf = SURF_INDEX_VERT_CONST_BUFFER;
+ brw->vtbl.create_constant_surface(brw, brw->vs.const_bo, 0, size,
+ &brw->vs.surf_offset[surf], false);
+
brw->state.dirty.brw |= BRW_NEW_VS_CONSTBUF;
}
-const struct brw_tracked_state brw_vs_constants = {
+const struct brw_tracked_state brw_vs_pull_constants = {
.dirty = {
.mesa = (_NEW_PROGRAM_CONSTANTS),
- .brw = (BRW_NEW_VERTEX_PROGRAM),
- .cache = 0
+ .brw = (BRW_NEW_BATCH | BRW_NEW_VERTEX_PROGRAM),
+ .cache = CACHE_NEW_VS_PROG,
},
- .prepare = prepare_vs_constants,
+ .emit = brw_upload_vs_pull_constants,
};
-/**
- * Update the surface state for a VS constant buffer.
- *
- * Sets brw->vs.surf_bo[surf] and brw->vp->const_buffer.
- */
static void
-brw_update_vs_constant_surface( GLcontext *ctx,
- GLuint surf)
+brw_upload_vs_ubo_surfaces(struct brw_context *brw)
{
- struct brw_context *brw = brw_context(ctx);
- struct brw_surface_key key;
- struct brw_vertex_program *vp =
- (struct brw_vertex_program *) brw->vertex_program;
- const struct gl_program_parameter_list *params = vp->program.Base.Parameters;
+ struct gl_context *ctx = &brw->ctx;
+ /* _NEW_PROGRAM */
+ struct gl_shader_program *prog = ctx->Shader.CurrentVertexProgram;
- assert(surf == 0);
-
- /* If there's no constant buffer, then no surface BO is needed to point at
- * it.
- */
- if (brw->vs.const_bo == NULL) {
- drm_intel_bo_unreference(brw->vs.surf_bo[surf]);
- brw->vs.surf_bo[surf] = NULL;
+ if (!prog)
return;
- }
- memset(&key, 0, sizeof(key));
-
- key.format = MESA_FORMAT_RGBA_FLOAT32;
- key.internal_format = GL_RGBA;
- key.bo = brw->vs.const_bo;
- key.depthmode = GL_NONE;
- key.pitch = params->NumParameters;
- key.width = params->NumParameters;
- key.height = 1;
- key.depth = 1;
- key.cpp = 16;
-
- /*
- printf("%s:\n", __FUNCTION__);
- printf(" width %d height %d depth %d cpp %d pitch %d\n",
- key.width, key.height, key.depth, key.cpp, key.pitch);
- */
-
- drm_intel_bo_unreference(brw->vs.surf_bo[surf]);
- brw->vs.surf_bo[surf] = brw_search_cache(&brw->surface_cache,
- BRW_SS_SURFACE,
- &key, sizeof(key),
- &key.bo, 1,
- NULL);
- if (brw->vs.surf_bo[surf] == NULL) {
- brw->vs.surf_bo[surf] = brw_create_constant_surface(brw, &key);
- }
+ brw_upload_ubo_surfaces(brw, prog->_LinkedShaders[MESA_SHADER_VERTEX],
+ &brw->vs.surf_offset[SURF_INDEX_VS_UBO(0)]);
}
+const struct brw_tracked_state brw_vs_ubo_surfaces = {
+ .dirty = {
+ .mesa = _NEW_PROGRAM,
+ .brw = BRW_NEW_BATCH | BRW_NEW_UNIFORM_BUFFER,
+ .cache = 0,
+ },
+ .emit = brw_upload_vs_ubo_surfaces,
+};
/**
- * Constructs the binding table for the VS surface state.
- */
-static drm_intel_bo *
-brw_vs_get_binding_table(struct brw_context *brw)
-{
- drm_intel_bo *bind_bo;
-
- bind_bo = brw_search_cache(&brw->surface_cache, BRW_SS_SURF_BIND,
- NULL, 0,
- brw->vs.surf_bo, BRW_VS_MAX_SURF,
- NULL);
-
- if (bind_bo == NULL) {
- GLuint data_size = BRW_VS_MAX_SURF * sizeof(GLuint);
- uint32_t data[BRW_VS_MAX_SURF];
- int i;
-
- for (i = 0; i < BRW_VS_MAX_SURF; i++)
- if (brw->vs.surf_bo[i])
- data[i] = brw->vs.surf_bo[i]->offset;
- else
- data[i] = 0;
-
- bind_bo = brw_upload_cache( &brw->surface_cache, BRW_SS_SURF_BIND,
- NULL, 0,
- brw->vs.surf_bo, BRW_VS_MAX_SURF,
- data, data_size);
-
- /* Emit binding table relocations to surface state */
- for (i = 0; i < BRW_VS_MAX_SURF; i++) {
- if (brw->vs.surf_bo[i] != NULL) {
- /* The presumed offsets were set in the data values for
- * brw_upload_cache.
- */
- drm_intel_bo_emit_reloc(bind_bo, i * 4,
- brw->vs.surf_bo[i], 0,
- I915_GEM_DOMAIN_INSTRUCTION, 0);
- }
- }
- }
-
- return bind_bo;
-}
-
-/**
- * Vertex shader surfaces (constant buffer).
- *
- * This consumes the state updates for the constant buffer needing
- * to be updated, and produces BRW_NEW_NR_VS_SURFACES for the VS unit and
- * CACHE_NEW_SURF_BIND for the binding table upload.
+ * Constructs the binding table for the WM surface state, which maps unit
+ * numbers to surface state objects.
*/
-static void prepare_vs_surfaces(struct brw_context *brw )
+static void
+brw_vs_upload_binding_table(struct brw_context *brw)
{
- GLcontext *ctx = &brw->intel.ctx;
+ uint32_t *bind;
int i;
- int nr_surfaces = 0;
- brw_update_vs_constant_surface(ctx, SURF_INDEX_VERT_CONST_BUFFER);
-
- for (i = 0; i < BRW_VS_MAX_SURF; i++) {
- if (brw->vs.surf_bo[i] != NULL) {
- nr_surfaces = i + 1;
- }
+ if (INTEL_DEBUG & DEBUG_SHADER_TIME) {
+ gen7_create_shader_time_surface(brw, &brw->vs.surf_offset[SURF_INDEX_VS_SHADER_TIME]);
}
- if (brw->vs.nr_surfaces != nr_surfaces) {
- brw->state.dirty.brw |= BRW_NEW_NR_VS_SURFACES;
- brw->vs.nr_surfaces = nr_surfaces;
+ /* CACHE_NEW_VS_PROG: Skip making a binding table if we don't use textures or
+ * pull constants.
+ */
+ const unsigned entries = brw->vs.prog_data->base.binding_table_size;
+ if (entries == 0) {
+ if (brw->vs.bind_bo_offset != 0) {
+ brw->state.dirty.brw |= BRW_NEW_VS_BINDING_TABLE;
+ brw->vs.bind_bo_offset = 0;
+ }
+ return;
}
- /* Note that we don't end up updating the bind_bo if we don't have a
- * surface to be pointing at. This should be relatively harmless, as it
- * just slightly increases our working set size.
+ /* Might want to calculate nr_surfaces first, to avoid taking up so much
+ * space for the binding table.
*/
- if (brw->vs.nr_surfaces != 0) {
- drm_intel_bo_unreference(brw->vs.bind_bo);
- brw->vs.bind_bo = brw_vs_get_binding_table(brw);
+ bind = brw_state_batch(brw, AUB_TRACE_BINDING_TABLE,
+ sizeof(uint32_t) * entries,
+ 32, &brw->vs.bind_bo_offset);
+
+ /* BRW_NEW_SURFACES and BRW_NEW_VS_CONSTBUF */
+ for (i = 0; i < entries; i++) {
+ bind[i] = brw->vs.surf_offset[i];
}
+
+ brw->state.dirty.brw |= BRW_NEW_VS_BINDING_TABLE;
}
-const struct brw_tracked_state brw_vs_surfaces = {
+const struct brw_tracked_state brw_vs_binding_table = {
.dirty = {
.mesa = 0,
- .brw = (BRW_NEW_VS_CONSTBUF),
- .cache = 0
+ .brw = (BRW_NEW_BATCH |
+ BRW_NEW_VS_CONSTBUF |
+ BRW_NEW_SURFACES),
+ .cache = CACHE_NEW_VS_PROG
},
- .prepare = prepare_vs_surfaces,
+ .emit = brw_vs_upload_binding_table,
};
-
-
-
projects / mesa.git / blobdiff