From ec13b77717ef9003fb5faaca2555cbbdfbe77930 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 29 Apr 2018 11:40:47 +0200 Subject: [PATCH] - removed empty gl_wall.h. --- src/gl/data/gl_vertexbuffer.cpp | 10 +++------- src/gl/scene/gl_drawinfo.h | 5 ++++- src/gl/scene/gl_wall.h | 23 ----------------------- 3 files changed, 7 insertions(+), 31 deletions(-) delete mode 100644 src/gl/scene/gl_wall.h diff --git a/src/gl/data/gl_vertexbuffer.cpp b/src/gl/data/gl_vertexbuffer.cpp index 4c5f0144a..63dceb762 100644 --- a/src/gl/data/gl_vertexbuffer.cpp +++ b/src/gl/data/gl_vertexbuffer.cpp @@ -157,13 +157,9 @@ FFlatVertexBuffer::FFlatVertexBuffer(int width, int height) mIndex = mCurIndex = 0; mNumReserved = NUM_RESERVED; - if (gl.buffermethod == BM_DEFERRED) - { - Map(); - memcpy(map, &vbo_shadowdata[0], mNumReserved * sizeof(FFlatVertex)); - Unmap(); - } - + Map(); + memcpy(map, &vbo_shadowdata[0], mNumReserved * sizeof(FFlatVertex)); + Unmap(); } FFlatVertexBuffer::~FFlatVertexBuffer() diff --git a/src/gl/scene/gl_drawinfo.h b/src/gl/scene/gl_drawinfo.h index 14a782996..9f7f05f7b 100644 --- a/src/gl/scene/gl_drawinfo.h +++ b/src/gl/scene/gl_drawinfo.h @@ -1,9 +1,12 @@ #ifndef __GL_DRAWINFO_H #define __GL_DRAWINFO_H -#include "gl/scene/gl_wall.h" #include "hwrenderer/scene/hw_drawinfo.h" +#ifdef _MSC_VER +#pragma warning(disable:4244) +#endif + class GLSceneDrawer; enum GLDrawItemType diff --git a/src/gl/scene/gl_wall.h b/src/gl/scene/gl_wall.h deleted file mode 100644 index 9b1d42186..000000000 --- a/src/gl/scene/gl_wall.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef __GL_WALL_H -#define __GL_WALL_H -//========================================================================== -// -// One wall segment in the draw list -// -//========================================================================== -#include "r_defs.h" -#include "r_data/renderstyle.h" -#include "textures/textures.h" -#include "r_data/colormaps.h" -#include "hwrenderer/scene/hw_drawstructs.h" - -#ifdef _MSC_VER -#pragma warning(disable:4244) -#endif - -struct particle_t; - -// Light + color - - -#endif