From edb1a5c5b7ee024a1a2502f4046b054763284524 Mon Sep 17 00:00:00 2001 From: havoc Date: Mon, 1 Mar 2004 04:29:38 +0000 Subject: [PATCH] fixed cubemap upload scaling crash (was using power of 2 size for parsing input, should have used input size) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3942 d7cf8633-e32d-0410-b094-e92efae38249 --- gl_textures.c | 2 +- todo | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gl_textures.c b/gl_textures.c index f3e8a1b2..cc43c8d3 100644 --- a/gl_textures.c +++ b/gl_textures.c @@ -786,7 +786,7 @@ static void R_Upload(gltexture_t *glt, qbyte *data) for (i = 0;i < 6;i++) { prevbuffer = texturebuffer; - texturebuffer += width * height * depth * glt->textype->inputbytesperpixel; + texturebuffer += glt->width * glt->height * glt->depth * glt->textype->inputbytesperpixel; if (glt->width != width || glt->height != height || glt->depth != depth) { Image_Resample(prevbuffer, glt->width, glt->height, glt->depth, resizebuffer, width, height, depth, glt->image->bytesperpixel, r_lerpimages.integer); diff --git a/todo b/todo index f0fe95d1..d73edec5 100644 --- a/todo +++ b/todo @@ -40,7 +40,7 @@ d darkplaces: added RENDER_LIGHT flag to entity_render_t to make rtlighting opti d darkplaces: cleaned up rtlight handling, merging most code between world rtlights and dlights d darkplaces: safety checked lightmap access in Mod_Q1BSP_RecursiveLightPoint as one map Sajt uses was crashing (Sajt) -n darkplaces: upgrade network protocol to send precise angles, and make EF_LOWPRECISION downgrade both origin and angles (-Urre, -Wazat for Battlemech, FrikaC, -mashakos, RenegadeC, Sajt) -0 darkplaces: figure out why cubemap upload scaling crashes (Urre) +-n darkplaces: fix cubemap upload scaling crashes (Urre) 0 darkplaces: make screenshots save to screenshots/fniggium%04i.tga in GAME_FNIGGIUM (Sajt) 0 darkplaces: make screenshots save to screenshots directory (Sajt) 2 darkplaces: make corona occlusion testing use GL_ARB_occlusion_query instead of a CL_TraceLine (Riot) -- 2.39.2