Merge branch 'master' (early part 2) into sdl2

This commit is contained in:
Zack Middleton 2014-06-03 00:50:50 -05:00
commit b12a9acf4d
12 changed files with 214 additions and 230 deletions

View file

@ -1421,10 +1421,6 @@ typedef struct {
qboolean framebufferMultisample;
qboolean framebufferBlit;
qboolean textureSrgb;
qboolean framebufferSrgb;
qboolean textureSrgbDecode;
qboolean depthClamp;
qboolean seamlessCubeMap;
@ -1787,7 +1783,10 @@ extern cvar_t *r_forceAutoExposureMax;
extern cvar_t *r_cameraExposure;
extern cvar_t *r_srgb;
extern cvar_t *r_materialGamma;
extern cvar_t *r_lightGamma;
extern cvar_t *r_framebufferGamma;
extern cvar_t *r_tonemapGamma;
extern cvar_t *r_depthPrepass;
extern cvar_t *r_ssao;