okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into sdl2

Browse source 
Conflicts:
	Makefile
	code/renderergl2/tr_image.c
This commit is contained in:
Tim Angus 2014-08-25 15:00:48 +01:00
commit 2a3368481d
24 changed files with 431 additions and 227 deletions
Download patch file Download diff file Expand all files Collapse all files

13
code/renderergl2/tr_local.h
View file

@ -364,6 +364,7 @@ enum
TB_SPECULARMAP = 4,
TB_SHADOWMAP = 5,
TB_CUBEMAP = 6,
TB_SHADOWMAP4 = 6,
NUM_TEXTURE_BUNDLES = 7
};
@ -633,10 +634,12 @@ typedef enum
UNIFORM_SHADOWMAP,
UNIFORM_SHADOWMAP2,
UNIFORM_SHADOWMAP3,
UNIFORM_SHADOWMAP4,
UNIFORM_SHADOWMVP,
UNIFORM_SHADOWMVP2,
UNIFORM_SHADOWMVP3,
UNIFORM_SHADOWMVP4,
UNIFORM_ENABLETEXTURES,
@ -760,7 +763,7 @@ typedef struct {
int num_pshadows;
struct pshadow_s *pshadows;
float sunShadowMvp[3][16];
float sunShadowMvp[4][16];
float sunDir[4];
float sunCol[4];
float sunAmbCol[4];
@ -1534,7 +1537,7 @@ typedef struct {
image_t *calcLevelsImage;
image_t *targetLevelsImage;
image_t *fixedLevelsImage;
image_t *sunShadowDepthImage[3];
image_t *sunShadowDepthImage[4];
image_t *screenShadowImage;
image_t *screenSsaoImage;
image_t *hdrDepthImage;
@ -1551,7 +1554,7 @@ typedef struct {
FBO_t *quarterFbo[2];
FBO_t *calcLevelsFbo;
FBO_t *targetLevelsFbo;
FBO_t *sunShadowFbo[3];
FBO_t *sunShadowFbo[4];
FBO_t *screenShadowFbo;
FBO_t *screenSsaoFbo;
FBO_t *hdrDepthFbo;
@ -1623,6 +1626,8 @@ typedef struct {
qboolean sunShadows;
vec3_t sunLight; // from the sky shader for this level
vec3_t sunDirection;
vec3_t lastCascadeSunDirection;
float lastCascadeSunMvp[16];
frontEndCounters_t pc;
int frontEndMsec; // not in pc due to clearing issue
@ -1766,6 +1771,8 @@ extern cvar_t *r_anaglyphMode;
extern cvar_t *r_mergeMultidraws;
extern cvar_t *r_mergeLeafSurfaces;
extern cvar_t *r_externalGLSL;
extern cvar_t *r_hdr;
extern cvar_t *r_floatLightmap;
extern cvar_t *r_postProcess;