From 278db7d55b572cf7fc0090b101f02a49770521ec Mon Sep 17 00:00:00 2001 From: cosmonaut Date: Wed, 2 Mar 2022 11:45:37 -0800 Subject: [PATCH] fix a few missing renames --- src/Graphics/Resources/ComputePipeline.cs | 4 ++-- src/Graphics/Resources/GraphicsPipeline.cs | 12 ++++++------ src/Graphics/State/GraphicsPipelineCreateInfo.cs | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Graphics/Resources/ComputePipeline.cs b/src/Graphics/Resources/ComputePipeline.cs index ad7133e3..83a71d09 100644 --- a/src/Graphics/Resources/ComputePipeline.cs +++ b/src/Graphics/Resources/ComputePipeline.cs @@ -8,7 +8,7 @@ namespace MoonWorks.Graphics { protected override Action QueueDestroyFunction => Refresh.Refresh_QueueDestroyComputePipeline; - public ComputeShaderInfo ComputeShaderState { get; } + public ComputeShaderInfo ComputeShaderInfo { get; } public unsafe ComputePipeline( GraphicsDevice device, @@ -29,7 +29,7 @@ namespace MoonWorks.Graphics refreshComputeShaderInfo ); - ComputeShaderState = computeShaderInfo; + ComputeShaderInfo = computeShaderInfo; } } } diff --git a/src/Graphics/Resources/GraphicsPipeline.cs b/src/Graphics/Resources/GraphicsPipeline.cs index 19d8730e..8583b485 100644 --- a/src/Graphics/Resources/GraphicsPipeline.cs +++ b/src/Graphics/Resources/GraphicsPipeline.cs @@ -12,8 +12,8 @@ namespace MoonWorks.Graphics { protected override Action QueueDestroyFunction => Refresh.Refresh_QueueDestroyGraphicsPipeline; - public GraphicsShaderInfo VertexShaderState { get; } - public GraphicsShaderInfo FragmentShaderState { get; } + public GraphicsShaderInfo VertexShaderInfo { get; } + public GraphicsShaderInfo FragmentShaderInfo { get; } public unsafe GraphicsPipeline( GraphicsDevice device, @@ -21,8 +21,8 @@ namespace MoonWorks.Graphics ) : base(device) { DepthStencilState depthStencilState = graphicsPipelineCreateInfo.DepthStencilState; - GraphicsShaderInfo vertexShaderInfo = graphicsPipelineCreateInfo.VertexShaderState; - GraphicsShaderInfo fragmentShaderInfo = graphicsPipelineCreateInfo.FragmentShaderState; + GraphicsShaderInfo vertexShaderInfo = graphicsPipelineCreateInfo.VertexShaderInfo; + GraphicsShaderInfo fragmentShaderInfo = graphicsPipelineCreateInfo.FragmentShaderInfo; MultisampleState multisampleState = graphicsPipelineCreateInfo.MultisampleState; RasterizerState rasterizerState = graphicsPipelineCreateInfo.RasterizerState; PrimitiveType primitiveType = graphicsPipelineCreateInfo.PrimitiveType; @@ -123,8 +123,8 @@ namespace MoonWorks.Graphics viewportHandle.Free(); scissorHandle.Free(); - VertexShaderState = vertexShaderInfo; - FragmentShaderState = fragmentShaderInfo; + VertexShaderInfo = vertexShaderInfo; + FragmentShaderInfo = fragmentShaderInfo; } } } diff --git a/src/Graphics/State/GraphicsPipelineCreateInfo.cs b/src/Graphics/State/GraphicsPipelineCreateInfo.cs index 0dfe6246..78aca683 100644 --- a/src/Graphics/State/GraphicsPipelineCreateInfo.cs +++ b/src/Graphics/State/GraphicsPipelineCreateInfo.cs @@ -3,8 +3,8 @@ public struct GraphicsPipelineCreateInfo { public DepthStencilState DepthStencilState; - public GraphicsShaderInfo VertexShaderState; - public GraphicsShaderInfo FragmentShaderState; + public GraphicsShaderInfo VertexShaderInfo; + public GraphicsShaderInfo FragmentShaderInfo; public MultisampleState MultisampleState; public RasterizerState RasterizerState; public PrimitiveType PrimitiveType;