From f3f35f88412135b1bf2d5049be4a5c68f137c31d Mon Sep 17 00:00:00 2001 From: havoc Date: Wed, 11 Nov 2009 16:40:26 +0000 Subject: [PATCH] rename R_MAX_OCCLUSION_QUERIES to MAX_OCCLUSION_QUERIES and move it to quakedef.h git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9468 d7cf8633-e32d-0410-b094-e92efae38249 --- gl_rmain.c | 2 +- quakedef.h | 2 ++ r_shadow.c | 4 ++-- render.h | 3 +-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gl_rmain.c b/gl_rmain.c index 3d4915b2..a202373c 100644 --- a/gl_rmain.c +++ b/gl_rmain.c @@ -197,7 +197,7 @@ rtexture_t *r_texture_gammaramps; unsigned int r_texture_gammaramps_serial; //rtexture_t *r_texture_fogintensity; -unsigned int r_queries[R_MAX_OCCLUSION_QUERIES]; +unsigned int r_queries[MAX_OCCLUSION_QUERIES]; unsigned int r_numqueries; unsigned int r_maxqueries; diff --git a/quakedef.h b/quakedef.h index d27b54d6..a004fa13 100644 --- a/quakedef.h +++ b/quakedef.h @@ -85,6 +85,7 @@ extern char engineversion[128]; #define MAX_SAVEGAMES 12 #define SAVEGAME_COMMENT_LENGTH 39 #define MAX_CLIENTNETWORKEYES 1 +#define MAX_OCCLUSION_QUERIES 256 #define MAX_WATERPLANES 2 #define MAX_CUBEMAPS 64 @@ -133,6 +134,7 @@ extern char engineversion[128]; #define MAX_SAVEGAMES 12 ///< max savegames listed in savegame menu #define SAVEGAME_COMMENT_LENGTH 39 ///< max comment length of savegame in menu #define MAX_CLIENTNETWORKEYES 1 ///< max number of locations that can be added to pvs when culling network entities +#define MAX_OCCLUSION_QUERIES 4096 ///< max number of GL_ARB_occlusion_query objects that can be used in one frame #define MAX_WATERPLANES 16 ///< max number of water planes visible (each one causes additional view renders) #define MAX_CUBEMAPS 256 ///< max number of cubemap textures loaded for light filters diff --git a/r_shadow.c b/r_shadow.c index 9dd92149..559bad0d 100644 --- a/r_shadow.c +++ b/r_shadow.c @@ -4742,11 +4742,11 @@ void R_DrawCoronas(void) { GL_ColorMask(0,0,0,0); if (r_maxqueries < (range + r_refdef.scene.numlights) * 2) - if (r_maxqueries < R_MAX_OCCLUSION_QUERIES) + if (r_maxqueries < MAX_OCCLUSION_QUERIES) { i = r_maxqueries; r_maxqueries = (range + r_refdef.scene.numlights) * 4; - r_maxqueries = min(r_maxqueries, R_MAX_OCCLUSION_QUERIES); + r_maxqueries = min(r_maxqueries, MAX_OCCLUSION_QUERIES); CHECKGLERROR qglGenQueriesARB(r_maxqueries - i, r_queries + i); CHECKGLERROR diff --git a/render.h b/render.h index d6bef5dd..71a2d80a 100644 --- a/render.h +++ b/render.h @@ -195,8 +195,7 @@ extern rtexture_t *r_texture_normalizationcube; extern rtexture_t *r_texture_fogattenuation; //extern rtexture_t *r_texture_fogintensity; -#define R_MAX_OCCLUSION_QUERIES 4096 -extern unsigned int r_queries[R_MAX_OCCLUSION_QUERIES]; +extern unsigned int r_queries[MAX_OCCLUSION_QUERIES]; extern unsigned int r_numqueries; extern unsigned int r_maxqueries; -- 2.39.2