pull from master #2
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… only for methods taking an array of com objects
…e of a field with an IntPtr. Fix code gen for duplicate methods with intptrs.
…rform manual layout instead.
…fields after with a different offset
…t having to deal with fixed references. Easier to maintain
Conflicts: Source/SharpDX/SharpDX.csproj
… bug and might be just a debugger issues...)
…teRootSignature. Move code SetEventOnCompletion to Fence. Add commandQueue.ExecuteCommandList taking a single command list
Conflicts: SharpDX.sln Source/Mapping.Direct3D1x.xml Source/Mapping.xml Source/SharpDX.DXGI/ModeDescription.cs Source/SharpDX.Direct3D11/BufferDescription.cs Source/SharpDX.Direct3D11/Mapping.xml Source/SharpDX/Mapping-core.xml Source/SharpDX/SharpDX.csproj Source/Tools/SharpGen/CodeGenApp.cs Source/Tools/SharpGen/Config/MappingRule.cs Source/Tools/SharpGen/Generator/InterfaceTransform.cs Source/Tools/SharpGen/Generator/StructTransform.cs Source/Tools/SharpGen/Model/CppElement.Extensions.cs Source/Tools/SharpGen/Model/CsBase.cs Source/Tools/SharpGen/Model/CsEnum.cs Source/Tools/SharpGen/Model/CsMethod.cs Source/Tools/SharpGen/Model/CsParameter.cs Source/Tools/SharpGen/Model/CsStruct.cs Source/Tools/SharpGen/Model/CsTypeBase.cs Source/Tools/SharpGen/SharpGen.csproj Source/Tools/SharpGen/Templates/Structures.tt
…nges are: - Move to .NET 4.5 - Use PCL whenever possible. - By default include all DX11/DX11.1/DX11.2. - Remove almost all #if/#else related to DX11/DX11.1/DX11.2. - Freeze generated code for Direct3D9/Direct3D10/DirectSound/DirectInput (They are no longer generated automatically from C++ as we are not going to update them in the future). - Add new defines STORE_APP, DESKTOP_APP
…id passing a Viewport while it is expecting a ViewportF (with floats)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.