diff options
Diffstat (limited to 'src/engine/rendergl.cpp')
| -rw-r--r-- | src/engine/rendergl.cpp | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/src/engine/rendergl.cpp b/src/engine/rendergl.cpp index ac05313..08766a6 100644 --- a/src/engine/rendergl.cpp +++ b/src/engine/rendergl.cpp @@ -392,11 +392,9 @@ void gl_checkextensions() } else fatal("Framebuffer object support is required!"); - extern int fpdepthfx; if(ati) { minimizetcusage = 1; - if(hasTF && hasTRG) fpdepthfx = 1; // On Catalyst 10.2, issuing an occlusion query on the first draw using a given cubemap texture causes a nasty crash ati_cubemap_bug = 1; } @@ -406,8 +404,6 @@ void gl_checkextensions() rtsharefb = 0; // work-around for strange driver stalls involving when using many FBOs extern int filltjoints; if(glversion < 300 && !hasext("GL_EXT_gpu_shader4")) filltjoints = 0; // DX9 or less NV cards seem to not cause many sparklies - - if(hasTF && hasTRG) fpdepthfx = 1; } else { @@ -493,10 +489,8 @@ void gl_checkextensions() if(glversion >= 300 || hasext("GL_EXT_gpu_shader4")) { // on DX10 or above class cards (i.e. GF8 or RadeonHD) enable expensive features - extern int maxdynlights, depthfxsize, blurdepthfx, texcompress; + extern int maxdynlights, texcompress; maxdynlights = MAXDYNLIGHTS; - depthfxsize = 10; - blurdepthfx = 0; texcompress = max(texcompress, 1024 + 1); } } @@ -1039,9 +1033,8 @@ static float findsurface(const vec &v, int &abovemat) do { cube &c = lookupcube(o, 0, co, csize); - int mat = c.material&MATF_VOLUME; - abovemat = (int) MAT_AIR; - return o.z; + abovemat = (int) MAT_AIR; + return o.z; o.z = co.z + csize; } while(o.z < worldsize); @@ -1145,7 +1138,6 @@ void drawtextures() { if(minimized) { deferdrawtextures = true; return; } deferdrawtextures = false; - genenvmaps(); } int xtraverts, xtravertsva; @@ -1187,10 +1179,6 @@ void gl_drawframe() rendergame(true); renderavatar(); - if(wireframe && editmode) glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); - - drawdepthfxtex(); - if(wireframe && editmode) glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); rendermaterials(); @@ -1388,8 +1376,6 @@ void gl_drawhud() glEnable(GL_DEPTH_TEST); glDepthMask(GL_FALSE); - renderblendbrush(); - rendereditcursor(); glDepthMask(GL_TRUE); @@ -1454,8 +1440,7 @@ void gl_drawhud() xtravertsva/1024, glde, gbatches, - getnumqueries(), - rplanes + getnumqueries() }; loopi(8) if(prevstats[i]==curstats[i]) curstats[i] = nextstats[i]; |
