doom3-bfg/neo/renderer/OpenGL
Robert Beckebans 29f5488c89 Merge branch 'SSGI' into HDR-linearRGB
Conflicts:
	base/renderprogs/global.inc
	base/renderprogs/interactionAmbient.pixel
	neo/renderer/OpenGL/gl_Image.cpp
	neo/renderer/RenderProgs_embedded.h
2016-01-11 19:35:34 +01:00
..
gl_backend.cpp Misc linear RGB experiments 2015-12-21 14:12:03 +01:00
gl_GraphicsAPIWrapper.cpp 64 bit HDR with adaptive tone mapping ported from XreaL 2015-12-20 12:28:46 +01:00
gl_Image.cpp Merge branch 'SSGI' into HDR-linearRGB 2016-01-11 19:35:34 +01:00