Skip to content

Commit

Permalink
Clean up subpass shading -> shader pipeline stage name
Browse files Browse the repository at this point in the history
  • Loading branch information
@MarijnS95
MarijnS95 committed Apr 6, 2024
1 parent 9972e35 commit 7ce42e3
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions vulkano/src/command_buffer/commands/query.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -804,11 +804,11 @@ impl RawRecordingCommandBuffer {
}));
}
}
PipelineStage::SubpassShading => {
PipelineStage::SubpassShader => {
if !device.enabled_features().subpass_shading {
return Err(Box::new(ValidationError {
context: "stage".into(),
problem: "is `PipelineStage::SubpassShading`".into(),
problem: "is `PipelineStage::SubpassShader`".into(),
requires_one_of: RequiresOneOf(&[RequiresAllOf(&[
Requires::DeviceFeature("subpass_shading"),
])]),
Expand Down
4 changes: 2 additions & 2 deletions vulkano/src/command_buffer/commands/sync.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1486,10 +1486,10 @@ impl RawRecordingCommandBuffer {
}

if !device.enabled_features().subpass_shading {
if stages.intersects(PipelineStages::SUBPASS_SHADING) {
if stages.intersects(PipelineStages::SUBPASS_SHADER) {
return Err(Box::new(ValidationError {
context: "stages".into(),
problem: "contains `PipelineStages::SUBPASS_SHADING`".into(),
problem: "contains `PipelineStages::SUBPASS_SHADER`".into(),
requires_one_of: RequiresOneOf(&[RequiresAllOf(&[Requires::DeviceFeature(
"subpass_shading",
)])]),
Expand Down
4 changes: 2 additions & 2 deletions vulkano/src/command_buffer/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1103,11 +1103,11 @@ impl SemaphoreSubmitInfo {
}

if !device.enabled_features().subpass_shading
&& stages.intersects(PipelineStages::SUBPASS_SHADING)
&& stages.intersects(PipelineStages::SUBPASS_SHADER)
{
return Err(Box::new(ValidationError {
context: "stages".into(),
problem: "contains `PipelineStages::SUBPASS_SHADING`".into(),
problem: "contains `PipelineStages::SUBPASS_SHADER`".into(),
requires_one_of: RequiresOneOf(&[RequiresAllOf(&[Requires::DeviceFeature(
"subpass_shading",
)])]),
Expand Down
2 changes: 1 addition & 1 deletion vulkano/src/shader/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1545,7 +1545,7 @@ impl From<ShaderStages> for PipelineStages {
}

if stages.intersects(ShaderStages::SUBPASS_SHADING) {
result |= PipelineStages::SUBPASS_SHADING;
result |= PipelineStages::SUBPASS_SHADER;
}

result
Expand Down
34 changes: 17 additions & 17 deletions vulkano/src/sync/pipeline.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,8 @@ vulkan_bitflags_enum! {
RequiresAllOf([DeviceExtension(nv_mesh_shader)]),
]),

/// Subpass shading shaders are executed.
SUBPASS_SHADING, SubpassShading = SUBPASS_SHADER_HUAWEI
/// Subpass shaders are executed.
SUBPASS_SHADER, SubpassShader = SUBPASS_SHADER_HUAWEI
RequiresOneOf([
RequiresAllOf([
APIVersion(V1_3),
Expand Down Expand Up @@ -477,7 +477,7 @@ impl From<QueueFlags> for PipelineStages {
| PipelineStages::TASK_SHADER
| PipelineStages::MESH_SHADER
| PipelineStages::FRAGMENT_DENSITY_PROCESS
| PipelineStages::SUBPASS_SHADING
| PipelineStages::SUBPASS_SHADER
| PipelineStages::INVOCATION_MASK;
}

Expand Down Expand Up @@ -983,7 +983,7 @@ impl From<PipelineStages> for AccessFlags {
| AccessFlags::ACCELERATION_STRUCTURE_READ;
}

if val.intersects(PipelineStages::FRAGMENT_SHADER | PipelineStages::SUBPASS_SHADING) {
if val.intersects(PipelineStages::FRAGMENT_SHADER | PipelineStages::SUBPASS_SHADER) {
result |= AccessFlags::INPUT_ATTACHMENT_READ;
}

Expand Down Expand Up @@ -1383,7 +1383,7 @@ pipeline_stage_access! {
MeshShader_ShaderStorageRead, MESH_SHADER, SHADER_STORAGE_READ;
MeshShader_ShaderStorageWrite, MESH_SHADER, SHADER_STORAGE_WRITE;
MeshShader_AccelerationStructureRead, MESH_SHADER, ACCELERATION_STRUCTURE_READ;
SubpassShading_InputAttachmentRead, SUBPASS_SHADING, INPUT_ATTACHMENT_READ;
SubpassShading_InputAttachmentRead, SUBPASS_SHADER, INPUT_ATTACHMENT_READ;
InvocationMask_InvocationMaskRead, INVOCATION_MASK, INVOCATION_MASK_READ;
AccelerationStructureCopy_AccelerationStructureRead, ACCELERATION_STRUCTURE_COPY, ACCELERATION_STRUCTURE_READ;
AccelerationStructureCopy_AccelerationStructureWrite, ACCELERATION_STRUCTURE_COPY, ACCELERATION_STRUCTURE_WRITE;
Expand Down Expand Up @@ -2171,21 +2171,21 @@ impl MemoryBarrier {
}

if !device.enabled_features().subpass_shading {
if src_stages.intersects(PipelineStages::SUBPASS_SHADING) {
if src_stages.intersects(PipelineStages::SUBPASS_SHADER) {
return Err(Box::new(ValidationError {
context: "src_stages".into(),
problem: "contains `PipelineStages::SUBPASS_SHADING`".into(),
problem: "contains `PipelineStages::SUBPASS_SHADER`".into(),
requires_one_of: RequiresOneOf(&[RequiresAllOf(&[Requires::DeviceFeature(
"subpass_shading",
)])]),
vuids: &["VUID-VkMemoryBarrier2-srcStageMask-04957"],
}));
}

if dst_stages.intersects(PipelineStages::SUBPASS_SHADING) {
if dst_stages.intersects(PipelineStages::SUBPASS_SHADER) {
return Err(Box::new(ValidationError {
context: "dst_stages".into(),
problem: "contains `PipelineStages::SUBPASS_SHADING`".into(),
problem: "contains `PipelineStages::SUBPASS_SHADER`".into(),
requires_one_of: RequiresOneOf(&[RequiresAllOf(&[Requires::DeviceFeature(
"subpass_shading",
)])]),
Expand Down Expand Up @@ -2691,21 +2691,21 @@ impl BufferMemoryBarrier {
}

if !device.enabled_features().subpass_shading {
if src_stages.intersects(PipelineStages::SUBPASS_SHADING) {
if src_stages.intersects(PipelineStages::SUBPASS_SHADER) {
return Err(Box::new(ValidationError {
context: "src_stages".into(),
problem: "contains `PipelineStages::SUBPASS_SHADING`".into(),
problem: "contains `PipelineStages::SUBPASS_SHADER`".into(),
requires_one_of: RequiresOneOf(&[RequiresAllOf(&[Requires::DeviceFeature(
"subpass_shading",
)])]),
vuids: &["VUID-VkBufferMemoryBarrier2-srcStageMask-04957"],
}));
}

if dst_stages.intersects(PipelineStages::SUBPASS_SHADING) {
if dst_stages.intersects(PipelineStages::SUBPASS_SHADER) {
return Err(Box::new(ValidationError {
context: "dst_stages".into(),
problem: "contains `PipelineStages::SUBPASS_SHADING`".into(),
problem: "contains `PipelineStages::SUBPASS_SHADER`".into(),
requires_one_of: RequiresOneOf(&[RequiresAllOf(&[Requires::DeviceFeature(
"subpass_shading",
)])]),
Expand Down Expand Up @@ -3369,21 +3369,21 @@ impl ImageMemoryBarrier {
}

if !device.enabled_features().subpass_shading {
if src_stages.intersects(PipelineStages::SUBPASS_SHADING) {
if src_stages.intersects(PipelineStages::SUBPASS_SHADER) {
return Err(Box::new(ValidationError {
context: "src_stages".into(),
problem: "contains `PipelineStages::SUBPASS_SHADING`".into(),
problem: "contains `PipelineStages::SUBPASS_SHADER`".into(),
requires_one_of: RequiresOneOf(&[RequiresAllOf(&[Requires::DeviceFeature(
"subpass_shading",
)])]),
vuids: &["VUID-VkImageMemoryBarrier2-srcStageMask-04957"],
}));
}

if dst_stages.intersects(PipelineStages::SUBPASS_SHADING) {
if dst_stages.intersects(PipelineStages::SUBPASS_SHADER) {
return Err(Box::new(ValidationError {
context: "dst_stages".into(),
problem: "contains `PipelineStages::SUBPASS_SHADING`".into(),
problem: "contains `PipelineStages::SUBPASS_SHADER`".into(),
requires_one_of: RequiresOneOf(&[RequiresAllOf(&[Requires::DeviceFeature(
"subpass_shading",
)])]),
Expand Down

0 comments on commit 7ce42e3

Please sign in to comment.