diff options
Diffstat (limited to 'src/mesa/drivers/dri')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_binding_tables.c | 7 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_device_info.c | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_binding_tables.c b/src/mesa/drivers/dri/i965/brw_binding_tables.c index 80935cf..7fa5d60 100644 --- a/src/mesa/drivers/dri/i965/brw_binding_tables.c +++ b/src/mesa/drivers/dri/i965/brw_binding_tables.c @@ -196,12 +196,12 @@ const struct brw_tracked_state brw_wm_binding_table = { .emit = brw_upload_wm_binding_table, }; -/** Upload the TCS binding table (if TCS is active). */ +/** Upload the TCS binding table (if tessellation stages are active). */ static void brw_tcs_upload_binding_table(struct brw_context *brw) { - /* If there's no TCS, skip changing anything. */ - if (brw->tess_ctrl_program == NULL) + /* Skip if the tessellation stages are disabled. */ + if (brw->tess_eval_program == NULL) return; /* BRW_NEW_TCS_PROG_DATA */ @@ -216,6 +216,7 @@ const struct brw_tracked_state brw_tcs_binding_table = { .dirty = { .mesa = 0, .brw = BRW_NEW_BATCH | + BRW_NEW_DEFAULT_TESS_LEVELS | BRW_NEW_SURFACES | BRW_NEW_TCS_CONSTBUF | BRW_NEW_TCS_PROG_DATA, diff --git a/src/mesa/drivers/dri/i965/brw_device_info.c b/src/mesa/drivers/dri/i965/brw_device_info.c index 4eeca5c..e8af70c 100644 --- a/src/mesa/drivers/dri/i965/brw_device_info.c +++ b/src/mesa/drivers/dri/i965/brw_device_info.c @@ -420,6 +420,7 @@ static const struct brw_device_info brw_device_info_kbl_gt1 = { .max_cs_threads = 7 * 6, .max_wm_threads = KBL_MAX_THREADS_PER_PSD * 2, .urb.size = 192, + .num_slices = 1, }; static const struct brw_device_info brw_device_info_kbl_gt1_5 = { @@ -428,6 +429,7 @@ static const struct brw_device_info brw_device_info_kbl_gt1_5 = { .max_cs_threads = 7 * 6, .max_wm_threads = KBL_MAX_THREADS_PER_PSD * 3, + .num_slices = 1, }; static const struct brw_device_info brw_device_info_kbl_gt2 = { @@ -435,6 +437,7 @@ static const struct brw_device_info brw_device_info_kbl_gt2 = { .gt = 2, .max_wm_threads = KBL_MAX_THREADS_PER_PSD * 3, + .num_slices = 1, }; static const struct brw_device_info brw_device_info_kbl_gt3 = { @@ -442,6 +445,7 @@ static const struct brw_device_info brw_device_info_kbl_gt3 = { .gt = 3, .max_wm_threads = KBL_MAX_THREADS_PER_PSD * 6, + .num_slices = 2, }; static const struct brw_device_info brw_device_info_kbl_gt4 = { @@ -460,6 +464,7 @@ static const struct brw_device_info brw_device_info_kbl_gt4 = { * will be used." */ .urb.size = 1008 / 3, + .num_slices = 3, }; const struct brw_device_info * diff --git a/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c b/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c index ed47172..c5f6c4f 100644 --- a/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c +++ b/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c @@ -409,8 +409,8 @@ set_read_rb_tex_image(struct gl_context *ctx, struct fb_tex_blit_state *blit, blit->baseLevelSave = tex_obj->BaseLevel; blit->maxLevelSave = tex_obj->MaxLevel; blit->stencilSamplingSave = tex_obj->StencilSampling; - blit->sampler = _mesa_meta_setup_sampler(ctx, tex_obj, *target, - GL_NEAREST, level); + blit->samp_obj = _mesa_meta_setup_sampler(ctx, tex_obj, *target, + GL_NEAREST, level); return true; } |