fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 04:40:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: Make the userclip flag for the VUE map come from VS prog data.

Browse source 
This reduces recomputation of state based on non-clipping-related
transform changes, and is a step toward removing VUE map
recomputation.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Eric Anholt 2012-02-13 10:00:14 -08:00
parent b5c409363c
commit 9f3d3216cf
10 changed files with 29 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/drivers/dri/i965/brw_clip.c
View file

@ -69,7 +69,7 @@ static void compile_clip_prog( struct brw_context *brw,
c.func.single_program_flow = 1;
c.key = *key;
brw_compute_vue_map(&c.vue_map, intel, c.key.nr_userclip > 0, c.key.attrs);
brw_compute_vue_map(&c.vue_map, intel, brw->vs.prog_data);
/* nr_regs is the number of registers filled by reading data from the VUE.
* This program accesses the entire VUE, so nr_regs needs to be the size of
@ -145,12 +145,12 @@ brw_upload_clip_prog(struct brw_context *brw)
*/
/* BRW_NEW_REDUCED_PRIMITIVE */
key.primitive = brw->intel.reduced_primitive;
/* CACHE_NEW_VS_PROG */
/* CACHE_NEW_VS_PROG (also part of VUE map) */
key.attrs = brw->vs.prog_data->outputs_written;
/* _NEW_LIGHT */
key.do_flat_shading = (ctx->Light.ShadeModel == GL_FLAT);
key.pv_first = (ctx->Light.ProvokingVertex == GL_FIRST_VERTEX_CONVENTION);
/* _NEW_TRANSFORM */
/* _NEW_TRANSFORM (also part of VUE map)*/
key.nr_userclip = _mesa_bitcount_64(ctx->Transform.ClipPlanesEnabled);
if (intel->gen == 5)

4
src/mesa/drivers/dri/i965/brw_context.h
View file

@ -400,6 +400,7 @@ struct brw_vs_prog_data {
bool uses_new_param_layout;
bool uses_vertexid;
bool userclip;
};
@ -1046,8 +1047,7 @@ int brw_disasm (FILE *file, struct brw_instruction *inst, int gen);
/* brw_vs.c */
void brw_compute_vue_map(struct brw_vue_map *vue_map,
const struct intel_context *intel,
bool userclip_active,
GLbitfield64 outputs_written);
const struct brw_vs_prog_data *prog_data);
gl_clip_plane *brw_select_clip_planes(struct gl_context *ctx);
/* brw_wm.c */

10
src/mesa/drivers/dri/i965/brw_gs.c
View file

