summaryrefslogtreecommitdiff
path: root/src/graphics
diff options
context:
space:
mode:
authorBryan Hoyle <starfoxprime@gmail.com>2012-08-12 19:13:32 (GMT)
committer Bryan Hoyle <starfoxprime@gmail.com>2012-08-12 19:13:32 (GMT)
commit90f505c2dae361b4950119cdca6abbd7f7b7a0e5 (patch)
treeb73b5c3662c731712ad4b9f074c21b0f49e26bb2 /src/graphics
parent1b2e0e68bd62fd429724e691d6318872af3f5dae (diff)
downloadpowder-90f505c2dae361b4950119cdca6abbd7f7b7a0e5.zip
powder-90f505c2dae361b4950119cdca6abbd7f7b7a0e5.tar.gz
Revert "fixed --opengl-renderer from segfaulting. Added a gitignore for vim swap files"
This reverts commit 90f71f3b11373bda502405856062803111f247d5.
Diffstat (limited to 'src/graphics')
-rw-r--r--src/graphics/Renderer.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/graphics/Renderer.cpp b/src/graphics/Renderer.cpp
index 57d4f8d..c0e0455 100644
--- a/src/graphics/Renderer.cpp
+++ b/src/graphics/Renderer.cpp
@@ -123,10 +123,8 @@ void Renderer::clearScreen(float alpha)
glClear(GL_COLOR_BUFFER_BIT);
#endif
#ifdef OGLI
-#ifndef OGLR
std::fill(vid, vid+(VIDXRES*VIDYRES), 0);
#endif
-#endif
}
#ifdef OGLR
void Renderer::checkShader(GLuint shader, char * shname)
@@ -2376,9 +2374,7 @@ void Renderer::ClearAccumulation()
std::fill(fire_r[0]+0, fire_r[(YRES/CELL)-1]+((XRES/CELL)-1), 0);
std::fill(fire_g[0]+0, fire_g[(YRES/CELL)-1]+((XRES/CELL)-1), 0);
std::fill(fire_b[0]+0, fire_b[(YRES/CELL)-1]+((XRES/CELL)-1), 0);
-#ifndef OGLR
std::fill(persistentVid, persistentVid+(VIDXRES*YRES), 0);
-#endif
}
void Renderer::AddRenderMode(unsigned int mode)