/*
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
**********************************************************************/
/*
* Authors:
- * Keith Whitwell <keith@tungstengraphics.com>
+ * Keith Whitwell <keithw@vmware.com>
*/
#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 new VS constant buffer reflecting the current VS program's
* constants, if needed by the VS program.
static void
brw_upload_vs_pull_constants(struct brw_context *brw)
{
- struct gl_context *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;
- 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);
-
- /* 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;
- }
- 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",
- brw->vs.prog_data->nr_pull_params * 4,
- 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],
- 4);
- }
+ struct brw_stage_state *stage_state = &brw->vs.base;
- if (0) {
- for (i = 0; i < params->NumParameters; 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);
+ /* BRW_NEW_VERTEX_PROGRAM */
+ struct brw_program *vp =
+ (struct brw_program *) brw->programs[MESA_SHADER_VERTEX];
- const int surf = SURF_INDEX_VERT_CONST_BUFFER;
- intel->vtbl.create_constant_surface(brw, brw->vs.const_bo, 0,
- params->NumParameters,
- &brw->vs.surf_offset[surf]);
+ /* BRW_NEW_VS_PROG_DATA */
+ const struct brw_stage_prog_data *prog_data = brw->vs.base.prog_data;
- brw->state.dirty.brw |= BRW_NEW_VS_CONSTBUF;
+ _mesa_shader_write_subroutine_indices(&brw->ctx, MESA_SHADER_VERTEX);
+ /* _NEW_PROGRAM_CONSTANTS */
+ 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,
};
-/**
- * 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_ubo_surfaces(struct brw_context *brw)
{
- uint32_t *bind;
- int i;
-
- /* 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;
- }
+ struct gl_context *ctx = &brw->ctx;
+ /* _NEW_PROGRAM */
+ struct gl_program *prog = ctx->_Shader->CurrentProgram[MESA_SHADER_VERTEX];
- /* 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);
+ /* BRW_NEW_VS_PROG_DATA */
+ brw_upload_ubo_surfaces(brw, prog, &brw->vs.base, brw->vs.base.prog_data);
+}
- /* BRW_NEW_SURFACES and BRW_NEW_VS_CONSTBUF */
- for (i = 0; i < BRW_MAX_VS_SURFACES; i++) {
- bind[i] = brw->vs.surf_offset[i];
- }
+const struct brw_tracked_state brw_vs_ubo_surfaces = {
+ .dirty = {
+ .mesa = _NEW_PROGRAM,
+ .brw = BRW_NEW_BATCH |
+ BRW_NEW_UNIFORM_BUFFER |
+ BRW_NEW_VS_PROG_DATA,
+ },
+ .emit = brw_upload_vs_ubo_surfaces,
+};
- brw->state.dirty.brw |= BRW_NEW_VS_BINDING_TABLE;
+static void
+brw_upload_vs_image_surfaces(struct brw_context *brw)
+{
+ /* BRW_NEW_VERTEX_PROGRAM */
+ const struct gl_program *vp = brw->programs[MESA_SHADER_VERTEX];
+
+ 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_binding_table = {
+const struct brw_tracked_state brw_vs_image_surfaces = {
.dirty = {
- .mesa = 0,
- .brw = (BRW_NEW_BATCH |
- BRW_NEW_VS_CONSTBUF |
- BRW_NEW_SURFACES),
- .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_vs_upload_binding_table,
+ .emit = brw_upload_vs_image_surfaces,
};
projects / mesa.git / blobdiff