From 12a846e8facf090aaeb68fcabf55867f5eaed747 Mon Sep 17 00:00:00 2001 From: lucy96chen <47800040+lucy96chen@users.noreply.github.com> Date: Thu, 4 Aug 2022 16:59:28 -0700 Subject: Split debug-layer into smaller files (#2344) * checkpoint commit * debug-layer split, does not compile * Almost compiles, rebasing before making any further changes * everything compiles and passes tests locally * Added tools/gfx/debug-layer to premake and ran premake Co-authored-by: Yong He --- tools/gfx/cpu/cpu-base.h | 2 -- tools/gfx/cpu/cpu-device.cpp | 11 +++++++++++ tools/gfx/cpu/cpu-device.h | 3 +++ tools/gfx/cpu/cpu-helper-functions.cpp | 8 +------- tools/gfx/cpu/cpu-helper-functions.h | 2 +- 5 files changed, 16 insertions(+), 10 deletions(-) (limited to 'tools/gfx/cpu') diff --git a/tools/gfx/cpu/cpu-base.h b/tools/gfx/cpu/cpu-base.h index 4629686b7..6f30662ec 100644 --- a/tools/gfx/cpu/cpu-base.h +++ b/tools/gfx/cpu/cpu-base.h @@ -2,8 +2,6 @@ // Shared header file for CPU implementation #pragma once -#include - #include "slang.h" #include "slang-com-ptr.h" #include "slang-com-helper.h" diff --git a/tools/gfx/cpu/cpu-device.cpp b/tools/gfx/cpu/cpu-device.cpp index 92c08ef71..0db2b0fa7 100644 --- a/tools/gfx/cpu/cpu-device.cpp +++ b/tools/gfx/cpu/cpu-device.cpp @@ -1,6 +1,8 @@ // cpu-device.cpp #include "cpu-device.h" +#include + #include "cpu-buffer.h" #include "cpu-pipeline-state.h" #include "cpu-query.h" @@ -290,4 +292,13 @@ namespace cpu } } // namespace cpu + +Result SLANG_MCALL createCPUDevice(const IDevice::Desc* desc, IDevice** outDevice) +{ + RefPtr result = new cpu::DeviceImpl(); + SLANG_RETURN_ON_FAIL(result->initialize(*desc)); + returnComPtr(outDevice, result); + return SLANG_OK; +} + } // namespace gfx diff --git a/tools/gfx/cpu/cpu-device.h b/tools/gfx/cpu/cpu-device.h index d216eb0be..d90ce1e8b 100644 --- a/tools/gfx/cpu/cpu-device.h +++ b/tools/gfx/cpu/cpu-device.h @@ -95,4 +95,7 @@ private: }; } // namespace cpu + +Result SLANG_MCALL createCPUDevice(const IDevice::Desc* desc, IDevice** outDevice); + } // namespace gfx diff --git a/tools/gfx/cpu/cpu-helper-functions.cpp b/tools/gfx/cpu/cpu-helper-functions.cpp index 1aa9d82eb..f21be8d66 100644 --- a/tools/gfx/cpu/cpu-helper-functions.cpp +++ b/tools/gfx/cpu/cpu-helper-functions.cpp @@ -7,12 +7,6 @@ namespace gfx { using namespace Slang; -Result SLANG_MCALL createCPUDevice(const IDevice::Desc* desc, IDevice** outDevice) -{ - RefPtr result = new cpu::DeviceImpl(); - SLANG_RETURN_ON_FAIL(result->initialize(*desc)); - returnComPtr(outDevice, result); - return SLANG_OK; -} + } // namespace gfx diff --git a/tools/gfx/cpu/cpu-helper-functions.h b/tools/gfx/cpu/cpu-helper-functions.h index 1f122b750..ba8d4c88e 100644 --- a/tools/gfx/cpu/cpu-helper-functions.h +++ b/tools/gfx/cpu/cpu-helper-functions.h @@ -6,6 +6,6 @@ namespace gfx { using namespace Slang; -Result SLANG_MCALL createCPUDevice(const IDevice::Desc* desc, IDevice** outDevice); + } // namespace gfx -- cgit v1.2.3