fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 07:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vk: Defer setting viewport dynamic state

Browse source 
We can't emit this until we've done a 3D pipeline select.
This commit is contained in:
Kristian Høgsberg Kristensen 2015-06-11 15:04:09 -07:00
parent f7fe06cf0a
commit e7edde60ba
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/vulkan/device.c
View file

@ -2663,20 +2663,11 @@ void anv_CmdBindDynamicStateObject(
VkDynamicStateObject dynamicState) VkDynamicStateObject dynamicState)
{ {
struct anv_cmd_buffer *cmd_buffer = (struct anv_cmd_buffer *) cmdBuffer; struct anv_cmd_buffer *cmd_buffer = (struct anv_cmd_buffer *) cmdBuffer;
struct anv_dynamic_vp_state *vp_state;
switch (stateBindPoint) { switch (stateBindPoint) {
case VK_STATE_BIND_POINT_VIEWPORT: case VK_STATE_BIND_POINT_VIEWPORT:
vp_state = (struct anv_dynamic_vp_state *) dynamicState; cmd_buffer->vp_state = (struct anv_dynamic_vp_state *) dynamicState;
/* We emit state immediately, but set cmd_buffer->vp_state to indicate cmd_buffer->dirty |= ANV_CMD_BUFFER_VP_DIRTY;
* that vp state has been set in this command buffer. */
cmd_buffer->vp_state = vp_state;
anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_SCISSOR_STATE_POINTERS,
.ScissorRectPointer = vp_state->scissor.offset);
anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_CC,
.CCViewportPointer = vp_state->cc_vp.offset);
anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP,
.SFClipViewportPointer = vp_state->sf_clip_vp.offset);
break; break;
case VK_STATE_BIND_POINT_RASTER: case VK_STATE_BIND_POINT_RASTER:
cmd_buffer->rs_state = (struct anv_dynamic_rs_state *) dynamicState; cmd_buffer->rs_state = (struct anv_dynamic_rs_state *) dynamicState;
@ -3111,6 +3102,15 @@ anv_cmd_buffer_flush_state(struct anv_cmd_buffer *cmd_buffer)
if (cmd_buffer->descriptors_dirty) if (cmd_buffer->descriptors_dirty)
flush_descriptor_sets(cmd_buffer); flush_descriptor_sets(cmd_buffer);
if (cmd_buffer->dirty & ANV_CMD_BUFFER_VP_DIRTY) {
anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_SCISSOR_STATE_POINTERS,
.ScissorRectPointer = cmd_buffer->vp_state->scissor.offset);
anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_CC,
.CCViewportPointer = cmd_buffer->vp_state->cc_vp.offset);
anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP,
.SFClipViewportPointer = cmd_buffer->vp_state->sf_clip_vp.offset);
}
if (cmd_buffer->dirty & (ANV_CMD_BUFFER_PIPELINE_DIRTY | ANV_CMD_BUFFER_RS_DIRTY)) { if (cmd_buffer->dirty & (ANV_CMD_BUFFER_PIPELINE_DIRTY | ANV_CMD_BUFFER_RS_DIRTY)) {
anv_batch_emit_merge(&cmd_buffer->batch, anv_batch_emit_merge(&cmd_buffer->batch,
cmd_buffer->rs_state->state_sf, pipeline->state_sf); cmd_buffer->rs_state->state_sf, pipeline->state_sf);

1
src/vulkan/private.h
View file

@ -617,6 +617,7 @@ struct anv_buffer {
#define ANV_CMD_BUFFER_RS_DIRTY (1 << 2) #define ANV_CMD_BUFFER_RS_DIRTY (1 << 2)
#define ANV_CMD_BUFFER_DS_DIRTY (1 << 3) #define ANV_CMD_BUFFER_DS_DIRTY (1 << 3)
#define ANV_CMD_BUFFER_CB_DIRTY (1 << 4) #define ANV_CMD_BUFFER_CB_DIRTY (1 << 4)
#define ANV_CMD_BUFFER_VP_DIRTY (1 << 5)
struct anv_vertex_binding { struct anv_vertex_binding {
struct anv_buffer * buffer; struct anv_buffer * buffer;