@ -56,8 +56,7 @@ static void compile_gs_prog( struct brw_context *brw,
memset(&c, 0, sizeof(c));
c.key = *key;
/* The geometry shader needs to access the entire VUE. */
brw_compute_vue_map(&c.vue_map, intel, c.key.userclip_active, c.key.attrs);
brw_compute_vue_map(&c.vue_map, intel, brw->vs.prog_data);
c.nr_regs = (c.vue_map.num_slots + 1)/2;
mem_ctx = NULL;
@ -166,7 +165,7 @@ static void populate_key( struct brw_context *brw,
memset(key, 0, sizeof(*key));
/* CACHE_NEW_VS_PROG */
/* CACHE_NEW_VS_PROG (part of VUE map) */
key->attrs = brw->vs.prog_data->outputs_written;
/* BRW_NEW_PRIMITIVE */
@ -181,8 +180,8 @@ static void populate_key( struct brw_context *brw,
key->pv_first = true;
}
/* _NEW_TRANSFORM */
key->userclip_active = (ctx->Transform.ClipPlanesEnabled != 0);
/* CACHE_NEW_VS_PROG (part of VUE map)*/
key->userclip_active = brw->vs.prog_data->userclip;
if (intel->gen >= 7) {
/* On Gen7 and later, we don't use GS (yet). */
@ -267,7 +266,6 @@ brw_upload_gs_prog(struct brw_context *brw)
const struct brw_tracked_state brw_gs_prog = {
.dirty = {
.mesa = (_NEW_LIGHT |
_NEW_TRANSFORM |
_NEW_TRANSFORM_FEEDBACK |
_NEW_RASTERIZER_DISCARD),
.brw = BRW_NEW_PRIMITIVE,

2
src/mesa/drivers/dri/i965/brw_sf.c
View file

@ -63,7 +63,7 @@ static void compile_sf_prog( struct brw_context *brw,
brw_init_compile(brw, &c.func, mem_ctx);
c.key = *key;
brw_compute_vue_map(&c.vue_map, intel, c.key.userclip_active, c.key.attrs);
brw_compute_vue_map(&c.vue_map, intel, brw->vs.prog_data);
c.urb_entry_read_offset = brw_sf_compute_urb_entry_read_offset(intel);
c.nr_attr_regs = (c.vue_map.num_slots + 1)/2 - c.urb_entry_read_offset;
c.nr_setup_regs = c.nr_attr_regs;

3
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
View file

@ -2252,8 +2252,7 @@ vec4_visitor::emit_urb_writes()
/* FINISHME: edgeflag */
brw_compute_vue_map(&c->vue_map, intel, c->key.userclip_active,
c->prog_data.outputs_written);
brw_compute_vue_map(&c->vue_map, intel, &c->prog_data);
/* First mrf is the g0-based message header containing URB handles and such,
* which is implied in VS_OPCODE_URB_WRITE.

9
src/mesa/drivers/dri/i965/brw_vs.c
View file

@ -52,13 +52,18 @@ static inline void assign_vue_slot(struct brw_vue_map *vue_map,
/**
* Compute the VUE map for vertex shader program.
*
* Note that consumers of this map using cache keys must include
* prog_data->userclip and prog_data->outputs_written in their key
* (generated by CACHE_NEW_VS_PROG).
*/
void
brw_compute_vue_map(struct brw_vue_map *vue_map,
const struct intel_context *intel,
bool userclip_active,
GLbitfield64 outputs_written)
const struct brw_vs_prog_data *prog_data)
{
bool userclip_active = prog_data->userclip;
GLbitfield64 outputs_written = prog_data->outputs_written;
int i;
vue_map->num_slots = 0;

4
src/mesa/drivers/dri/i965/brw_vs_emit.c
View file

@ -173,6 +173,7 @@ static inline bool can_use_direct_mrf(int vert_result,
*/
static void brw_vs_alloc_regs( struct brw_vs_compile *c )
{
struct brw_context *brw = c->func.brw;
struct intel_context *intel = &c->func.brw->intel;
GLuint i, reg = 0, slot;
int attributes_in_vue;
@ -325,8 +326,7 @@ static void brw_vs_alloc_regs( struct brw_vs_compile *c )
/* Allocate outputs. The non-position outputs go straight into message regs.
*/
brw_compute_vue_map(&c->vue_map, intel, c->key.userclip_active,
c->prog_data.outputs_written);
brw_compute_vue_map(&c->vue_map, intel, &c->prog_data);
c->first_output = reg;
first_reladdr_output = get_first_reladdr_output(&c->vp->program);

12
src/mesa/drivers/dri/i965/gen6_sf_state.c
View file

@ -114,8 +114,6 @@ upload_sf_state(struct brw_context *brw)
struct gl_context *ctx = &intel->ctx;
struct brw_vue_map vue_map;
uint32_t urb_entry_read_length;
/* CACHE_NEW_VS_PROG */
GLbitfield64 vs_outputs_written = brw->vs.prog_data->outputs_written;
/* BRW_NEW_FRAGMENT_PROGRAM */
uint32_t num_outputs = _mesa_bitcount_64(brw->fragment_program->Base.InputsRead);
/* _NEW_LIGHT */
@ -128,13 +126,10 @@ upload_sf_state(struct brw_context *brw)
int urb_entry_read_offset = 1;
float point_size;
uint16_t attr_overrides[FRAG_ATTRIB_MAX];
bool userclip_active;
uint32_t point_sprite_origin;
/* _NEW_TRANSFORM */
userclip_active = (ctx->Transform.ClipPlanesEnabled != 0);
brw_compute_vue_map(&vue_map, intel, userclip_active, vs_outputs_written);
/* CACHE_NEW_VS_PROG */
brw_compute_vue_map(&vue_map, intel, brw->vs.prog_data);
urb_entry_read_length = (vue_map.num_slots + 1)/2 - urb_entry_read_offset;
if (urb_entry_read_length == 0) {
/* Setting the URB entry read length to 0 causes undefined behavior, so
@ -342,8 +337,7 @@ const struct brw_tracked_state gen6_sf_state = {
_NEW_LINE |
_NEW_SCISSOR |
_NEW_BUFFERS |
_NEW_POINT |
_NEW_TRANSFORM),
_NEW_POINT),
.brw = (BRW_NEW_CONTEXT |
BRW_NEW_FRAGMENT_PROGRAM),
.cache = CACHE_NEW_VS_PROG

10
src/mesa/drivers/dri/i965/gen7_sf_state.c
View file

@ -35,8 +35,6 @@ upload_sbe_state(struct brw_context *brw)
struct gl_context *ctx = &intel->ctx;
struct brw_vue_map vue_map;
uint32_t urb_entry_read_length;
/* CACHE_NEW_VS_PROG */
GLbitfield64 vs_outputs_written = brw->vs.prog_data->outputs_written;
/* BRW_NEW_FRAGMENT_PROGRAM */
uint32_t num_outputs = _mesa_bitcount_64(brw->fragment_program->Base.InputsRead);
/* _NEW_LIGHT */
@ -44,15 +42,14 @@ upload_sbe_state(struct brw_context *brw)
uint32_t dw1, dw10, dw11;
int i;
int attr = 0, input_index = 0;
/* _NEW_TRANSFORM */
int urb_entry_read_offset = 1;
bool userclip_active = (ctx->Transform.ClipPlanesEnabled != 0);
uint16_t attr_overrides[FRAG_ATTRIB_MAX];
/* _NEW_BUFFERS */
bool render_to_fbo = ctx->DrawBuffer->Name != 0;
uint32_t point_sprite_origin;
brw_compute_vue_map(&vue_map, intel, userclip_active, vs_outputs_written);
/* CACHE_NEW_VS_PROG */
brw_compute_vue_map(&vue_map, intel, brw->vs.prog_data);
urb_entry_read_length = (vue_map.num_slots + 1)/2 - urb_entry_read_offset;
if (urb_entry_read_length == 0) {
/* Setting the URB entry read length to 0 causes undefined behavior, so
@ -146,8 +143,7 @@ const struct brw_tracked_state gen7_sbe_state = {
.dirty = {
.mesa = (_NEW_LIGHT |
_NEW_POINT |
_NEW_PROGRAM |
_NEW_TRANSFORM),
_NEW_PROGRAM),
.brw = (BRW_NEW_CONTEXT |
BRW_NEW_FRAGMENT_PROGRAM),
.cache = CACHE_NEW_VS_PROG

8
src/mesa/drivers/dri/i965/gen7_sol_state.c
View file

@ -241,9 +241,8 @@ upload_sol_state(struct brw_context *brw)
bool active = xfb_obj->Active && !xfb_obj->Paused;
struct brw_vue_map vue_map;
/* _NEW_TRANSFORM, CACHE_NEW_VS_PROG */
brw_compute_vue_map(&vue_map, intel, ctx->Transform.ClipPlanesEnabled != 0,
brw->vs.prog_data->outputs_written);
/* CACHE_NEW_VS_PROG */
brw_compute_vue_map(&vue_map, intel, brw->vs.prog_data);
if (active) {
upload_3dstate_so_buffers(brw);
@ -264,8 +263,7 @@ const struct brw_tracked_state gen7_sol_state = {
.dirty = {
.mesa = (_NEW_RASTERIZER_DISCARD |
_NEW_LIGHT |
_NEW_TRANSFORM_FEEDBACK |
_NEW_TRANSFORM),
_NEW_TRANSFORM_FEEDBACK),
.brw = (BRW_NEW_BATCH |
BRW_NEW_VERTEX_PROGRAM),
.cache = CACHE_NEW_VS_PROG,