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

anv/pipeline: Stop claiming to support running without a vertex shader

Browse Source 
From the Vulkan spec version 1.0.32 docs for vkCreateGraphicsPipelines:

    The stage member of one element of pStages must be
    VK_SHADER_STAGE_VERTEX_BIT

Since a vertex shader is always required, this hasn't been used since we
deleted meta.  Let's get rid of the complexity.

Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
This commit is contained in:
Jason Ekstrand
2016-11-12 08:34:33 -08:00
parent bda247d3fd
commit 23d1919fe3
2 changed files with 57 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/intel/vulkan/gen7_pipeline.c
View File

@@ -106,12 +106,9 @@ genX(graphics_pipeline_create)(
gen7_emit_vs_workaround_flush(brw);
#endif
if (!anv_pipeline_has_stage(pipeline, MESA_SHADER_VERTEX)) {
anv_batch_emit(&pipeline->batch, GENX(3DSTATE_VS), vs);
} else {
assert(anv_pipeline_has_stage(pipeline, MESA_SHADER_VERTEX));
const struct anv_shader_bin *vs_bin =
pipeline->shaders[MESA_SHADER_VERTEX];
anv_batch_emit(&pipeline->batch, GENX(3DSTATE_VS), vs) {
vs.KernelStartPointer = vs_bin->kernel.offset;
@@ -135,7 +132,6 @@ genX(graphics_pipeline_create)(
vs.StatisticsEnable = true;
vs.FunctionEnable = true;
}
}
const struct brw_gs_prog_data *gs_prog_data = get_gs_prog_data(pipeline);

12
src/intel/vulkan/gen8_pipeline.c
View File

@@ -177,18 +177,9 @@ genX(graphics_pipeline_create)(
offset = 1;
length = (vs_prog_data->base.vue_map.num_slots + 1) / 2 - offset;
if (!anv_pipeline_has_stage(pipeline, MESA_SHADER_VERTEX)) {
anv_batch_emit(&pipeline->batch, GENX(3DSTATE_VS), vs) {
vs.FunctionEnable = false;
/* Even if VS is disabled, SBE still gets the amount of
* vertex data to read from this field. */
vs.VertexURBEntryOutputReadOffset = offset;
vs.VertexURBEntryOutputLength = length;
}
} else {
assert(anv_pipeline_has_stage(pipeline, MESA_SHADER_VERTEX));
const struct anv_shader_bin *vs_bin =
pipeline->shaders[MESA_SHADER_VERTEX];
anv_batch_emit(&pipeline->batch, GENX(3DSTATE_VS), vs) {
vs.KernelStartPointer = vs_bin->kernel.offset;
vs.SingleVertexDispatch = false;
@@ -231,7 +222,6 @@ genX(graphics_pipeline_create)(
vs.UserClipDistanceClipTestEnableBitmask = 0;
vs.UserClipDistanceCullTestEnableBitmask = 0;
}
}
const int num_thread_bias = GEN_GEN == 8 ? 2 : 1;
if (!anv_pipeline_has_stage(pipeline, MESA_SHADER_FRAGMENT)) {