diff --git a/MonoGame.Framework/Graphics/Effect/Effect.cs b/MonoGame.Framework/Graphics/Effect/Effect.cs index 6ce1c991bee..11a05f7a146 100644 --- a/MonoGame.Framework/Graphics/Effect/Effect.cs +++ b/MonoGame.Framework/Graphics/Effect/Effect.cs @@ -101,7 +101,7 @@ public Effect (GraphicsDevice graphicsDevice, byte[] effectCode, int index, int if (!graphicsDevice.EffectCache.TryGetValue(effectKey, out cloneSource)) { using (var stream = new MemoryStream(effectCode, index + headerSize, count - headerSize, false)) - using (var reader = new BinaryReaderEx(stream)) + using (var reader = new BinaryReader(stream)) { // Create one. cloneSource = new Effect(graphicsDevice); diff --git a/MonoGame.Framework/Utilities/BinaryReaderEx.cs b/MonoGame.Framework/Utilities/BinaryReaderEx.cs deleted file mode 100644 index 005afa4a043..00000000000 --- a/MonoGame.Framework/Utilities/BinaryReaderEx.cs +++ /dev/null @@ -1,29 +0,0 @@ -// MonoGame - Copyright (C) The MonoGame Team -// This file is subject to the terms and conditions defined in -// file 'LICENSE.txt', which is part of this source code package. - -using System.IO; -using System.Text; - -namespace MonoGame.Framework.Utilities -{ - public class BinaryReaderEx : BinaryReader - { - public BinaryReaderEx(Stream input) : base(input) - { - } - - public BinaryReaderEx(Stream input, Encoding encoding) : base(input, encoding) - { - } - - public BinaryReaderEx(Stream input, Encoding encoding, bool leaveOpen) : base(input, encoding, leaveOpen) - { - } - - public new int Read7BitEncodedInt() - { - return base.Read7BitEncodedInt(); - } - } -} diff --git a/MonoGame.Framework/Utilities/BinaryWriterEx.cs b/MonoGame.Framework/Utilities/BinaryWriterEx.cs deleted file mode 100644 index 47998be76e0..00000000000 --- a/MonoGame.Framework/Utilities/BinaryWriterEx.cs +++ /dev/null @@ -1,33 +0,0 @@ -// MonoGame - Copyright (C) The MonoGame Team -// This file is subject to the terms and conditions defined in -// file 'LICENSE.txt', which is part of this source code package. - -using System.IO; -using System.Text; - -namespace MonoGame.Framework.Utilities -{ - public class BinaryWriterEx : BinaryWriter - { - protected BinaryWriterEx() - { - } - - public BinaryWriterEx(Stream output) : base(output) - { - } - - public BinaryWriterEx(Stream output, Encoding encoding) : base(output, encoding) - { - } - - public BinaryWriterEx(Stream output, Encoding encoding, bool leaveOpen) : base(output, encoding, leaveOpen) - { - } - - public new void Write7BitEncodedInt(int value) - { - base.Write7BitEncodedInt(value); - } - } -} diff --git a/Tools/MonoGame.Effect.Compiler/Effect/EffectObject.writer.cs b/Tools/MonoGame.Effect.Compiler/Effect/EffectObject.writer.cs index f6b267cb67f..1d3fc87d594 100644 --- a/Tools/MonoGame.Effect.Compiler/Effect/EffectObject.writer.cs +++ b/Tools/MonoGame.Effect.Compiler/Effect/EffectObject.writer.cs @@ -31,7 +31,7 @@ public void Write(BinaryWriter writer, Options options) // Write the rest to a memory stream. using(MemoryStream memStream = new MemoryStream()) - using(BinaryWriterEx memWriter = new BinaryWriterEx(memStream)) + using(BinaryWriter memWriter = new BinaryWriter(memStream)) { // Write all the constant buffers. memWriter.Write(ConstantBuffers.Count); @@ -142,14 +142,14 @@ public void Write(BinaryWriter writer, Options options) writer.Write(Header.ToCharArray()); } - private static void WriteParameters(BinaryWriterEx writer, d3dx_parameter[] parameters, int count) + private static void WriteParameters(BinaryWriter writer, d3dx_parameter[] parameters, int count) { writer.Write(count); for (var i = 0; i < count; i++) WriteParameter(writer, parameters[i]); } - private static void WriteParameter(BinaryWriterEx writer, d3dx_parameter param) + private static void WriteParameter(BinaryWriter writer, d3dx_parameter param) { var class_ = ToXNAParameterClass(param.class_); var type = ToXNAParameterType(param.type); @@ -180,7 +180,7 @@ private static void WriteParameter(BinaryWriterEx writer, d3dx_parameter param) } } - private static void WriteAnnotations(BinaryWriterEx writer, d3dx_parameter[] annotations) + private static void WriteAnnotations(BinaryWriter writer, d3dx_parameter[] annotations) { var count = annotations == null ? 0 : annotations.Length; writer.Write(count); diff --git a/Tools/MonoGame.Effect.Compiler/MonoGame.Effect.Compiler.csproj b/Tools/MonoGame.Effect.Compiler/MonoGame.Effect.Compiler.csproj index 8f849391c05..873de325637 100644 --- a/Tools/MonoGame.Effect.Compiler/MonoGame.Effect.Compiler.csproj +++ b/Tools/MonoGame.Effect.Compiler/MonoGame.Effect.Compiler.csproj @@ -55,7 +55,6 @@ -