OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv/cmd_buffer: Always set up a null surface state

Browse Source 
We're about to start requiring it in yet another case and calculating
exactly when one is needed is starting to get prohibitively expensive.
A single surface state doesn't take up that much space so we may as well
create one all the time.

Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Cc: <mesa-stable@lists.freedesktop.org>
This commit is contained in:
Jason Ekstrand
2017-04-07 10:31:01 -07:00
parent d6588d9962
commit 02eca8b6f8
1 changed files with 19 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/intel/vulkan/genX_cmd_buffer.c
View File

@@ -411,23 +411,15 @@ genX(cmd_buffer_setup_attachments)(struct anv_cmd_buffer *cmd_buffer,
VK_ERROR_OUT_OF_HOST_MEMORY); VK_ERROR_OUT_OF_HOST_MEMORY);
} }
bool need_null_state = false; /* Reserve one for the NULL state. */
unsigned num_states = 0; unsigned num_states = 1;
for (uint32_t i = 0; i < pass->attachment_count; ++i) { for (uint32_t i = 0; i < pass->attachment_count; ++i) {
if (vk_format_is_color(pass->attachments[i].format)) { if (vk_format_is_color(pass->attachments[i].format))
num_states++; num_states++;
} else {
/* We need a null state for any depth-stencil-only subpasses.
* Importantly, this includes depth/stencil clears so we create one
* whenever we have depth or stencil
*/
need_null_state = true;
}
if (need_input_attachment_state(&pass->attachments[i])) if (need_input_attachment_state(&pass->attachments[i]))
num_states++; num_states++;
} }
num_states += need_null_state;
const uint32_t ss_stride = align_u32(isl_dev->ss.size, isl_dev->ss.align); const uint32_t ss_stride = align_u32(isl_dev->ss.size, isl_dev->ss.align);
state->render_pass_states = state->render_pass_states =
@@ -437,11 +429,9 @@ genX(cmd_buffer_setup_attachments)(struct anv_cmd_buffer *cmd_buffer,
struct anv_state next_state = state->render_pass_states; struct anv_state next_state = state->render_pass_states;
next_state.alloc_size = isl_dev->ss.size; next_state.alloc_size = isl_dev->ss.size;
if (need_null_state) { state->null_surface_state = next_state;
state->null_surface_state = next_state; next_state.offset += ss_stride;
next_state.offset += ss_stride; next_state.map += ss_stride;
next_state.map += ss_stride;
}
for (uint32_t i = 0; i < pass->attachment_count; ++i) { for (uint32_t i = 0; i < pass->attachment_count; ++i) {
if (vk_format_is_color(pass->attachments[i].format)) { if (vk_format_is_color(pass->attachments[i].format)) {
@@ -463,24 +453,22 @@ genX(cmd_buffer_setup_attachments)(struct anv_cmd_buffer *cmd_buffer,
ANV_FROM_HANDLE(anv_framebuffer, framebuffer, begin->framebuffer); ANV_FROM_HANDLE(anv_framebuffer, framebuffer, begin->framebuffer);
assert(pass->attachment_count == framebuffer->attachment_count); assert(pass->attachment_count == framebuffer->attachment_count);
if (need_null_state) { struct GENX(RENDER_SURFACE_STATE) null_ss = {
struct GENX(RENDER_SURFACE_STATE) null_ss = { .SurfaceType = SURFTYPE_NULL,
.SurfaceType = SURFTYPE_NULL, .SurfaceArray = framebuffer->layers > 0,
.SurfaceArray = framebuffer->layers > 0, .SurfaceFormat = ISL_FORMAT_R8G8B8A8_UNORM,
.SurfaceFormat = ISL_FORMAT_R8G8B8A8_UNORM,
#if GEN_GEN >= 8 #if GEN_GEN >= 8
.TileMode = YMAJOR, .TileMode = YMAJOR,
#else #else
.TiledSurface = true, .TiledSurface = true,
#endif #endif
.Width = framebuffer->width - 1, .Width = framebuffer->width - 1,
.Height = framebuffer->height - 1, .Height = framebuffer->height - 1,
.Depth = framebuffer->layers - 1, .Depth = framebuffer->layers - 1,
.RenderTargetViewExtent = framebuffer->layers - 1, .RenderTargetViewExtent = framebuffer->layers - 1,
}; };
GENX(RENDER_SURFACE_STATE_pack)(NULL, state->null_surface_state.map, GENX(RENDER_SURFACE_STATE_pack)(NULL, state->null_surface_state.map,
&null_ss); &null_ss);
}
for (uint32_t i = 0; i < pass->attachment_count; ++i) { for (uint32_t i = 0; i < pass->attachment_count; ++i) {
struct anv_render_pass_attachment *att = &pass->attachments[i]; struct anv_render_pass_attachment *att = &pass->attachments[i];