if (fb_changed) {
ctx->fb_state.width = dstx + width;
ctx->fb_state.height = dsty + height;
- zink_update_framebuffer_state(ctx, orig_width, orig_height);
+ ctx->fb_changed = true;
zink_batch_no_rp(ctx);
}
zink_clear(pctx, clear_flags, &scissor, NULL, depth, stencil);
if (fb_changed) {
ctx->fb_state.width = orig_width;
ctx->fb_state.height = orig_height;
- zink_update_framebuffer_state(ctx, dstx + width, dsty + height);
+ ctx->fb_changed = true;
zink_batch_no_rp(ctx);
}
} else {
/* use dummy color buffers instead of the more sane option */
zink_batch_no_rp(ctx);
ctx->rp_changed = true;
- zink_update_framebuffer_state(ctx, ctx->fb_state.width, ctx->fb_state.height);
+ zink_update_framebuffer_state(ctx);
} else {
reapply_color_write(ctx);
}
}
rebind_fb_state(ctx, NULL, true);
ctx->fb_state.samples = MAX2(samples, 1);
- zink_update_framebuffer_state(ctx, w, h);
+ zink_update_framebuffer_state(ctx);
+ if (ctx->fb_state.width != w || ctx->fb_state.height != h)
+ ctx->scissor_changed = true;
uint8_t rast_samples = ctx->fb_state.samples - 1;
if (rast_samples != ctx->gfx_pipeline_state.rast_samples)
}
void
-zink_update_framebuffer_state(struct zink_context *ctx, int old_w, int old_h)
+zink_update_framebuffer_state(struct zink_context *ctx)
{
- if (ctx->fb_state.width != old_w || ctx->fb_state.height != old_h)
- ctx->scissor_changed = true;
/* get_framebuffer adds a ref if the fb is reused or created;
* always do get_framebuffer first to avoid deleting the same fb
* we're about to use
zink_get_framebuffer(struct zink_context *ctx);
void
-zink_update_framebuffer_state(struct zink_context *ctx, int old_w, int old_h);
+zink_update_framebuffer_state(struct zink_context *ctx);
#endif
if (!ctx->fb_changed)
return;
+ zink_update_framebuffer_state(ctx);
zink_init_framebuffer(screen, ctx->framebuffer, rp);
ctx->fb_changed = false;
ctx->gfx_pipeline_state.render_pass = rp;
ctx->fb_state.width = ctx->swapchain_size.width;
ctx->fb_state.height = ctx->swapchain_size.height;
zink_kopper_fixup_depth_buffer(ctx);
- zink_update_framebuffer_state(ctx, old_w, old_h);
+ if (ctx->fb_state.width != old_w || ctx->fb_state.height != old_h)
+ ctx->scissor_changed = true;
+ zink_update_framebuffer_state(ctx);
ctx->swapchain_size.width = ctx->swapchain_size.height = 0;
}
}