AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965: Only call brw_upload_tcs/tes_prog when using tessellation.

Browse Source 
If there's no evaluation shader, tessellation is disabled.  The upload
functions would just bail.  Instead, don't bother calling them.

This will simplify the optional-TCS case a bit, as brw_upload_tcs can
assume that we're doing tessellation.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Kenneth Graunke
2015-12-15 03:04:50 -08:00
parent 2bcf989407
commit 8498cb4a45
3 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/i965/brw_state_upload.c
+9 -2
View File
@@ -678,8 +678,15 @@ brw_upload_programs(struct brw_context *brw,
{
if (pipeline == BRW_RENDER_PIPELINE) {
brw_upload_vs_prog(brw);
brw_upload_tcs_prog(brw);
brw_upload_tes_prog(brw);
if (brw->tess_eval_program) {
brw_upload_tcs_prog(brw);
brw_upload_tes_prog(brw);
} else {
brw->tcs.prog_data = NULL;
brw->tcs.base.prog_data = NULL;
brw->tes.prog_data = NULL;
brw->tes.base.prog_data = NULL;
}
if (brw->gen < 6)
brw_upload_ff_gs_prog(brw);
src/mesa/drivers/dri/i965/brw_tcs.c
+4 -13
View File
@@ -187,6 +187,10 @@ brw_upload_tcs_prog(struct brw_context *brw)
/* BRW_NEW_TESS_CTRL_PROGRAM */
struct brw_tess_ctrl_program *tcp =
(struct brw_tess_ctrl_program *) brw->tess_ctrl_program;
/* BRW_NEW_TESS_EVAL_PROGRAM */
struct brw_tess_eval_program *tep =
(struct brw_tess_eval_program *) brw->tess_eval_program;
assert(tcp && tep);
if (!brw_state_dirty(brw,
_NEW_TEXTURE,
@@ -195,15 +199,6 @@ brw_upload_tcs_prog(struct brw_context *brw)
BRW_NEW_TESS_EVAL_PROGRAM))
return;
if (tcp == NULL) {
/* Other state atoms had better not try to access prog_data, since
* there's no HS program.
*/
brw->tcs.prog_data = NULL;
brw->tcs.base.prog_data = NULL;
return;
}
struct gl_program *prog = &tcp->program.Base;
memset(&key, 0, sizeof(key));
@@ -216,13 +211,9 @@ brw_upload_tcs_prog(struct brw_context *brw)
brw_populate_sampler_prog_key_data(ctx, prog, stage_state->sampler_count,
&key.tex);
/* BRW_NEW_TESS_EVAL_PROGRAM */
/* We need to specialize our code generation for tessellation levels
* based on the domain the DS is expecting to tessellate.
*/
struct brw_tess_eval_program *tep =
(struct brw_tess_eval_program *) brw->tess_eval_program;
assert(tep);
key.tes_primitive_mode = tep->program.PrimitiveMode;
if (!brw_search_cache(&brw->cache, BRW_CACHE_TCS_PROG,
src/mesa/drivers/dri/i965/brw_tes.c
-9
View File
@@ -241,15 +241,6 @@ brw_upload_tes_prog(struct brw_context *brw)
BRW_NEW_TESS_EVAL_PROGRAM))
return;
if (tep == NULL) {
/* Other state atoms had better not try to access prog_data, since
* there's no TES program.
*/
brw->tes.prog_data = NULL;
brw->tes.base.prog_data = NULL;
return;
}
struct gl_program *prog = &tep->program.Base;
memset(&key, 0, sizeof(key));