refactor LoadEffectResource(...)

Shaders/Deferred/DeferredBasicEffect.cs

@@ -38,9 +38,9 @@ namespace nkast.Aether.Shaders
 
         static readonly String ResourceName = "nkast.Aether.Shaders.Resources.DeferredBasicEffect";
 
-        internal static byte[] LoadEffectResource(string name)
+        internal static byte[] LoadEffectResource(GraphicsDevice graphicsDevice, string name)
         {
-            name = GetResourceName(name);
+            name = GetResourceName(graphicsDevice, name);
             using (var stream = GetAssembly(typeof(DeferredBasicEffect)).GetManifestResourceStream(name))
             {
                 var bytecode = new byte[stream.Length];
@@ -49,7 +49,7 @@ namespace nkast.Aether.Shaders
             }
         }
 
-        private static string GetResourceName(string name)
+        private static string GetResourceName(GraphicsDevice graphicsDevice, string name)
         {
             String platformName = "";
             var version = "";
@@ -126,7 +126,7 @@ namespace nkast.Aether.Shaders
         #region Methods
 
          public DeferredBasicEffect(GraphicsDevice graphicsDevice)
-            : base(graphicsDevice, LoadEffectResource(ResourceName))
+            : base(graphicsDevice, LoadEffectResource(graphicsDevice, ResourceName))
         {    
             CacheEffectParameters(null);
         }

Shaders/Deferred/DeferredClearGBufferEffect.cs

@@ -33,9 +33,9 @@ namespace nkast.Aether.Shaders
 
         static readonly String ResourceName = "nkast.Aether.Shaders.Resources.DeferredClearGBuffer";
 
-        internal static byte[] LoadEffectResource(string name)
+        internal static byte[] LoadEffectResource(GraphicsDevice graphicsDevice, string name)
         {
-            name = GetResourceName(name);
+            name = GetResourceName(graphicsDevice, name);
             using (var stream = GetAssembly(typeof(DeferredClearGBufferEffect)).GetManifestResourceStream(name))
             {
                 var bytecode = new byte[stream.Length];
@@ -44,7 +44,7 @@ namespace nkast.Aether.Shaders
             }
         }
 
-        private static string GetResourceName(string name)
+        private static string GetResourceName(GraphicsDevice graphicsDevice, string name)
         {
             String platformName = "";
             var version = "";
@@ -103,7 +103,7 @@ namespace nkast.Aether.Shaders
         #region Methods
 
          public DeferredClearGBufferEffect(GraphicsDevice graphicsDevice)
-            : base(graphicsDevice, LoadEffectResource(ResourceName))
+            : base(graphicsDevice, LoadEffectResource(graphicsDevice, ResourceName))
         {    
             CacheEffectParameters(null);
         }

Shaders/Deferred/DeferredCombineEffect.cs

@@ -37,9 +37,9 @@ namespace nkast.Aether.Shaders
 
         static readonly String ResourceName = "nkast.Aether.Shaders.Resources.DeferredCombine";
 
-        internal static byte[] LoadEffectResource(string name)
+        internal static byte[] LoadEffectResource(GraphicsDevice graphicsDevice, string name)
         {
-            name = GetResourceName(name);
+            name = GetResourceName(graphicsDevice, name);
             using (var stream = GetAssembly(typeof(DeferredCombineEffect)).GetManifestResourceStream(name))
             {
                 var bytecode = new byte[stream.Length];
@@ -48,7 +48,7 @@ namespace nkast.Aether.Shaders
             }
         }
 
-        private static string GetResourceName(string name)
+        private static string GetResourceName(GraphicsDevice graphicsDevice, string name)
         {
             String platformName = "";
             var version = "";
@@ -125,7 +125,7 @@ namespace nkast.Aether.Shaders
         #region Methods
 
          public DeferredCombineEffect(GraphicsDevice graphicsDevice)
-            : base(graphicsDevice, LoadEffectResource(ResourceName))
+            : base(graphicsDevice, LoadEffectResource(graphicsDevice, ResourceName))
         {
             CacheEffectParameters(null);
         }

Shaders/Deferred/DeferredPointLightEffect.cs

@@ -50,9 +50,9 @@ namespace nkast.Aether.Shaders
 
         static readonly String ResourceName = "nkast.Aether.Shaders.Resources.DeferredPointLight";
 
-        internal static byte[] LoadEffectResource(string name)
+        internal static byte[] LoadEffectResource(GraphicsDevice graphicsDevice, string name)
         {
-            name = GetResourceName(name);
+            name = GetResourceName(graphicsDevice, name);
             using (var stream = GetAssembly(typeof(DeferredPointLightEffect)).GetManifestResourceStream(name))
             {
                 var bytecode = new byte[stream.Length];
@@ -61,7 +61,7 @@ namespace nkast.Aether.Shaders
             }
         }
 
-        private static string GetResourceName(string name)
+        private static string GetResourceName(GraphicsDevice graphicsDevice, string name)
         {
             String platformName = "";
             var version = "";
@@ -198,7 +198,7 @@ namespace nkast.Aether.Shaders
         #region Methods
 
          public DeferredPointLightEffect(GraphicsDevice graphicsDevice)
-            : base(graphicsDevice, LoadEffectResource(ResourceName))
+            : base(graphicsDevice, LoadEffectResource(graphicsDevice, ResourceName))
         {    
             CacheEffectParameters(null);
         }

Shaders/Deferred/DeferredSpotLightEffect.cs

@@ -54,9 +54,9 @@ namespace nkast.Aether.Shaders
 
         static readonly String ResourceName = "nkast.Aether.Shaders.Resources.DeferredSpotLight";
 
-        internal static byte[] LoadEffectResource(string name)
+        internal static byte[] LoadEffectResource(GraphicsDevice graphicsDevice, string name)
         {
-            name = GetResourceName(name);
+            name = GetResourceName(graphicsDevice, name);
             using (var stream = GetAssembly(typeof(DeferredPointLightEffect)).GetManifestResourceStream(name))
             {
                 var bytecode = new byte[stream.Length];
@@ -66,7 +66,7 @@ namespace nkast.Aether.Shaders
         }
 
 
-        private static string GetResourceName(string name)
+        private static string GetResourceName(GraphicsDevice graphicsDevice, string name)
         {
             String platformName = "";
             var version = "";
@@ -221,7 +221,7 @@ namespace nkast.Aether.Shaders
         #region Methods
 
          public DeferredSpotLightEffect(GraphicsDevice graphicsDevice)
-            : base(graphicsDevice, LoadEffectResource(ResourceName))
+            : base(graphicsDevice, LoadEffectResource(graphicsDevice, ResourceName))
         {    
             CacheEffectParameters(null);
         }

Shaders/FXAA/FXAAEffect.cs

@@ -48,9 +48,9 @@ namespace nkast.Aether.Shaders
 
         public const int FXAA = 0x00000001;
 
-        internal static byte[] LoadEffectResource(string name)
+        internal static byte[] LoadEffectResource(GraphicsDevice graphicsDevice, string name)
         {
-            name = GetResourceName(name);
+            name = GetResourceName(graphicsDevice, name);
             using (var stream = GetAssembly(typeof(FXAAEffect)).GetManifestResourceStream(name))
             {
                 var bytecode = new byte[stream.Length];
@@ -59,7 +59,7 @@ namespace nkast.Aether.Shaders
             }
         }
 
-        private static string GetResourceName(string name)
+        private static string GetResourceName(GraphicsDevice graphicsDevice, string name)
         {
             String platformName = "";
             var version = "";

Shaders/FXAA/FXAAGreenLumaHighEffect.cs

@@ -25,7 +25,7 @@ namespace nkast.Aether.Shaders
 
 
         public FXAAGreenLumaHighEffect(GraphicsDevice graphicsDevice)
-            : base(graphicsDevice, LoadEffectResource(ResourceName))
+            : base(graphicsDevice, LoadEffectResource(graphicsDevice, ResourceName))
         {    
         }
     }

Shaders/FXAA/FXAAGreenLumaLowEffect.cs

@@ -25,7 +25,7 @@ namespace nkast.Aether.Shaders
 
 
         public FXAAGreenLumaLowEffect(GraphicsDevice graphicsDevice)
-            : base(graphicsDevice, LoadEffectResource(ResourceName))
+            : base(graphicsDevice, LoadEffectResource(graphicsDevice, ResourceName))
         {    
         }        
     }

Shaders/FXAA/FXAAGreenLumaMediumEffect.cs

@@ -25,7 +25,7 @@ namespace nkast.Aether.Shaders
 
 
         public FXAAGreenLumaMediumEffect(GraphicsDevice graphicsDevice)
-            : base(graphicsDevice, LoadEffectResource(ResourceName))
+            : base(graphicsDevice, LoadEffectResource(graphicsDevice, ResourceName))
         {    
         }
     }

Shaders/InfiniteGrid/InfiniteGridEffect.cs

@@ -41,7 +41,7 @@ namespace nkast.Aether.Shaders
 
         static readonly String ResourceName = "nkast.Aether.Shaders.Resources.InfiniteGridEffect";
 
-        private static string GetResourceName(string name, GraphicsDevice graphicsDevice)
+        private static string GetResourceName(GraphicsDevice graphicsDevice, string name)
         {
             string profileName = (graphicsDevice.GraphicsProfile == GraphicsProfile.Reach) ? ".Reach" : ".HiDef";
             String platformName = "";
@@ -83,9 +83,9 @@ namespace nkast.Aether.Shaders
             return name + profileName + platformName + version;
         }
 
-        internal static byte[] LoadEffectResource(string name, GraphicsDevice graphicsDevice)
+        internal static byte[] LoadEffectResource(GraphicsDevice graphicsDevice, string name)
         {
-            name = GetResourceName(name, graphicsDevice);
+            name = GetResourceName(graphicsDevice, name);
             using (var stream = GetAssembly(typeof(InfiniteGridEffect)).GetManifestResourceStream(name))
             {
                 var bytecode = new byte[stream.Length];
@@ -153,7 +153,7 @@ namespace nkast.Aether.Shaders
         #region Methods
 
         public InfiniteGridEffect(GraphicsDevice graphicsDevice)
-            : base(graphicsDevice, LoadEffectResource(ResourceName, graphicsDevice))
+            : base(graphicsDevice, LoadEffectResource(graphicsDevice, ResourceName))
         {
             CacheEffectParameters(null);
             worldViewProjectionParam.SetValue(Matrix.Identity);

Shaders/Tilemap/TilemapEffect.cs

@@ -65,9 +65,9 @@ namespace nkast.Aether.Shaders
 
         static readonly String ResourceName = "nkast.Aether.Shaders.Resources.TilemapEffect";
 
-        internal static byte[] LoadEffectResource(string name)
+        internal static byte[] LoadEffectResource(GraphicsDevice graphicsDevice, string name)
         {
-            name = GetResourceName(name);
+            name = GetResourceName(graphicsDevice, name);
             using (var stream = GetAssembly(typeof(TilemapEffect)).GetManifestResourceStream(name))
             using (var ms = new MemoryStream())
             {
@@ -76,7 +76,7 @@ namespace nkast.Aether.Shaders
             }
         }
 
-        private static string GetResourceName(string name)
+        private static string GetResourceName(GraphicsDevice graphicsDevice, string name)
         {
             String platformName = "";
             var version = "";
@@ -315,7 +315,7 @@ namespace nkast.Aether.Shaders
         #region Methods
 
          public TilemapEffect(GraphicsDevice graphicsDevice)
-            : base(graphicsDevice, LoadEffectResource(ResourceName))
+            : base(graphicsDevice, LoadEffectResource(graphicsDevice, ResourceName))
         {    
             CacheEffectParameters(null);
         }