backup/anx.framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

- improved exception handling in RenderSystem DX10

Browse Source 
- added visual studio extension to build script
This commit is contained in:
Glatzemann 2012-11-19 14:04:17 +00:00 committed by Konstantin Koch
parent 412e4885c9
commit b188b24a30
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
RenderSystems/ANX.RenderSystem.Windows.DX10/EffectDX.cs
View File

@ -66,8 +66,16 @@ namespace ANX.RenderSystem.Windows.DX10
public EffectDX(GraphicsDevice graphicsDevice, Effect managedEffect, Stream effectStream) public EffectDX(GraphicsDevice graphicsDevice, Effect managedEffect, Stream effectStream)
: this(managedEffect) : this(managedEffect)
{ {
var device = ((GraphicsDeviceDX)graphicsDevice.NativeDevice).NativeDevice; var device = ((GraphicsDeviceDX)graphicsDevice.NativeDevice).NativeDevice;
NativeEffect = new Dx10.Effect(device, GetByteCode(effectStream));
try
{
NativeEffect = new Dx10.Effect(device, GetByteCode(effectStream));
}
catch (SharpDX.SharpDXException ex)
{
System.Diagnostics.Debugger.Break();
}
} }
#endregion #endregion

4
RenderSystems/ANX.RenderSystem.Windows.DX10/Properties/AssemblyInfo.cs
View File

@ -32,7 +32,7 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben: // übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.7.25.*")] [assembly: AssemblyVersion("0.7.26.*")]
[assembly: AssemblyFileVersion("0.7.25.0")] [assembly: AssemblyFileVersion("0.7.26.0")]
[assembly: InternalsVisibleTo("ANX.Framework.ContentPipeline")] [assembly: InternalsVisibleTo("ANX.Framework.ContentPipeline")]

8
build/ANX.Framework.build
View File

@ -480,8 +480,10 @@
<property name="wix.dir" value="${path::combine(environment::get-variable('WIX'), 'bin')}" readonly="true" /> <property name="wix.dir" value="${path::combine(environment::get-variable('WIX'), 'bin')}" readonly="true" />
<loadtasks assembly="${wix.dir}\Microsoft.Tools.WindowsInstallerXml.NAntTasks.dll" /> <loadtasks assembly="${wix.dir}\Microsoft.Tools.WindowsInstallerXml.NAntTasks.dll" />
<candle out="${build.dir}/${build.configuration}/installer/" exedir="${wix.dir}" extensions="WixUIExtension;WiXUtilExtension;WixVSExtension"> <candle out="${build.dir}/${build.configuration}/installer/"
exedir="${wix.dir}"
extensions="WixUIExtension;WiXUtilExtension;WixVSExtension">
<sources> <sources>
<include name="../Installer/anx.wxs" /> <include name="../Installer/anx.wxs" />
</sources> </sources>
@ -496,7 +498,7 @@
warningsaserrors="true" warningsaserrors="true"
suppressices="ICE57" suppressices="ICE57"
cultures="en-us" cultures="en-us"
extensions="WixUIExtension;WiXUtilExtension" extensions="WixUIExtension;WiXUtilExtension;WixVSExtension"
rebuild="true" rebuild="true"
suppresspdb="true"> suppresspdb="true">
<!-- Specify additional options --> <!-- Specify additional options -->