From 0cd3f2241546053d2b64b7c53e6e7b73c5286df5 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sun, 31 May 2015 08:51:33 +1000 Subject: [PATCH] Remove unused draw modes, remove BlendEquation enum. --- GraphicsAPI/DirectXApi.cs | 3 +-- GraphicsAPI/IGraphicsApi.cs | 14 +------------- GraphicsAPI/OpenGLApi.cs | 3 +-- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/GraphicsAPI/DirectXApi.cs b/GraphicsAPI/DirectXApi.cs index d38a21403..06444c7a2 100644 --- a/GraphicsAPI/DirectXApi.cs +++ b/GraphicsAPI/DirectXApi.cs @@ -28,8 +28,7 @@ namespace ClassicalSharp.GraphicsAPI { MatrixStack curStack; PrimitiveType[] modeMappings = new PrimitiveType[] { PrimitiveType.TriangleList, PrimitiveType.LineList, - PrimitiveType.PointList, PrimitiveType.TriangleStrip, - PrimitiveType.LineStrip, PrimitiveType.TriangleFan, + PrimitiveType.TriangleStrip, }; public DirectXApi( Device device ) { diff --git a/GraphicsAPI/IGraphicsApi.cs b/GraphicsAPI/IGraphicsApi.cs index cae86e328..2bcc85307 100644 --- a/GraphicsAPI/IGraphicsApi.cs +++ b/GraphicsAPI/IGraphicsApi.cs @@ -251,19 +251,7 @@ namespace ClassicalSharp.GraphicsAPI { public enum DrawMode { Triangles = 0, Lines = 1, - Points = 2, - - TriangleStrip = 3, - LineStrip = 4, - TriangleFan = 5, - } - - public enum BlendEquation { - Add = 0, - Max = 1, - Min = 2, - Subtract = 3, - ReverseSubtract = 4, + TriangleStrip = 2, } public enum CompareFunc { diff --git a/GraphicsAPI/OpenGLApi.cs b/GraphicsAPI/OpenGLApi.cs index e57d4d50c..63121daf3 100644 --- a/GraphicsAPI/OpenGLApi.cs +++ b/GraphicsAPI/OpenGLApi.cs @@ -17,8 +17,7 @@ namespace ClassicalSharp.GraphicsAPI { int textureDimensions; const string vboExt = "GL_ARB_vertex_buffer_object"; BeginMode[] modeMappings = new BeginMode[] { - BeginMode.Triangles, BeginMode.Lines, BeginMode.Points, - BeginMode.TriangleStrip, BeginMode.LineStrip, BeginMode.TriangleFan + BeginMode.Triangles, BeginMode.Lines, BeginMode.TriangleStrip, }; public OpenGLApi() {