Commit95f1a07

AndrewSt

committed

[Direct3D10] remove Debug.Assert

1 parent2d97c18 commit95f1a07Copy full SHA for 95f1a07

File tree

2 files changed

-25

lines changed

Source/SharpDX.Direct3D10
- Resource.cs
- Texture1D.cs

2 files changed

-25

lines changed

`‎Source/SharpDX.Direct3D10/Resource.cs‎`

Lines changed: 0 additions & 22 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,6 @@ public static T FromSwapChain<T>(SwapChain swapChain, int index) where T : Resou`
`47`	`47`	`/// <returns>The loaded texture object.</returns>`
`48`	`48`	`publicstaticTFromFile<T>(Devicedevice,stringfileName)whereT:Resource`
`49`	`49`	`{`
`50`		`-System.Diagnostics.Debug.Assert(typeof(T)==typeof(Texture1D)\|\|typeof(T)==typeof(Texture2D)\|\|`
`51`		`-typeof(T)==typeof(Texture3D));`
`52`		`-`
`53`	`50`	`IntPtrtemp;`
`54`	`51`	`ResultresultOut;`
`55`	`52`	`D3DX10.CreateTextureFromFile(device,fileName,null,IntPtr.Zero,outtemp,outresultOut);`
`@@ -66,9 +63,6 @@ public static T FromFile<T>(Device device, string fileName) where T : Resource`
`66`	`63`	`/// <returns>The loaded texture object.</returns>`
`67`	`64`	`publicstaticTFromFile<T>(Devicedevice,stringfileName,ImageLoadInformationloadInfo)whereT:Resource`
`68`	`65`	`{`
`69`		`-System.Diagnostics.Debug.Assert(typeof(T)==typeof(Texture1D)\|\|typeof(T)==typeof(Texture2D)\|\|`
`70`		`-typeof(T)==typeof(Texture3D));`
`71`		`-`
`72`	`66`	`IntPtrtemp;`
`73`	`67`	`ResultresultOut;`
`74`	`68`	`D3DX10.CreateTextureFromFile(device,fileName,loadInfo,IntPtr.Zero,outtemp,outresultOut);`
`@@ -84,13 +78,8 @@ public static T FromFile<T>(Device device, string fileName, ImageLoadInformation`
`84`	`78`	`/// <returns>The loaded texture object.</returns>`
`85`	`79`	`publicstaticTFromMemory<T>(Devicedevice,byte[]memory)whereT:Resource`
`86`	`80`	`{`
`87`		`-System.Diagnostics.Debug.Assert(typeof(T)==typeof(Texture1D)\|\|typeof(T)==typeof(Texture2D)\|\|`
`88`		`-typeof(T)==typeof(Texture3D));`
`89`		`-`
`90`	`81`	`unsafe`
`91`	`82`	`{`
`92`		`-System.Diagnostics.Debug.Assert(memory!=null);`
`93`		`-System.Diagnostics.Debug.Assert(memory.Length>0);`
`94`	`83`	`IntPtrtemp;`
`95`	`84`	`ResultresultOut;`
`96`	`85`	`fixed(void*pBuffer=&memory[0])`
`@@ -110,13 +99,8 @@ public static T FromMemory<T>(Device device, byte[] memory) where T : Resource`
`110`	`99`	`/// <returns>The loaded texture object.</returns>`
`111`	`100`	`publicstaticTFromMemory<T>(Devicedevice,byte[]memory,ImageLoadInformationloadInfo)whereT:Resource`
`112`	`101`	`{`
`113`		`-System.Diagnostics.Debug.Assert(typeof(T)==typeof(Texture1D)\|\|typeof(T)==typeof(Texture2D)\|\|`
`114`		`-typeof(T)==typeof(Texture3D));`
`115`		`-`
`116`	`102`	`unsafe`
`117`	`103`	`{`
`118`		`-System.Diagnostics.Debug.Assert(memory!=null);`
`119`		`-System.Diagnostics.Debug.Assert(memory.Length>0);`
`120`	`104`	`IntPtrtemp;`
`121`	`105`	`ResultresultOut;`
`122`	`106`	`fixed(void*pBuffer=&memory[0])`
`@@ -165,9 +149,6 @@ public static T FromStream<T>(Device device, Stream stream, int sizeInBytes, Ima`
`165`	`149`	`publicstaticvoidToFile<T>(Ttexture,ImageFileFormatformat,stringfileName)`
`166`	`150`	`whereT:Resource`
`167`	`151`	`{`
`168`		`-System.Diagnostics.Debug.Assert(typeof(T)==typeof(Texture1D)\|\|typeof(T)==typeof(Texture2D)\|\|`
`169`		`-typeof(T)==typeof(Texture3D));`
`170`		`-`
`171`	`152`	`D3DX10.SaveTextureToFile(texture,format,fileName);`
`172`	`153`	`}`
`173`	`154`
`@@ -181,9 +162,6 @@ public static void ToFile<T>(T texture, ImageFileFormat format, string fileName)`
`181`	`162`	`publicstaticvoidToStream<T>(Ttexture,ImageFileFormatformat,Streamstream)`
`182`	`163`	`whereT:Resource`
`183`	`164`	`{`
`184`		`-System.Diagnostics.Debug.Assert(typeof(T)==typeof(Texture1D)\|\|typeof(T)==typeof(Texture2D)\|\|`
`185`		`-typeof(T)==typeof(Texture3D));`
`186`		`-`
`187`	`165`	`Blobblob;`
`188`	`166`	`D3DX10.SaveTextureToMemory(texture,format,outblob,0);`
`189`	`167`

`‎Source/SharpDX.Direct3D10/Texture1D.cs‎`

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ public Texture1D(Device device, Texture1DDescription description)`
`46`	`46`	`publicTexture1D(Devicedevice,Texture1DDescriptiondescription,DataStreamdata)`
`47`	`47`	`:this(device,description,new[]{data})`
`48`	`48`	`{`
`49`		`-System.Diagnostics.Debug.Assert(data!=null);`
`50`	`49`	`}`
`51`	`50`
`52`	`51`	`/// <summary>`
`@@ -58,8 +57,6 @@ public Texture1D(Device device, Texture1DDescription description, DataStream dat`
`58`	`57`	`publicTexture1D(Devicedevice,Texture1DDescriptiondescription,DataStream[]data)`
`59`	`58`	`:base(IntPtr.Zero)`
`60`	`59`	`{`
`61`		`-System.Diagnostics.Debug.Assert(data!=null);`
`62`		`-`
`63`	`60`	`varsubResourceDatas=newDataBox[data.Length];`
`64`	`61`	`for(inti=0;i<subResourceDatas.Length;i++)`
`65`	`62`	`subResourceDatas[i].DataPointer=data[i].DataPointer;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit95f1a07

File tree

2 files changed

2 files changed

`‎Source/SharpDX.Direct3D10/Resource.cs‎`

`‎Source/SharpDX.Direct3D10/Texture1D.cs‎`

0 commit comments