renderstatepackager-include-diligentcore.diff 3.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495969798
  1. diff --git a/RenderStatePackager/include/ParsingEnvironment.hpp b/RenderStatePackager/include/ParsingEnvironment.hpp
  2. index 496253e..b96fae2 100644
  3. --- a/RenderStatePackager/include/ParsingEnvironment.hpp
  4. +++ b/RenderStatePackager/include/ParsingEnvironment.hpp
  5. @@ -29,10 +29,10 @@
  6. #include <vector>
  7. #include <memory>
  8. -#include "ThreadPool.hpp"
  9. -#include "RefCntAutoPtr.hpp"
  10. -#include "ArchiverFactory.h"
  11. -#include "ArchiverFactoryLoader.h"
  12. +#include "DiligentCore/Common/interface/ThreadPool.hpp"
  13. +#include "DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  14. +#include "DiligentCore/Graphics/Archiver/interface/ArchiverFactory.h"
  15. +#include "DiligentCore/Graphics/Archiver/interface/ArchiverFactoryLoader.h"
  16. #include "RenderStatePackager.hpp"
  17. namespace Diligent
  18. diff --git a/RenderStatePackager/include/RenderStatePackager.hpp b/RenderStatePackager/include/RenderStatePackager.hpp
  19. index e3e132d..61cfe3b 100644
  20. --- a/RenderStatePackager/include/RenderStatePackager.hpp
  21. +++ b/RenderStatePackager/include/RenderStatePackager.hpp
  22. @@ -29,12 +29,12 @@
  23. #include <vector>
  24. #include <unordered_map>
  25. -#include "Archiver.h"
  26. -#include "ThreadPool.hpp"
  27. -#include "RefCntAutoPtr.hpp"
  28. -#include "SerializationDevice.h"
  29. +#include "DiligentCore/Graphics/Archiver/interface/Archiver.h"
  30. +#include "DiligentCore/Common/interface/ThreadPool.hpp"
  31. +#include "DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  32. +#include "DiligentCore/Graphics/Archiver/interface/SerializationDevice.h"
  33. #include "RenderStateNotationParser.h"
  34. -#include "HashUtils.hpp"
  35. +#include "DiligentCore/Common/interface/HashUtils.hpp"
  36. namespace Diligent
  37. {
  38. diff --git a/RenderStatePackager/src/ParsingEnvironment.cpp b/RenderStatePackager/src/ParsingEnvironment.cpp
  39. index fc6a016..2a8f68e 100644
  40. --- a/RenderStatePackager/src/ParsingEnvironment.cpp
  41. +++ b/RenderStatePackager/src/ParsingEnvironment.cpp
  42. @@ -25,10 +25,10 @@
  43. */
  44. #include "ParsingEnvironment.hpp"
  45. -#include "DynamicLinearAllocator.hpp"
  46. -#include "DefaultRawMemoryAllocator.hpp"
  47. -#include "DataBlobImpl.hpp"
  48. -#include "FileWrapper.hpp"
  49. +#include "DiligentCore/Common/interface/DynamicLinearAllocator.hpp"
  50. +#include "DiligentCore/Common/interface/DefaultRawMemoryAllocator.hpp"
  51. +#include "DiligentCore/Common/interface/DataBlobImpl.hpp"
  52. +#include "DiligentCore/Common/interface/FileWrapper.hpp"
  53. namespace Diligent
  54. {
  55. diff --git a/RenderStatePackager/src/RenderStatePackager.cpp b/RenderStatePackager/src/RenderStatePackager.cpp
  56. index 9499958..3e777fa 100644
  57. --- a/RenderStatePackager/src/RenderStatePackager.cpp
  58. +++ b/RenderStatePackager/src/RenderStatePackager.cpp
  59. @@ -29,13 +29,13 @@
  60. #include <deque>
  61. #include <sstream>
  62. -#include "GraphicsAccessories.hpp"
  63. -#include "BasicMath.hpp"
  64. -#include "DefaultRawMemoryAllocator.hpp"
  65. -#include "DynamicLinearAllocator.hpp"
  66. -#include "SerializedPipelineState.h"
  67. -#include "FileSystem.hpp"
  68. -#include "FileWrapper.hpp"
  69. +#include "DiligentCore/Graphics/GraphicsAccessories/interface/GraphicsAccessories.hpp"
  70. +#include "DiligentCore/Common/interface/BasicMath.hpp"
  71. +#include "DiligentCore/Common/interface/DefaultRawMemoryAllocator.hpp"
  72. +#include "DiligentCore/Common/interface/DynamicLinearAllocator.hpp"
  73. +#include "DiligentCore/Graphics/Archiver/interface/SerializedPipelineState.h"
  74. +#include "DiligentCore/Platforms/interface/FileSystem.hpp"
  75. +#include "DiligentCore/Common/interface/FileWrapper.hpp"
  76. namespace Diligent
  77. {
  78. diff --git a/RenderStatePackager/src/main.cpp b/RenderStatePackager/src/main.cpp
  79. index 759ae30..c15d5fb 100644
  80. --- a/RenderStatePackager/src/main.cpp
  81. +++ b/RenderStatePackager/src/main.cpp
  82. @@ -24,7 +24,7 @@
  83. * of the possibility of such damages.
  84. */
  85. -#include "FileWrapper.hpp"
  86. +#include "DiligentCore/Common/interface/FileWrapper.hpp"
  87. #include "RenderStateNotationParser.h"
  88. #include "ParsingEnvironment.hpp"
  89. #include "args.hxx"