diff options
Diffstat (limited to 'Ryujinx.Graphics.Gpu')
| -rw-r--r-- | Ryujinx.Graphics.Gpu/Engine/Methods.cs | 16 | ||||
| -rw-r--r-- | Ryujinx.Graphics.Gpu/State/GpuState.cs | 5 | ||||
| -rw-r--r-- | Ryujinx.Graphics.Gpu/State/MethodOffset.cs | 3 |
3 files changed, 20 insertions, 4 deletions
diff --git a/Ryujinx.Graphics.Gpu/Engine/Methods.cs b/Ryujinx.Graphics.Gpu/Engine/Methods.cs index 093f9048..df0e713d 100644 --- a/Ryujinx.Graphics.Gpu/Engine/Methods.cs +++ b/Ryujinx.Graphics.Gpu/Engine/Methods.cs @@ -224,9 +224,12 @@ namespace Ryujinx.Graphics.Gpu.Engine UpdateVertexAttribState(state); } - if (state.QueryModified(MethodOffset.PointSize)) + if (state.QueryModified(MethodOffset.PointSize, + MethodOffset.VertexProgramPointSize, + MethodOffset.PointSpriteEnable, + MethodOffset.PointCoordReplace)) { - UpdatePointSizeState(state); + UpdatePointState(state); } if (state.QueryModified(MethodOffset.PrimitiveRestartState)) @@ -703,11 +706,16 @@ namespace Ryujinx.Graphics.Gpu.Engine /// Updates host point size based on guest GPU state. /// </summary> /// <param name="state">Current GPU state</param> - private void UpdatePointSizeState(GpuState state) + private void UpdatePointState(GpuState state) { float size = state.Get<float>(MethodOffset.PointSize); + bool isProgramPointSize = state.Get<Boolean32>(MethodOffset.VertexProgramPointSize); + bool enablePointSprite = state.Get<Boolean32>(MethodOffset.PointSpriteEnable); + + // TODO: Need to figure out a way to map PointCoordReplace enable bit. + Origin origin = (state.Get<int>(MethodOffset.PointCoordReplace) & 4) == 0 ? Origin.LowerLeft : Origin.UpperLeft; - _context.Renderer.Pipeline.SetPointSize(size); + _context.Renderer.Pipeline.SetPointParameters(size, isProgramPointSize, enablePointSprite, origin); } /// <summary> diff --git a/Ryujinx.Graphics.Gpu/State/GpuState.cs b/Ryujinx.Graphics.Gpu/State/GpuState.cs index 9e7d9492..67bcb291 100644 --- a/Ryujinx.Graphics.Gpu/State/GpuState.cs +++ b/Ryujinx.Graphics.Gpu/State/GpuState.cs @@ -173,6 +173,11 @@ namespace Ryujinx.Graphics.Gpu.State { Set(MethodOffset.BlendState, index, BlendState.Default); } + + // Default Point Parameters + memory[(int)MethodOffset.PointSpriteEnable] = 1; + memory[(int)MethodOffset.PointSize] = 0x3F800000; // 1.0f + memory[(int)MethodOffset.PointCoordReplace] = 0x8; // Enable } /// <summary> diff --git a/Ryujinx.Graphics.Gpu/State/MethodOffset.cs b/Ryujinx.Graphics.Gpu/State/MethodOffset.cs index b0eb6f32..d9e2ce93 100644 --- a/Ryujinx.Graphics.Gpu/State/MethodOffset.cs +++ b/Ryujinx.Graphics.Gpu/State/MethodOffset.cs @@ -73,6 +73,7 @@ namespace Ryujinx.Graphics.Gpu.State FirstInstance = 0x50e, ClipDistanceEnable = 0x544, PointSize = 0x546, + PointSpriteEnable = 0x548, ResetCounter = 0x54c, RtDepthStencilEnable = 0x54e, ConditionState = 0x554, @@ -84,6 +85,7 @@ namespace Ryujinx.Graphics.Gpu.State RtMsaaMode = 0x574, VbElementU32 = 0x57a, VbElementU16 = 0x57c, + PointCoordReplace = 0x581, ShaderBaseAddress = 0x582, DrawEnd = 0x585, DrawBegin = 0x586, @@ -92,6 +94,7 @@ namespace Ryujinx.Graphics.Gpu.State IndexBufferCount = 0x5f8, DepthBiasClamp = 0x61f, VertexBufferInstanced = 0x620, + VertexProgramPointSize = 0x644, FaceState = 0x646, ViewportTransformEnable = 0x64b, ViewVolumeClipControl = 0x64f, |