diff options
| author | Paul Berry <stereotype441@gmail.com> | 2013-08-24 08:24:57 -0700 |
|---|---|---|
| committer | Paul Berry <stereotype441@gmail.com> | 2013-08-31 17:11:05 -0700 |
| commit | ec94e3c3d02857e26ba66e7e6a4b54044c820a0a (patch) | |
| tree | a7041f672def8f00315d961f26e3a6d1be429e4b /src/mesa/drivers/dri/i965/brw_vs.c | |
| parent | cdf03b69282d12f9d27daf2edb3abb351f5de7f6 (diff) | |
| download | external_mesa3d-ec94e3c3d02857e26ba66e7e6a4b54044c820a0a.zip external_mesa3d-ec94e3c3d02857e26ba66e7e6a4b54044c820a0a.tar.gz external_mesa3d-ec94e3c3d02857e26ba66e7e6a4b54044c820a0a.tar.bz2 | |
i965: Move data from brw->vs into a base class if gs will also need it.
This paves the way for sharing the code that will set up the vertex
and geometry shader pipeline state.
v2: Rename the base class to brw_stage_state.
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_vs.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c index 43abd89..364a77a 100644 --- a/src/mesa/drivers/dri/i965/brw_vs.c +++ b/src/mesa/drivers/dri/i965/brw_vs.c @@ -299,7 +299,7 @@ do_vs_prog(struct brw_context *brw, prog_data.base.total_scratch = brw_get_scratch_size(c.base.last_scratch*REG_SIZE); - brw_get_scratch_bo(brw, &brw->vs.scratch_bo, + brw_get_scratch_bo(brw, &brw->vs.base.scratch_bo, prog_data.base.total_scratch * brw->max_vs_threads); } @@ -307,7 +307,7 @@ do_vs_prog(struct brw_context *brw, &c.key, sizeof(c.key), program, program_size, &prog_data, sizeof(prog_data), - &brw->vs.prog_offset, &brw->vs.prog_data); + &brw->vs.base.prog_offset, &brw->vs.prog_data); ralloc_free(mem_ctx); return true; @@ -436,7 +436,7 @@ static void brw_upload_vs_prog(struct brw_context *brw) } /* _NEW_TEXTURE */ - brw_populate_sampler_prog_key_data(ctx, prog, brw->vs.sampler_count, + brw_populate_sampler_prog_key_data(ctx, prog, brw->vs.base.sampler_count, &key.base.tex); /* BRW_NEW_VERTICES */ @@ -478,7 +478,7 @@ static void brw_upload_vs_prog(struct brw_context *brw) if (!brw_search_cache(&brw->cache, BRW_VS_PROG, &key, sizeof(key), - &brw->vs.prog_offset, &brw->vs.prog_data)) { + &brw->vs.base.prog_offset, &brw->vs.prog_data)) { bool success = do_vs_prog(brw, ctx->Shader.CurrentVertexProgram, vp, &key); (void) success; @@ -516,7 +516,7 @@ brw_vs_precompile(struct gl_context *ctx, struct gl_shader_program *prog) { struct brw_context *brw = brw_context(ctx); struct brw_vs_prog_key key; - uint32_t old_prog_offset = brw->vs.prog_offset; + uint32_t old_prog_offset = brw->vs.base.prog_offset; struct brw_vs_prog_data *old_prog_data = brw->vs.prog_data; bool success; @@ -546,7 +546,7 @@ brw_vs_precompile(struct gl_context *ctx, struct gl_shader_program *prog) success = do_vs_prog(brw, prog, bvp, &key); - brw->vs.prog_offset = old_prog_offset; + brw->vs.base.prog_offset = old_prog_offset; brw->vs.prog_data = old_prog_data; return success; |