Commit cdb27fb4 authored by Chuck Walbourn's avatar Chuck Walbourn
Browse files

Refreshed samples

parent d9ee2bb9

Kits/ATGTK/ATGColors.h

+24 −24
Original line number Diff line number Diff line
@@ -20,37 +20,37 @@ namespace ATG 
{

    namespace Colors

    {

        XMGLOBALCONST DirectX::XMVECTORF32 Background = { 0.254901975f, 0.254901975f, 0.254901975f, 1.f }; // #414141

        XMGLOBALCONST DirectX::XMVECTORF32 Green      = { 0.062745102f, 0.486274511f, 0.062745102f, 1.f }; // #107c10

        XMGLOBALCONST DirectX::XMVECTORF32 Blue       = { 0.019607844f, 0.372549027f, 0.803921580f, 1.f }; // #055fcd

        XMGLOBALCONST DirectX::XMVECTORF32 Orange     = { 0.764705896f, 0.176470593f, 0.019607844f, 1.f }; // #c32d05

        XMGLOBALCONST DirectX::XMVECTORF32 DarkGrey   = { 0.200000003f, 0.200000003f, 0.200000003f, 1.f }; // #333333

        XMGLOBALCONST DirectX::XMVECTORF32 LightGrey  = { 0.478431374f, 0.478431374f, 0.478431374f, 1.f }; // #7a7a7a

        XMGLOBALCONST DirectX::XMVECTORF32 OffWhite   = { 0.635294139f, 0.635294139f, 0.635294139f, 1.f }; // #a2a2a2

        XMGLOBALCONST DirectX::XMVECTORF32 White      = { 0.980392158f, 0.980392158f, 0.980392158f, 1.f }; // #fafafa

        XMGLOBALCONST DirectX::XMVECTORF32 Background = { { { 0.254901975f, 0.254901975f, 0.254901975f, 1.f } } }; // #414141

        XMGLOBALCONST DirectX::XMVECTORF32 Green      = { { { 0.062745102f, 0.486274511f, 0.062745102f, 1.f } } }; // #107c10

        XMGLOBALCONST DirectX::XMVECTORF32 Blue       = { { { 0.019607844f, 0.372549027f, 0.803921580f, 1.f } } }; // #055fcd

        XMGLOBALCONST DirectX::XMVECTORF32 Orange     = { { { 0.764705896f, 0.176470593f, 0.019607844f, 1.f } } }; // #c32d05

        XMGLOBALCONST DirectX::XMVECTORF32 DarkGrey   = { { { 0.200000003f, 0.200000003f, 0.200000003f, 1.f } } }; // #333333

        XMGLOBALCONST DirectX::XMVECTORF32 LightGrey  = { { { 0.478431374f, 0.478431374f, 0.478431374f, 1.f } } }; // #7a7a7a

        XMGLOBALCONST DirectX::XMVECTORF32 OffWhite   = { { { 0.635294139f, 0.635294139f, 0.635294139f, 1.f } } }; // #a2a2a2

        XMGLOBALCONST DirectX::XMVECTORF32 White      = { { { 0.980392158f, 0.980392158f, 0.980392158f, 1.f } } }; // #fafafa

    };



    namespace ColorsLinear

    {

        XMGLOBALCONST DirectX::XMVECTORF32 Background = { 0.052860655f, 0.052860655f, 0.052860655f, 1.f };

        XMGLOBALCONST DirectX::XMVECTORF32 Green      = { 0.005181516f, 0.201556236f, 0.005181516f, 1.f };

        XMGLOBALCONST DirectX::XMVECTORF32 Blue       = { 0.001517635f, 0.114435382f, 0.610495627f, 1.f };

        XMGLOBALCONST DirectX::XMVECTORF32 Orange     = { 0.545724571f, 0.026241219f, 0.001517635f, 1.f };

        XMGLOBALCONST DirectX::XMVECTORF32 DarkGrey   = { 0.033104762f, 0.033104762f, 0.033104762f, 1.f };

        XMGLOBALCONST DirectX::XMVECTORF32 LightGrey  = { 0.194617808f, 0.194617808f, 0.194617808f, 1.f };

        XMGLOBALCONST DirectX::XMVECTORF32 OffWhite   = { 0.361306787f, 0.361306787f, 0.361306787f, 1.f };

        XMGLOBALCONST DirectX::XMVECTORF32 White      = { 0.955973506f, 0.955973506f, 0.955973506f, 1.f };

        XMGLOBALCONST DirectX::XMVECTORF32 Background = { { { 0.052860655f, 0.052860655f, 0.052860655f, 1.f } } };

        XMGLOBALCONST DirectX::XMVECTORF32 Green      = { { { 0.005181516f, 0.201556236f, 0.005181516f, 1.f } } };

        XMGLOBALCONST DirectX::XMVECTORF32 Blue       = { { { 0.001517635f, 0.114435382f, 0.610495627f, 1.f } } };

        XMGLOBALCONST DirectX::XMVECTORF32 Orange     = { { { 0.545724571f, 0.026241219f, 0.001517635f, 1.f } } };

        XMGLOBALCONST DirectX::XMVECTORF32 DarkGrey   = { { { 0.033104762f, 0.033104762f, 0.033104762f, 1.f } } };

        XMGLOBALCONST DirectX::XMVECTORF32 LightGrey  = { { { 0.194617808f, 0.194617808f, 0.194617808f, 1.f } } };

        XMGLOBALCONST DirectX::XMVECTORF32 OffWhite   = { { { 0.361306787f, 0.361306787f, 0.361306787f, 1.f } } };

        XMGLOBALCONST DirectX::XMVECTORF32 White      = { { { 0.955973506f, 0.955973506f, 0.955973506f, 1.f } } };

    };



    namespace ColorsHDR

    {

        XMGLOBALCONST DirectX::XMVECTORF32 Background = { 0.052860655f * 2.f, 0.052860655f * 2.f, 0.052860655f * 2.f, 1.f };

        XMGLOBALCONST DirectX::XMVECTORF32 Green = { 0.005181516f * 2.f, 0.201556236f * 2.f, 0.005181516f * 2.f, 1.f };

        XMGLOBALCONST DirectX::XMVECTORF32 Blue = { 0.001517635f * 2.f, 0.114435382f * 2.f, 0.610495627f * 2.f, 1.f };

        XMGLOBALCONST DirectX::XMVECTORF32 Orange = { 0.545724571f * 2.f, 0.026241219f * 2.f, 0.001517635f * 2.f, 1.f };

        XMGLOBALCONST DirectX::XMVECTORF32 DarkGrey = { 0.033104762f * 2.f, 0.033104762f * 2.f, 0.033104762f * 2.f, 1.f };

        XMGLOBALCONST DirectX::XMVECTORF32 LightGrey = { 0.194617808f * 2.f, 0.194617808f * 2.f, 0.194617808f * 2.f, 1.f };

        XMGLOBALCONST DirectX::XMVECTORF32 OffWhite = { 0.361306787f * 2.f, 0.361306787f * 2.f, 0.361306787f * 2.f, 1.f };

        XMGLOBALCONST DirectX::XMVECTORF32 White = { 0.955973506f * 2.f, 0.955973506f * 2.f, 0.955973506f * 2.f, 1.f };

        XMGLOBALCONST DirectX::XMVECTORF32 Background = { { { 0.052860655f * 2.f, 0.052860655f * 2.f, 0.052860655f * 2.f, 1.f } } };

        XMGLOBALCONST DirectX::XMVECTORF32 Green      = { { { 0.005181516f * 2.f, 0.201556236f * 2.f, 0.005181516f * 2.f, 1.f } } };

        XMGLOBALCONST DirectX::XMVECTORF32 Blue       = { { { 0.001517635f * 2.f, 0.114435382f * 2.f, 0.610495627f * 2.f, 1.f } } };

        XMGLOBALCONST DirectX::XMVECTORF32 Orange     = { { { 0.545724571f * 2.f, 0.026241219f * 2.f, 0.001517635f * 2.f, 1.f } } };

        XMGLOBALCONST DirectX::XMVECTORF32 DarkGrey   = { { { 0.033104762f * 2.f, 0.033104762f * 2.f, 0.033104762f * 2.f, 1.f } } };

        XMGLOBALCONST DirectX::XMVECTORF32 LightGrey  = { { { 0.194617808f * 2.f, 0.194617808f * 2.f, 0.194617808f * 2.f, 1.f } } };

        XMGLOBALCONST DirectX::XMVECTORF32 OffWhite   = { { { 0.361306787f * 2.f, 0.361306787f * 2.f, 0.361306787f * 2.f, 1.f } } };

        XMGLOBALCONST DirectX::XMVECTORF32 White      = { { { 0.955973506f * 2.f, 0.955973506f * 2.f, 0.955973506f * 2.f, 1.f } } };

    };

}
 
 No newline at end of file

