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

diff --git a/gl_rmain.c b/gl_rmain.c
index 3d4915b2c02029ec6c4e29c713da50ac2ed5ae91..a202373c69f496cd9e6b130b01f24eb41101bc14 100644 (file)
--- 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 d27b54d634040dcf68f9bc8d8f674897616b790a..a004fa137c75777bb7f2fb3eb0947981bcab8de4 100644 (file)
--- 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 9dd9214960736986fecd9bfdb53acc720994e607..559bad0de9cc6a2a9761e371f3466f23395cd072 100644 (file)
--- 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 d6bef5dd7bf032454471a117573d2178ac19a538..71a2d80afceb0d976e37e36fc07502986729d4d3 100644 (file)
--- 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;