From cbf22ed19ea85e80f381db3479ec92538db32b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ansel?= Date: Sun, 11 Jan 2015 01:12:39 +0100 Subject: [PATCH] Add sln & proj files --- impl11/ddraw/DeviceResources.cpp | 5 +- impl11/ddraw/Direct3DTexture.cpp | 10 -- impl11/ddraw/ddraw.rc | Bin 0 -> 4598 bytes impl11/ddraw/ddraw.vcxproj | 148 ++++++++++++++++++++++ impl11/ddraw/ddraw.vcxproj.filters | 164 +++++++++++++++++++++++++ impl11/ddraw/resource.h | 14 +++ impl11/impl11.sln | 40 ++++++ impl11/shaders/shaders.vcxproj | 103 ++++++++++++++++ impl11/shaders/shaders.vcxproj.filters | 24 ++++ impl11/tests/tests.vcxproj | 90 ++++++++++++++ impl11/tests/tests.vcxproj.filters | 30 +++++ 11 files changed, 617 insertions(+), 11 deletions(-) create mode 100644 impl11/ddraw/ddraw.rc create mode 100644 impl11/ddraw/ddraw.vcxproj create mode 100644 impl11/ddraw/ddraw.vcxproj.filters create mode 100644 impl11/ddraw/resource.h create mode 100644 impl11/impl11.sln create mode 100644 impl11/shaders/shaders.vcxproj create mode 100644 impl11/shaders/shaders.vcxproj.filters create mode 100644 impl11/tests/tests.vcxproj create mode 100644 impl11/tests/tests.vcxproj.filters diff --git a/impl11/ddraw/DeviceResources.cpp b/impl11/ddraw/DeviceResources.cpp index 74d13a0d..c32ef251 100644 --- a/impl11/ddraw/DeviceResources.cpp +++ b/impl11/ddraw/DeviceResources.cpp @@ -98,7 +98,10 @@ HRESULT DeviceResources::Initialize() hr = D3D11CreateDevice(nullptr, this->_d3dDriverType, nullptr, createDeviceFlags, featureLevels, numFeatureLevels, D3D11_SDK_VERSION, &this->_d3dDevice, &this->_d3dFeatureLevel, &this->_d3dDeviceContext); } - this->CheckMultisamplingSupport(); + if (SUCCEEDED(hr)) + { + this->CheckMultisamplingSupport(); + } if (SUCCEEDED(hr)) { diff --git a/impl11/ddraw/Direct3DTexture.cpp b/impl11/ddraw/Direct3DTexture.cpp index e33082c9..e290e31f 100644 --- a/impl11/ddraw/Direct3DTexture.cpp +++ b/impl11/ddraw/Direct3DTexture.cpp @@ -217,16 +217,6 @@ HRESULT Direct3DTexture::Load( Direct3DTexture* d3dTexture = (Direct3DTexture*)lpD3DTexture; TextureSurface* surface = d3dTexture->_surface; - // debug texture vith name -// if (surface->_buffer[0] == 0 && surface->_buffer[1] != 0) -// { -//#if LOGGER -// str.str(""); -// str << "\ttex " << (const char*)(surface->_buffer + 1); -// LogText(str.str()); -//#endif -// } - if (d3dTexture->_textureView) { #if LOGGER diff --git a/impl11/ddraw/ddraw.rc b/impl11/ddraw/ddraw.rc new file mode 100644 index 0000000000000000000000000000000000000000..2b7e0af3e8ed75bd95e53ea35d25c13a1290b999 GIT binary patch literal 4598 zcmdUz+fLg+5QgWvQs2Q1H$|-=A>42YBv9Hw5IK}eNQe@kk!XUFAVBK-R=h;p@88X0 zJ9cOjZcMRv~BOWBD=B+ z>v0dDj~F}928`mnWp>Uy;z`oFcEg$#du^}SWz~&KPP zb(fA$vN!F}8rHOyRcz1dc4|jfg<4^LU^V*!rNQsMZ9%Cq5Bp1p#k+!bVT^1STqZHT z1f{-x$NmxM2!|$CAM?A1)!W!9JgU&wxFNGwjw`&t%E_q8&ijsBn5tMcDveSSU%?*|M@V3ofzau#o4`>v}A;)upqevLh`;<(Pr z6CN>fse;V2M_z3&Shlhh?1V@@A(DNSkF}hpQF%^{X5DAWRo)KSrE20YRfD|Bl8v_D zqs6KpNo}N|p2Mh9UT66bi~IN^(1Rsy^7525RkFI_PTK>XW%&+yChp{$Ko_^F)gJj= zomdlDiG0^xbfaH;i2OPc*rM(<|A`|=-*Gi#7wz_`9Sw3nLh`+p@nFr_qo|ClhH6@s zO4A}s(t5^{yoAyd{{`L35S*T0UremmiKJcA9Ch^bve(g3*ZPWptB@(6!3ck=2fM;UT`ar6Pd#+)Ph?}hw2&2Psot6mXVF)F(|H~9 z6J!Sv=9Rdm! zIFo&=&xo*71+3H^or7PQ7*ZUo7I&R?LQ#74c&onH^F|KU0jrMfGuq{&^1N2*{0!QZ z=&E%W-8hR}`C5JZfKi?OB%&Q6S6#*(k~_Sg4a*vmubf=@?FO$X)~@JSM^8S>zEK~u z?YfL<{!~|6#NzdtFszSvSG3F4;AuT2qv&NeAF@jytZrRwOyYSDl4sP+cn{6X+=`!B zJeS^Q{UE7Z zjc2N{)6ebsd*W}`h$$tH2{Vqv=0BkfP%>V!Z literal 0 HcmV?d00001 diff --git a/impl11/ddraw/ddraw.vcxproj b/impl11/ddraw/ddraw.vcxproj new file mode 100644 index 00000000..fb32ed5b --- /dev/null +++ b/impl11/ddraw/ddraw.vcxproj @@ -0,0 +1,148 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {C03DE3A0-EF2A-4596-AFDE-66E4C4FD6E23} + Win32Proj + ddraw + + + + DynamicLibrary + true + v120 + NotSet + + + DynamicLibrary + false + v120 + true + NotSet + + + + + + + + + + + + + true + + + false + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DDRAW_EXPORTS;%(PreprocessorDefinitions) + true + StreamingSIMDExtensions2 + + + Windows + true + ddraw.def + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;DDRAW_EXPORTS;%(PreprocessorDefinitions) + true + StreamingSIMDExtensions2 + Speed + + + Windows + false + true + true + ddraw.def + true + + + + + true + Document + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/impl11/ddraw/ddraw.vcxproj.filters b/impl11/ddraw/ddraw.vcxproj.filters new file mode 100644 index 00000000..506f80bb --- /dev/null +++ b/impl11/ddraw/ddraw.vcxproj.filters @@ -0,0 +1,164 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Fichiers sources + + + + + + Fichiers sources + + + Fichiers sources + + + Fichiers sources + + + Fichiers sources + + + Fichiers sources + + + Fichiers sources + + + Fichiers sources + + + Fichiers sources + + + Fichiers sources + + + Fichiers sources + + + Fichiers sources + + + Fichiers sources + + + Fichiers sources + + + Fichiers sources + + + Fichiers sources + + + Fichiers sources + + + Fichiers sources + + + Fichiers sources + + + Fichiers sources + + + Fichiers sources + + + Fichiers sources + + + + + Fichiers d%27en-tête + + + Fichiers d%27en-tête + + + Fichiers d%27en-tête + + + Fichiers d%27en-tête + + + Fichiers d%27en-tête + + + Fichiers d%27en-tête + + + Fichiers d%27en-tête + + + Fichiers d%27en-tête + + + Fichiers d%27en-tête + + + Fichiers d%27en-tête + + + Fichiers d%27en-tête + + + Fichiers d%27en-tête + + + Fichiers d%27en-tête + + + Fichiers d%27en-tête + + + Fichiers d%27en-tête + + + Fichiers d%27en-tête + + + Fichiers d%27en-tête + + + Fichiers d%27en-tête + + + Fichiers d%27en-tête + + + Fichiers d%27en-tête + + + Fichiers d%27en-tête + + + Fichiers d%27en-tête + + + Fichiers d%27en-tête + + + + + Fichiers de ressources + + + \ No newline at end of file diff --git a/impl11/ddraw/resource.h b/impl11/ddraw/resource.h new file mode 100644 index 00000000..6df89cd5 --- /dev/null +++ b/impl11/ddraw/resource.h @@ -0,0 +1,14 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by ddraw.rc + +// Valeurs par défaut suivantes des nouveaux objets +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/impl11/impl11.sln b/impl11/impl11.sln new file mode 100644 index 00000000..ff8ebaf6 --- /dev/null +++ b/impl11/impl11.sln @@ -0,0 +1,40 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ddraw", "ddraw\ddraw.vcxproj", "{C03DE3A0-EF2A-4596-AFDE-66E4C4FD6E23}" + ProjectSection(ProjectDependencies) = postProject + {EBD25ABF-9127-4887-9BF2-C7D3880BF68B} = {EBD25ABF-9127-4887-9BF2-C7D3880BF68B} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shaders", "shaders\shaders.vcxproj", "{EBD25ABF-9127-4887-9BF2-C7D3880BF68B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "tests\tests.vcxproj", "{0F3CC45E-5B7D-49DF-88E2-044BDB7554A0}" + ProjectSection(ProjectDependencies) = postProject + {C03DE3A0-EF2A-4596-AFDE-66E4C4FD6E23} = {C03DE3A0-EF2A-4596-AFDE-66E4C4FD6E23} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C03DE3A0-EF2A-4596-AFDE-66E4C4FD6E23}.Debug|Win32.ActiveCfg = Debug|Win32 + {C03DE3A0-EF2A-4596-AFDE-66E4C4FD6E23}.Debug|Win32.Build.0 = Debug|Win32 + {C03DE3A0-EF2A-4596-AFDE-66E4C4FD6E23}.Release|Win32.ActiveCfg = Release|Win32 + {C03DE3A0-EF2A-4596-AFDE-66E4C4FD6E23}.Release|Win32.Build.0 = Release|Win32 + {EBD25ABF-9127-4887-9BF2-C7D3880BF68B}.Debug|Win32.ActiveCfg = Debug|Win32 + {EBD25ABF-9127-4887-9BF2-C7D3880BF68B}.Debug|Win32.Build.0 = Debug|Win32 + {EBD25ABF-9127-4887-9BF2-C7D3880BF68B}.Release|Win32.ActiveCfg = Release|Win32 + {EBD25ABF-9127-4887-9BF2-C7D3880BF68B}.Release|Win32.Build.0 = Release|Win32 + {0F3CC45E-5B7D-49DF-88E2-044BDB7554A0}.Debug|Win32.ActiveCfg = Debug|Win32 + {0F3CC45E-5B7D-49DF-88E2-044BDB7554A0}.Debug|Win32.Build.0 = Debug|Win32 + {0F3CC45E-5B7D-49DF-88E2-044BDB7554A0}.Release|Win32.ActiveCfg = Release|Win32 + {0F3CC45E-5B7D-49DF-88E2-044BDB7554A0}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/impl11/shaders/shaders.vcxproj b/impl11/shaders/shaders.vcxproj new file mode 100644 index 00000000..f3be5309 --- /dev/null +++ b/impl11/shaders/shaders.vcxproj @@ -0,0 +1,103 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {EBD25ABF-9127-4887-9BF2-C7D3880BF68B} + shaders + + + + Application + true + v120 + MultiByte + + + Application + false + v120 + true + MultiByte + + + + + + + + + + + + + + + Level3 + Disabled + true + + + true + + + g_%(Filename) + + + $(OutDir)%(Filename).h + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + g_%(Filename) + + + $(OutDir)%(Filename).h + + + + + Pixel + Pixel + + + Vertex + Vertex + + + Pixel + Pixel + + + Pixel + Pixel + + + Vertex + Vertex + + + + + + \ No newline at end of file diff --git a/impl11/shaders/shaders.vcxproj.filters b/impl11/shaders/shaders.vcxproj.filters new file mode 100644 index 00000000..7b06150b --- /dev/null +++ b/impl11/shaders/shaders.vcxproj.filters @@ -0,0 +1,24 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + + + + + + \ No newline at end of file diff --git a/impl11/tests/tests.vcxproj b/impl11/tests/tests.vcxproj new file mode 100644 index 00000000..7d443877 --- /dev/null +++ b/impl11/tests/tests.vcxproj @@ -0,0 +1,90 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {0F3CC45E-5B7D-49DF-88E2-044BDB7554A0} + Win32Proj + tests + + + + Application + true + v120 + Unicode + + + Application + false + v120 + true + Unicode + + + + + + + + + + + + + true + + + false + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + + + + + + + + \ No newline at end of file diff --git a/impl11/tests/tests.vcxproj.filters b/impl11/tests/tests.vcxproj.filters new file mode 100644 index 00000000..48d8e1cf --- /dev/null +++ b/impl11/tests/tests.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Fichiers d%27en-tête + + + Fichiers d%27en-tête + + + + + Fichiers sources + + + \ No newline at end of file