mirror of
https://git.ryujinx.app/ryubing/ryujinx.git
synced 2025-08-02 20:07:11 +02:00
Misc cleanup (#708)
* Fix typos * Remove unneeded using statements * Enforce var style more * Remove redundant qualifiers * Fix some indentation * Disable naming warnings on files with external enum names * Fix build * Mass find & replace for comments with no spacing * Standardize todo capitalization and for/if spacing
This commit is contained in:
parent
10c74182ba
commit
b2b736abc2
205 changed files with 1020 additions and 1041 deletions
|
@ -1,4 +1,5 @@
|
|||
using System;
|
||||
// ReSharper disable InconsistentNaming
|
||||
using System;
|
||||
|
||||
namespace Ryujinx.Graphics.Gal
|
||||
{
|
||||
|
|
|
@ -2,7 +2,7 @@ namespace Ryujinx.Graphics.Gal
|
|||
{
|
||||
public struct GalVertexBinding
|
||||
{
|
||||
//VboKey shouldn't be here, but ARB_vertex_attrib_binding is core since 4.3
|
||||
// VboKey shouldn't be here, but ARB_vertex_attrib_binding is core since 4.3
|
||||
|
||||
public bool Enabled;
|
||||
public int Stride;
|
||||
|
|
|
@ -275,7 +275,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
|
|||
}
|
||||
else
|
||||
{
|
||||
//Fallback to non-mirrored clamps
|
||||
// Fallback to non-mirrored clamps
|
||||
switch (wrap)
|
||||
{
|
||||
case GalTextureWrap.MirrorClampToEdge: return TextureWrapMode.ClampToEdge;
|
||||
|
@ -291,7 +291,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
|
|||
GalTextureFilter minFilter,
|
||||
GalTextureMipFilter mipFilter)
|
||||
{
|
||||
//TODO: Mip (needs mipmap support first).
|
||||
// TODO: Mip (needs mipmap support first).
|
||||
switch (minFilter)
|
||||
{
|
||||
case GalTextureFilter.Nearest: return TextureMinFilter.Nearest;
|
||||
|
|
|
@ -96,7 +96,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
|
|||
_rasterizer = rasterizer;
|
||||
_shader = shader;
|
||||
|
||||
//These values match OpenGL's defaults
|
||||
// These values match OpenGL's defaults
|
||||
_old = new GalPipelineState
|
||||
{
|
||||
FrontFace = GalFrontFace.Ccw,
|
||||
|
@ -564,14 +564,14 @@ namespace Ryujinx.Graphics.Gal.OpenGL
|
|||
{
|
||||
_vaoHandle = GL.GenVertexArray();
|
||||
|
||||
//Vertex arrays shouldn't be used anywhere else in OpenGL's backend
|
||||
//if you want to use it, move this line out of the if
|
||||
// Vertex arrays shouldn't be used anywhere else in OpenGL's backend
|
||||
// if you want to use it, move this line out of the if
|
||||
GL.BindVertexArray(_vaoHandle);
|
||||
}
|
||||
|
||||
foreach (GalVertexAttrib attrib in binding.Attribs)
|
||||
{
|
||||
//Skip uninitialized attributes.
|
||||
// Skip uninitialized attributes.
|
||||
if (attrib.Size == 0)
|
||||
{
|
||||
continue;
|
||||
|
|
|
@ -77,11 +77,11 @@ namespace Ryujinx.Graphics.Gal.OpenGL
|
|||
private int _cropRight;
|
||||
private int _cropBottom;
|
||||
|
||||
//This framebuffer is used to attach guest rendertargets,
|
||||
//think of it as a dummy OpenGL VAO
|
||||
// This framebuffer is used to attach guest rendertargets,
|
||||
// think of it as a dummy OpenGL VAO
|
||||
private int _dummyFrameBuffer;
|
||||
|
||||
//These framebuffers are used to blit images
|
||||
// These framebuffers are used to blit images
|
||||
private int _srcFb;
|
||||
private int _dstFb;
|
||||
|
||||
|
@ -109,8 +109,8 @@ namespace Ryujinx.Graphics.Gal.OpenGL
|
|||
|
||||
private void TextureDeletionHandler(object sender, int handle)
|
||||
{
|
||||
//Texture was deleted, the handle is no longer valid, so
|
||||
//reset all uses of this handle on a render target.
|
||||
// Texture was deleted, the handle is no longer valid, so
|
||||
// reset all uses of this handle on a render target.
|
||||
for (int attachment = 0; attachment < RenderTargetsCount; attachment++)
|
||||
{
|
||||
if (_colorHandles[attachment] == handle)
|
||||
|
@ -484,7 +484,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
|
|||
|
||||
GL.BindBuffer(BufferTarget.PixelPackBuffer, _copyPbo);
|
||||
|
||||
//The buffer should be large enough to hold the largest texture.
|
||||
// The buffer should be large enough to hold the largest texture.
|
||||
int bufferSize = Math.Max(ImageUtils.GetSize(oldImage),
|
||||
ImageUtils.GetSize(newImage));
|
||||
|
||||
|
|
|
@ -115,7 +115,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
|
|||
data[1] = flipY;
|
||||
data[2] = BitConverter.Int32BitsToSingle(instance);
|
||||
|
||||
//Invalidate buffer
|
||||
// Invalidate buffer
|
||||
GL.BufferData(BufferTarget.UniformBuffer, ExtraDataSize * sizeof(float), IntPtr.Zero, BufferUsageHint.StreamDraw);
|
||||
|
||||
GL.BufferSubData(BufferTarget.UniformBuffer, IntPtr.Zero, ExtraDataSize * sizeof(float), (IntPtr)data);
|
||||
|
@ -228,9 +228,9 @@ namespace Ryujinx.Graphics.Gal.OpenGL
|
|||
|
||||
if (blockIndex < 0)
|
||||
{
|
||||
//This may be fine, the compiler may optimize away unused uniform buffers,
|
||||
//and in this case the above call would return -1 as the buffer has been
|
||||
//optimized away.
|
||||
// This may be fine, the compiler may optimize away unused uniform buffers,
|
||||
// and in this case the above call would return -1 as the buffer has been
|
||||
// optimized away.
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
|
@ -207,7 +207,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
|
|||
}
|
||||
else
|
||||
{
|
||||
//TODO: Use KHR_texture_compression_astc_hdr when available
|
||||
// TODO: Use KHR_texture_compression_astc_hdr when available
|
||||
if (IsAstc(image.Format))
|
||||
{
|
||||
int textureBlockWidth = ImageUtils.GetBlockWidth(image.Format);
|
||||
|
|
|
@ -38,7 +38,7 @@ namespace Ryujinx.Graphics.Gal
|
|||
|
||||
ulong instruction = 0;
|
||||
|
||||
//Dump until a NOP instruction is found
|
||||
// Dump until a NOP instruction is found
|
||||
while ((instruction >> 48 & 0xfff8) != 0x50b0)
|
||||
{
|
||||
uint word0 = (uint)memory.ReadInt32(position + 0x50 + offset + 0);
|
||||
|
@ -46,8 +46,8 @@ namespace Ryujinx.Graphics.Gal
|
|||
|
||||
instruction = word0 | (ulong)word1 << 32;
|
||||
|
||||
//Zero instructions (other kind of NOP) stop immediatly,
|
||||
//this is to avoid two rows of zeroes
|
||||
// Zero instructions (other kind of NOP) stop immediately,
|
||||
// this is to avoid two rows of zeroes
|
||||
if (instruction == 0)
|
||||
{
|
||||
break;
|
||||
|
@ -59,7 +59,7 @@ namespace Ryujinx.Graphics.Gal
|
|||
offset += 8;
|
||||
}
|
||||
|
||||
//Align to meet nvdisasm requeriments
|
||||
// Align to meet nvdisasm requirements
|
||||
while (offset % 0x20 != 0)
|
||||
{
|
||||
fullWriter.Write(0);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue