diff options
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vs.c | 18 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vs.h | 1 |
2 files changed, 1 insertions, 18 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c index 551f97717a5..a837c44ffff 100644 --- a/src/mesa/drivers/dri/i965/brw_vs.c +++ b/src/mesa/drivers/dri/i965/brw_vs.c @@ -313,24 +313,10 @@ do_vs_prog(struct brw_context *brw, */ program = brw_get_program(&c.func, &program_size); - /* We upload from &c.prog_data including the constant_map assuming - * they're packed together. It would be nice to have a - * compile-time assert macro here. - */ - assert(c.constant_map == (int8_t *)&c.prog_data + - sizeof(c.prog_data)); - assert(ctx->Const.VertexProgram.MaxNativeParameters == - ARRAY_SIZE(c.constant_map)); - (void) ctx; - - aux_size = sizeof(c.prog_data); - /* constant_map */ - aux_size += c.vp->program.Base.Parameters->NumParameters; - brw_upload_cache(&brw->cache, BRW_VS_PROG, &c.key, sizeof(c.key), program, program_size, - &c.prog_data, aux_size, + &c.prog_data, sizeof(c.prog_data), &brw->vs.prog_offset, &brw->vs.prog_data); ralloc_free(mem_ctx); @@ -476,8 +462,6 @@ static void brw_upload_vs_prog(struct brw_context *brw) assert(success); } - brw->vs.constant_map = ((int8_t *)brw->vs.prog_data + - sizeof(*brw->vs.prog_data)); } /* See brw_vs.c: diff --git a/src/mesa/drivers/dri/i965/brw_vs.h b/src/mesa/drivers/dri/i965/brw_vs.h index 32959c879e6..8edc92f16e9 100644 --- a/src/mesa/drivers/dri/i965/brw_vs.h +++ b/src/mesa/drivers/dri/i965/brw_vs.h @@ -86,7 +86,6 @@ struct brw_vs_compile { struct brw_compile func; struct brw_vs_prog_key key; struct brw_vs_prog_data prog_data; - int8_t constant_map[1024]; struct brw_vertex_program *vp; |