Kits/ATGTK/CSVReader.h

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ namespace DX 


        typedef std::unique_ptr<void, handle_closer> ScopedHandle;



        inline HANDLE safe_handle(HANDLE h) { return (h == INVALID_HANDLE_VALUE) ? 0 : h; }

        inline HANDLE safe_handle(HANDLE h) { return (h == INVALID_HANDLE_VALUE) ? nullptr : h; }



        std::unique_ptr<wchar_t[]>  m_data;

        const wchar_t*              m_end;

Kits/ATGTK/FrontPanel/FrontPanelDisplay.cpp

+6 −6
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ void FrontPanelDisplay::SaveWICToFile(_In_z_ const wchar_t *filename, REFGUID gu 


    ComPtr<IWICBitmapEncoder> encoder;

    ThrowIfFailed(

        pWIC->CreateEncoder(guidContainerFormat, 0, encoder.GetAddressOf())

        pWIC->CreateEncoder(guidContainerFormat, nullptr, encoder.GetAddressOf())

    );



    ThrowIfFailed(
@@ -359,7 +359,7 @@ BufferDesc FrontPanelDisplay::LoadWICFromFile(_In_z_ const wchar_t* filename, st 


    ComPtr<IWICBitmapDecoder> decoder;

    ThrowIfFailed(

        pWIC->CreateDecoderFromFilename(filename, 0, GENERIC_READ, WICDecodeMetadataCacheOnDemand, decoder.GetAddressOf())

        pWIC->CreateDecoderFromFilename(filename, nullptr, GENERIC_READ, WICDecodeMetadataCacheOnDemand, decoder.GetAddressOf())

    );



    UINT frameCount = 0;
@@ -399,7 +399,7 @@ BufferDesc FrontPanelDisplay::LoadWICFromFile(_In_z_ const wchar_t* filename, st 
    {

        // No format conversion or resize needed

        ThrowIfFailed(

            frame->CopyPixels(0, static_cast<UINT>(rowPitch), static_cast<UINT>(imageSize), data.get())

            frame->CopyPixels(nullptr, static_cast<UINT>(rowPitch), static_cast<UINT>(imageSize), data.get())

        );

    }

    else if (m_displayWidth != width || m_displayHeight != height)
@@ -423,7 +423,7 @@ BufferDesc FrontPanelDisplay::LoadWICFromFile(_In_z_ const wchar_t* filename, st 
        {

            // No format conversion needed

            ThrowIfFailed(

                scaler->CopyPixels(0, static_cast<UINT>(rowPitch), static_cast<UINT>(imageSize), data.get())

                scaler->CopyPixels(nullptr, static_cast<UINT>(rowPitch), static_cast<UINT>(imageSize), data.get())

            );

        }

        else
@@ -449,7 +449,7 @@ BufferDesc FrontPanelDisplay::LoadWICFromFile(_In_z_ const wchar_t* filename, st 
            );



            ThrowIfFailed(

                FC->CopyPixels(0, static_cast<UINT>(rowPitch), static_cast<UINT>(imageSize), data.get())

                FC->CopyPixels(nullptr, static_cast<UINT>(rowPitch), static_cast<UINT>(imageSize), data.get())

            );

        }

    }
@@ -477,7 +477,7 @@ BufferDesc FrontPanelDisplay::LoadWICFromFile(_In_z_ const wchar_t* filename, st 
        );



        ThrowIfFailed(

            FC->CopyPixels(0, static_cast<UINT>(rowPitch), static_cast<UINT>(imageSize), data.get())

            FC->CopyPixels(nullptr, static_cast<UINT>(rowPitch), static_cast<UINT>(imageSize), data.get())

        );

    }

Kits/ATGTK/OSHelpers.h

+1 −1
Original line number Diff line number Diff line
@@ -15,5 +15,5 @@ namespace DX 


    typedef std::unique_ptr<void, handle_closer> ScopedHandle;



    inline HANDLE safe_handle(HANDLE h) { return (h == INVALID_HANDLE_VALUE) ? 0 : h; }

    inline HANDLE safe_handle(HANDLE h) { return (h == INVALID_HANDLE_VALUE) ? nullptr : h; }

}

Kits/ATGTK/PerformanceTimersXbox.cpp

+2 −2
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ void GPUCommandListTimer<t_CommandList>::Frame::ComputeFrame(_In_ t_CommandList* 


        DebugWarnings(j, start, end);



        const static double c_FrequencyInvMS = 1000.0 / double(D3D11X_XBOX_GPU_TIMESTAMP_FREQUENCY);

        static const double c_FrequencyInvMS = 1000.0 / double(D3D11X_XBOX_GPU_TIMESTAMP_FREQUENCY);

        float value = float(double(end - start) * c_FrequencyInvMS);

        m_timing[j] = value;

        m_avg[j] = UpdateRunningAverage(m_avg[j], value);
@@ -578,7 +578,7 @@ void GPUContextTimer<t_Context>::Frame::ComputeFrame(_In_ t_Context* context) 


        DebugWarnings(j, start, end);



        const static double c_FrequencyInvMS = 1000.0 / double(D3D11X_XBOX_GPU_TIMESTAMP_FREQUENCY);

        static const double c_FrequencyInvMS = 1000.0 / double(D3D11X_XBOX_GPU_TIMESTAMP_FREQUENCY);

        float value = float(double(end - start) * c_FrequencyInvMS);

        m_timing[j] = value;

        m_avg[j] = UpdateRunningAverage(m_avg[j], value);