Commit 9e825695 authored by Chuck Walbourn's avatar Chuck Walbourn
Browse files

Minor code review

parent ad1c08e6

Kits/ATGTK/DebugDraw.cpp

+5 −5
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ namespace 
            XMStoreFloat4(&verts[i].color, color);

        }



        batch->DrawIndexed(D3D11_PRIMITIVE_TOPOLOGY_LINELIST, s_indices, _countof(s_indices), verts, 8);

        batch->DrawIndexed(D3D_PRIMITIVE_TOPOLOGY_LINELIST, s_indices, _countof(s_indices), verts, 8);

    }

}
@@ -141,7 +141,7 @@ void XM_CALLCONV DX::Draw(PrimitiveBatch<VertexPositionColor>* batch, 
        XMStoreFloat4(&verts[j].color, color);

    }



    batch->Draw(D3D11_PRIMITIVE_TOPOLOGY_LINELIST, verts, _countof(verts));

    batch->Draw(D3D_PRIMITIVE_TOPOLOGY_LINELIST, verts, _countof(verts));

}
@@ -218,7 +218,7 @@ void XM_CALLCONV DX::DrawRing(PrimitiveBatch<VertexPositionColor>* batch, 
    }

    verts[c_ringSegments] = verts[0];



    batch->Draw(D3D11_PRIMITIVE_TOPOLOGY_LINESTRIP, verts, c_ringSegments + 1);

    batch->Draw(D3D_PRIMITIVE_TOPOLOGY_LINESTRIP, verts, c_ringSegments + 1);

}
@@ -253,7 +253,7 @@ void XM_CALLCONV DX::DrawRay(PrimitiveBatch<VertexPositionColor>* batch, 
    XMStoreFloat4(&verts[1].color, color);

    XMStoreFloat4(&verts[2].color, color);



    batch->Draw(D3D11_PRIMITIVE_TOPOLOGY_LINESTRIP, verts, 2);

    batch->Draw(D3D_PRIMITIVE_TOPOLOGY_LINESTRIP, verts, 2);

}
@@ -274,5 +274,5 @@ void XM_CALLCONV DX::DrawTriangle(PrimitiveBatch<VertexPositionColor>* batch, 
    XMStoreFloat4(&verts[2].color, color);

    XMStoreFloat4(&verts[3].color, color);



    batch->Draw(D3D11_PRIMITIVE_TOPOLOGY_LINESTRIP, verts, 4);

    batch->Draw(D3D_PRIMITIVE_TOPOLOGY_LINESTRIP, verts, 4);

}
 
 No newline at end of file

Kits/ATGTK/TextConsole.h

+7 −1
Original line number Diff line number Diff line
@@ -12,12 +12,18 @@ 


#pragma once



#if defined(__d3d12_h__) || defined(__d3d12_x_h__)

#include "RenderTargetState.h"

#include "ResourceUploadBatch.h"

#endif

#include "SpriteBatch.h"

#include "SpriteFont.h"



#include <mutex>

#include <vector>



#include <wrl/client.h>





namespace DX

{

Kits/ATGTK/WAVFileReader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ namespace 
        {

            case WAVE_FORMAT_PCM:

            case WAVE_FORMAT_IEEE_FLOAT:

                // Can be a PCMWAVEFORMAT (8 bytes) or WAVEFORMATEX (10 bytes)

                // Can be a PCMWAVEFORMAT (16 bytes) or WAVEFORMATEX (18 bytes)

                // We validiated chunk as at least sizeof(PCMWAVEFORMAT) above

                break;

Kits/ATGTK/d3dx12.h

+1 −1
Original line number Diff line number Diff line
@@ -2666,7 +2666,7 @@ inline HRESULT D3DX12ParsePipelineStream(const D3D12_PIPELINE_STATE_STREAM_DESC& 
}

#endif // NTDDI_WIN10_RS2



// Requires the Windows 10 April 2018 Update SDK (17763)

// Requires the Windows 10 October 2018 Update SDK (17763)

#if defined(NTDDI_WIN10_RS5) && (NTDDI_VERSION >= NTDDI_WIN10_RS5)

//------------------------------------------------------------------------------------------------

inline bool operator==( const D3D12_CLEAR_VALUE &a, const D3D12_CLEAR_VALUE &b)

Kits/ATGTK/ControllerFont.h

+3 −3

File changed.

Contains only whitespace changes.