X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_backend.c;h=fe474eac5b9183511ede900565a56e51e2236354;hb=08991a19cd367575a6cc54b3846023526907b693;hp=d41570e5e66f04fa57e3e8129cdefd6d3d03d684;hpb=e93d18b81c4c43ade8be7bb9c5d30710e12554b8;p=xonotic%2Fdarkplaces.git diff --git a/gl_backend.c b/gl_backend.c index d41570e5..fe474eac 100644 --- a/gl_backend.c +++ b/gl_backend.c @@ -1,11 +1,14 @@ #include "quakedef.h" #include "image.h" +#include "jpeg.h" -cvar_t gl_mesh_maxverts = {0, "gl_mesh_maxverts", "1024"}; -cvar_t gl_mesh_floatcolors = {0, "gl_mesh_floatcolors", "1"}; cvar_t gl_mesh_drawrangeelements = {0, "gl_mesh_drawrangeelements", "1"}; +cvar_t gl_mesh_testarrayelement = {0, "gl_mesh_testarrayelement", "0"}; +cvar_t gl_mesh_testmanualfeeding = {0, "gl_mesh_testmanualfeeding", "0"}; cvar_t gl_delayfinish = {CVAR_SAVE, "gl_delayfinish", "0"}; +cvar_t gl_paranoid = {0, "gl_paranoid", "0"}; +cvar_t gl_printcheckerror = {0, "gl_printcheckerror", "0"}; cvar_t r_render = {0, "r_render", "1"}; cvar_t gl_dither = {CVAR_SAVE, "gl_dither", "1"}; // whether or not to use dithering @@ -72,13 +75,6 @@ void SCR_ScreenShot_f (void); // these are externally accessible int r_lightmapscalebit; float r_colorscale; -GLfloat *varray_vertex, *varray_buf_vertex; -GLfloat *varray_color, *varray_buf_color; -GLfloat *varray_texcoord[MAX_TEXTUREUNITS], *varray_buf_texcoord[MAX_TEXTUREUNITS]; -int mesh_maxverts; -int varray_offset = 0, varray_offsetnext = 0; -GLuint *varray_buf_elements; -int mesh_maxelements = 3072; static matrix4x4_t backend_viewmatrix; static matrix4x4_t backend_modelmatrix; @@ -87,7 +83,6 @@ static matrix4x4_t backend_glmodelviewmatrix; static matrix4x4_t backend_projectmatrix; static int backendunits, backendactive; -static GLubyte *varray_bcolor, *varray_buf_bcolor; static mempool_t *gl_backend_mempool; /* @@ -96,6 +91,7 @@ note: here's strip order for a terrain row: |\ |\ |\ |\ | | \| \| \| \| A--B--C--D--E +clockwise A0B, 01B, B1C, 12C, C2D, 23D, D3E, 34E @@ -105,94 +101,72 @@ A0B, 01B, B1C, 12C, C2D, 23D, D3E, 34E *elements++ = i; *elements++ = i + 1; *elements++ = i + row + 1; -*/ -void GL_Backend_AllocElementsArray(void) + +for (y = 0;y < rows - 1;y++) { - if (varray_buf_elements) - Mem_Free(varray_buf_elements); - varray_buf_elements = Mem_Alloc(gl_backend_mempool, mesh_maxelements * sizeof(GLuint)); + for (x = 0;x < columns - 1;x++) + { + i = y * rows + x; + *elements++ = i + columns; + *elements++ = i; + *elements++ = i + columns + 1; + *elements++ = i; + *elements++ = i + 1; + *elements++ = i + columns + 1; + } } -void GL_Backend_FreeElementArray(void) +alternative: +0--1--2--3--4 +| /| /|\ | /| +|/ |/ | \|/ | +A--B--C--D--E +counterclockwise + +for (y = 0;y < rows - 1;y++) { - if (varray_buf_elements) - Mem_Free(varray_buf_elements); - varray_buf_elements = NULL; + for (x = 0;x < columns - 1;x++) + { + i = y * rows + x; + *elements++ = i; + *elements++ = i + columns; + *elements++ = i + columns + 1; + *elements++ = i + columns; + *elements++ = i + columns + 1; + *elements++ = i + 1; + } } +*/ int polygonelements[768]; +static void R_Mesh_CacheArray_Startup(void); +static void R_Mesh_CacheArray_Shutdown(void); void GL_Backend_AllocArrays(void) { - int i; - if (!gl_backend_mempool) - { gl_backend_mempool = Mem_AllocPool("GL_Backend"); - varray_buf_vertex = NULL; - varray_buf_color = NULL; - varray_buf_bcolor = NULL; - varray_buf_elements = NULL; - for (i = 0;i < MAX_TEXTUREUNITS;i++) - varray_buf_texcoord[i] = NULL; - } - - if (varray_buf_vertex) - Mem_Free(varray_buf_vertex); - varray_buf_vertex = NULL; - if (varray_buf_color) - Mem_Free(varray_buf_color); - varray_buf_color = NULL; - if (varray_buf_bcolor) - Mem_Free(varray_buf_bcolor); - varray_buf_bcolor = NULL; - for (i = 0;i < MAX_TEXTUREUNITS;i++) - { - if (varray_buf_texcoord[i]) - Mem_Free(varray_buf_texcoord[i]); - varray_buf_texcoord[i] = NULL; - } - - varray_buf_vertex = Mem_Alloc(gl_backend_mempool, mesh_maxverts * sizeof(GLfloat[4])); - varray_buf_color = Mem_Alloc(gl_backend_mempool, mesh_maxverts * sizeof(GLfloat[4])); - varray_buf_bcolor = Mem_Alloc(gl_backend_mempool, mesh_maxverts * sizeof(GLubyte[4])); - for (i = 0;i < backendunits;i++) - varray_buf_texcoord[i] = Mem_Alloc(gl_backend_mempool, mesh_maxverts * sizeof(GLfloat[4])); - for (;i < MAX_TEXTUREUNITS;i++) - varray_buf_texcoord[i] = NULL; - - GL_Backend_AllocElementsArray(); + R_Mesh_CacheArray_Startup(); } void GL_Backend_FreeArrays(void) { - int i; + R_Mesh_CacheArray_Shutdown(); Mem_FreePool(&gl_backend_mempool); - - varray_buf_vertex = NULL; - varray_buf_color = NULL; - varray_buf_bcolor = NULL; - for (i = 0;i < MAX_TEXTUREUNITS;i++) - varray_buf_texcoord[i] = NULL; - - varray_buf_elements = NULL; } static void gl_backend_start(void) { - Con_Printf("OpenGL Backend started with gl_mesh_maxverts %i\n", gl_mesh_maxverts.integer); + Con_DPrintf("OpenGL Backend started\n"); if (qglDrawRangeElements != NULL) { + CHECKGLERROR qglGetIntegerv(GL_MAX_ELEMENTS_VERTICES, &gl_maxdrawrangeelementsvertices); + CHECKGLERROR qglGetIntegerv(GL_MAX_ELEMENTS_INDICES, &gl_maxdrawrangeelementsindices); CHECKGLERROR - Con_Printf("glDrawRangeElements detected (max vertices %i, max indices %i)\n", gl_maxdrawrangeelementsvertices, gl_maxdrawrangeelementsindices); - } - if (strstr(gl_renderer, "3Dfx")) - { - Con_Printf("3Dfx driver detected, forcing gl_mesh_floatcolors to 0 to prevent crashs\n"); - Cvar_SetValueQuick(&gl_mesh_floatcolors, 0); + Con_DPrintf("glDrawRangeElements detected (max vertices %i, max indices %i)\n", gl_maxdrawrangeelementsvertices, gl_maxdrawrangeelementsindices); } backendunits = min(MAX_TEXTUREUNITS, gl_textureunits); @@ -207,28 +181,11 @@ static void gl_backend_shutdown(void) backendunits = 0; backendactive = false; - Con_Printf("OpenGL Backend shutting down\n"); + Con_DPrintf("OpenGL Backend shutting down\n"); GL_Backend_FreeArrays(); } -void GL_Backend_CheckCvars(void) -{ - // 21760 is (65536 / 3) rounded off to a multiple of 128 - if (gl_mesh_maxverts.integer < 1024) - Cvar_SetValueQuick(&gl_mesh_maxverts, 1024); - if (gl_mesh_maxverts.integer > 21760) - Cvar_SetValueQuick(&gl_mesh_maxverts, 21760); -} - -void GL_Backend_ResizeArrays(int numvertices) -{ - Cvar_SetValueQuick(&gl_mesh_maxverts, numvertices); - GL_Backend_CheckCvars(); - mesh_maxverts = gl_mesh_maxverts.integer; - GL_Backend_AllocArrays(); -} - static void gl_backend_newmap(void) { } @@ -248,14 +205,15 @@ void gl_backend_init(void) Cvar_RegisterVariable(&gl_dither); Cvar_RegisterVariable(&gl_lockarrays); Cvar_RegisterVariable(&gl_delayfinish); + Cvar_RegisterVariable(&gl_paranoid); + Cvar_RegisterVariable(&gl_printcheckerror); #ifdef NORENDER Cvar_SetValue("r_render", 0); #endif - Cvar_RegisterVariable(&gl_mesh_maxverts); - Cvar_RegisterVariable(&gl_mesh_floatcolors); Cvar_RegisterVariable(&gl_mesh_drawrangeelements); - GL_Backend_CheckCvars(); + Cvar_RegisterVariable(&gl_mesh_testarrayelement); + Cvar_RegisterVariable(&gl_mesh_testmanualfeeding); R_RegisterModule("GL_Backend", gl_backend_start, gl_backend_shutdown, gl_backend_newmap); } @@ -371,9 +329,12 @@ typedef struct gltextureunit_s { int t1d, t2d, t3d, tcubemap; int arrayenabled; + int arrayis3d; + const void *pointer_texcoord; float rgbscale, alphascale; int combinergb, combinealpha; // FIXME: add more combine stuff + matrix4x4_t matrix; } gltextureunit_t; @@ -383,11 +344,15 @@ static struct int blendfunc2; int blend; GLboolean depthmask; - int depthdisable; + int depthtest; int unit; int clientunit; gltextureunit_t units[MAX_TEXTUREUNITS]; - int colorarray; + float color4f[4]; + int lockrange_first; + int lockrange_count; + const void *pointer_vertex; + const void *pointer_color; } gl_state; @@ -395,31 +360,26 @@ void GL_SetupTextureState(void) { int i; gltextureunit_t *unit; + gl_state.unit = -1; + gl_state.clientunit = -1; for (i = 0;i < backendunits;i++) { - if (qglActiveTexture) - qglActiveTexture(GL_TEXTURE0_ARB + (gl_state.unit = i));CHECKGLERROR - if (qglClientActiveTexture) - qglClientActiveTexture(GL_TEXTURE0_ARB + (gl_state.clientunit = i));CHECKGLERROR + GL_ActiveTexture(i); + GL_ClientActiveTexture(i); unit = gl_state.units + i; unit->t1d = 0; unit->t2d = 0; unit->t3d = 0; unit->tcubemap = 0; + unit->pointer_texcoord = NULL; unit->rgbscale = 1; unit->alphascale = 1; unit->combinergb = GL_MODULATE; unit->combinealpha = GL_MODULATE; - unit->arrayenabled = false; + + qglTexCoordPointer(2, GL_FLOAT, sizeof(float[2]), NULL);CHECKGLERROR qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR - if (gl_texture3d || gl_texturecubemap) - { - qglTexCoordPointer(3, GL_FLOAT, sizeof(float[4]), varray_buf_texcoord[i]);CHECKGLERROR - } - else - { - qglTexCoordPointer(2, GL_FLOAT, sizeof(float[4]), varray_buf_texcoord[i]);CHECKGLERROR - } + qglDisable(GL_TEXTURE_1D);CHECKGLERROR qglDisable(GL_TEXTURE_2D);CHECKGLERROR if (gl_texture3d) @@ -436,7 +396,7 @@ void GL_SetupTextureState(void) qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, GL_MODULATE);CHECKGLERROR qglTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_ARB, GL_TEXTURE);CHECKGLERROR qglTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_ARB, GL_PREVIOUS_ARB);CHECKGLERROR - qglTexEnvi(GL_TEXTURE_ENV, GL_SOURCE2_RGB_ARB, GL_CONSTANT_ARB);CHECKGLERROR + qglTexEnvi(GL_TEXTURE_ENV, GL_SOURCE2_RGB_ARB, GL_TEXTURE);CHECKGLERROR // for GL_INTERPOLATE_ARB mode qglTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_RGB_ARB, GL_SRC_COLOR);CHECKGLERROR qglTexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_RGB_ARB, GL_SRC_COLOR);CHECKGLERROR qglTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_RGB_ARB, GL_SRC_ALPHA);CHECKGLERROR @@ -460,15 +420,18 @@ void GL_SetupTextureState(void) void GL_Backend_ResetState(void) { memset(&gl_state, 0, sizeof(gl_state)); - gl_state.depthdisable = false; + gl_state.depthtest = true; gl_state.blendfunc1 = GL_ONE; gl_state.blendfunc2 = GL_ZERO; gl_state.blend = false; gl_state.depthmask = GL_TRUE; - gl_state.colorarray = false; + gl_state.color4f[0] = gl_state.color4f[1] = gl_state.color4f[2] = gl_state.color4f[3] = 1; + gl_state.lockrange_first = 0; + gl_state.lockrange_count = 0; + gl_state.pointer_vertex = NULL; + gl_state.pointer_color = NULL; - qglDisableClientState(GL_COLOR_ARRAY);CHECKGLERROR - qglDisableClientState(GL_VERTEX_ARRAY);CHECKGLERROR + CHECKGLERROR qglEnable(GL_CULL_FACE);CHECKGLERROR qglCullFace(GL_FRONT);CHECKGLERROR @@ -476,38 +439,171 @@ void GL_Backend_ResetState(void) qglBlendFunc(gl_state.blendfunc1, gl_state.blendfunc2);CHECKGLERROR qglDisable(GL_BLEND);CHECKGLERROR qglDepthMask(gl_state.depthmask);CHECKGLERROR - qglVertexPointer(3, GL_FLOAT, sizeof(GLfloat[4]), varray_buf_vertex);CHECKGLERROR + + qglVertexPointer(3, GL_FLOAT, sizeof(float[3]), NULL);CHECKGLERROR qglEnableClientState(GL_VERTEX_ARRAY);CHECKGLERROR - if (gl_mesh_floatcolors.integer) + + qglColorPointer(4, GL_FLOAT, sizeof(float[4]), NULL);CHECKGLERROR + qglDisableClientState(GL_COLOR_ARRAY);CHECKGLERROR + + GL_Color(0, 0, 0, 0); + GL_Color(1, 1, 1, 1); + + GL_SetupTextureState(); +} + +void GL_ActiveTexture(int num) +{ + if (gl_state.unit != num) { - qglColorPointer(4, GL_FLOAT, sizeof(GLfloat[4]), varray_buf_color);CHECKGLERROR + gl_state.unit = num; + if (qglActiveTexture) + { + qglActiveTexture(GL_TEXTURE0_ARB + gl_state.unit); + CHECKGLERROR + } } - else +} + +void GL_ClientActiveTexture(int num) +{ + if (gl_state.clientunit != num) { - qglColorPointer(4, GL_UNSIGNED_BYTE, sizeof(GLubyte[4]), varray_buf_bcolor);CHECKGLERROR + gl_state.clientunit = num; + if (qglActiveTexture) + { + qglClientActiveTexture(GL_TEXTURE0_ARB + gl_state.clientunit); + CHECKGLERROR + } } - GL_Color(1, 1, 1, 1); +} - GL_SetupTextureState(); +void GL_BlendFunc(int blendfunc1, int blendfunc2) +{ + if (gl_state.blendfunc1 != blendfunc1 || gl_state.blendfunc2 != blendfunc2) + { + qglBlendFunc(gl_state.blendfunc1 = blendfunc1, gl_state.blendfunc2 = blendfunc2);CHECKGLERROR + if (gl_state.blendfunc2 == GL_ZERO) + { + if (gl_state.blendfunc1 == GL_ONE) + { + if (gl_state.blend) + { + gl_state.blend = 0; + qglDisable(GL_BLEND);CHECKGLERROR + } + } + else + { + if (!gl_state.blend) + { + gl_state.blend = 1; + qglEnable(GL_BLEND);CHECKGLERROR + } + } + } + else + { + if (!gl_state.blend) + { + gl_state.blend = 1; + qglEnable(GL_BLEND);CHECKGLERROR + } + } + } +} + +void GL_DepthMask(int state) +{ + if (gl_state.depthmask != state) + { + qglDepthMask(gl_state.depthmask = state);CHECKGLERROR + } +} + +void GL_DepthTest(int state) +{ + if (gl_state.depthtest != state) + { + gl_state.depthtest = state; + if (gl_state.depthtest) + { + qglEnable(GL_DEPTH_TEST);CHECKGLERROR + } + else + { + qglDisable(GL_DEPTH_TEST);CHECKGLERROR + } + } +} + +void GL_VertexPointer(const float *p) +{ + if (gl_state.pointer_vertex != p) + { + gl_state.pointer_vertex = p; + CHECKGLERROR + qglVertexPointer(3, GL_FLOAT, sizeof(float[3]), gl_state.pointer_vertex); + CHECKGLERROR + } } -void GL_UseColorArray(void) +void GL_ColorPointer(const float *p) { - if (!gl_state.colorarray) + if (gl_state.pointer_color != p) { - gl_state.colorarray = true; - qglEnableClientState(GL_COLOR_ARRAY);CHECKGLERROR + CHECKGLERROR + if (!gl_state.pointer_color) + { + qglEnableClientState(GL_COLOR_ARRAY); + CHECKGLERROR + } + else if (!p) + { + qglDisableClientState(GL_COLOR_ARRAY); + CHECKGLERROR + } + gl_state.pointer_color = p; + qglColorPointer(4, GL_FLOAT, sizeof(float[4]), gl_state.pointer_color); + CHECKGLERROR } } void GL_Color(float cr, float cg, float cb, float ca) { - if (gl_state.colorarray) + if (gl_state.pointer_color || gl_state.color4f[0] != cr || gl_state.color4f[1] != cg || gl_state.color4f[2] != cb || gl_state.color4f[3] != ca) { - gl_state.colorarray = false; - qglDisableClientState(GL_COLOR_ARRAY);CHECKGLERROR + GL_ColorPointer(NULL); + gl_state.color4f[0] = cr; + gl_state.color4f[1] = cg; + gl_state.color4f[2] = cb; + gl_state.color4f[3] = ca; + CHECKGLERROR + qglColor4f(cr, cg, cb, ca); + CHECKGLERROR + } +} + +void GL_LockArrays(int first, int count) +{ + if (gl_state.lockrange_count != count || gl_state.lockrange_first != first) + { + if (gl_state.lockrange_count) + { + gl_state.lockrange_count = 0; + CHECKGLERROR + qglUnlockArraysEXT(); + CHECKGLERROR + } + if (count && gl_supportslockarrays && gl_lockarrays.integer) + { + gl_state.lockrange_first = first; + gl_state.lockrange_count = count; + CHECKGLERROR + qglLockArraysEXT(first, count); + CHECKGLERROR + } } - qglColor4f(cr, cg, cb, ca); } void GL_TransformToScreen(const vec4_t in, vec4_t out) @@ -526,149 +622,151 @@ void GL_TransformToScreen(const vec4_t in, vec4_t out) void R_Mesh_Start(void) { BACKENDACTIVECHECK - CHECKGLERROR - - GL_Backend_CheckCvars(); - if (mesh_maxverts != gl_mesh_maxverts.integer) - GL_Backend_ResizeArrays(gl_mesh_maxverts.integer); - GL_Backend_ResetState(); } int gl_backend_rebindtextures; -void GL_ConvertColorsFloatToByte(int numverts) -{ - int i, k, total; - // LordHavoc: to avoid problems with aliasing (treating memory as two - // different types - exactly what this is doing), these must be volatile - // (or a union) - volatile int *icolor; - volatile float *fcolor; - GLubyte *bcolor; - - total = numverts * 4; - - // shift float to have 8bit fraction at base of number - fcolor = varray_buf_color; - for (i = 0;i < total;) - { - fcolor[i ] += 32768.0f; - fcolor[i + 1] += 32768.0f; - fcolor[i + 2] += 32768.0f; - fcolor[i + 3] += 32768.0f; - i += 4; - } - - // then read as integer and kill float bits... - icolor = (int *)varray_buf_color; - bcolor = varray_buf_bcolor; - for (i = 0;i < total;) - { - k = icolor[i ] & 0x7FFFFF;if (k > 255) k = 255;bcolor[i ] = (GLubyte) k; - k = icolor[i + 1] & 0x7FFFFF;if (k > 255) k = 255;bcolor[i + 1] = (GLubyte) k; - k = icolor[i + 2] & 0x7FFFFF;if (k > 255) k = 255;bcolor[i + 2] = (GLubyte) k; - k = icolor[i + 3] & 0x7FFFFF;if (k > 255) k = 255;bcolor[i + 3] = (GLubyte) k; - i += 4; - } -} - -/* -// enlarges geometry buffers if they are too small -void _R_Mesh_ResizeCheck(int numverts) -{ - if (numverts > mesh_maxverts) - { - BACKENDACTIVECHECK - GL_Backend_ResizeArrays(numverts + 100); - GL_Backend_ResetState(); - } -} -*/ - -void GL_Backend_RenumberElements(int numelements, const int *in, int offset) +void GL_Backend_RenumberElements(int *out, int count, const int *in, int offset) { int i; - for (i = 0;i < numelements;i++) - varray_buf_elements[i] = in[i] + offset; -} - -// gets geometry space for a mesh -void R_Mesh_GetSpace(int numverts) -{ - int i; - - varray_offset = varray_offsetnext; - if (varray_offset + numverts > mesh_maxverts) - { - //flush stuff here - varray_offset = 0; - } - if (numverts > mesh_maxverts) + if (offset) { - BACKENDACTIVECHECK - GL_Backend_ResizeArrays(numverts + 100); - GL_Backend_ResetState(); - varray_offset = 0; + for (i = 0;i < count;i++) + *out++ = *in++ + offset; } - - // for debugging - //varray_offset = rand() % (mesh_maxverts - numverts); - - varray_vertex = varray_buf_vertex + varray_offset * 4; - varray_color = varray_buf_color + varray_offset * 4; - varray_bcolor = varray_buf_bcolor + varray_offset * 4; - for (i = 0;i < backendunits;i++) - varray_texcoord[i] = varray_buf_texcoord[i] + varray_offset * 4; - - varray_offsetnext = varray_offset + numverts; + else + memcpy(out, in, sizeof(*out) * count); } -// renders the current mesh +// renders triangles using vertices from the active arrays +int paranoidblah = 0; void R_Mesh_Draw(int numverts, int numtriangles, const int *elements) { - int numelements; - if (numtriangles == 0 || numverts == 0) + int numelements = numtriangles * 3; + if (numverts == 0 || numtriangles == 0) { Con_Printf("R_Mesh_Draw(%d, %d, %08p);\n", numverts, numtriangles, elements); return; } - numelements = numtriangles * 3; - if (mesh_maxelements < numelements) - { - mesh_maxelements = numelements; - GL_Backend_AllocElementsArray(); - } - GL_Backend_RenumberElements(numelements, elements, varray_offset); c_meshs++; c_meshelements += numelements; - if (gl_state.colorarray && !gl_mesh_floatcolors.integer) - GL_ConvertColorsFloatToByte(numverts); + CHECKGLERROR if (r_render.integer) { - if (gl_supportslockarrays && gl_lockarrays.integer) + if (gl_paranoid.integer) { - qglLockArraysEXT(varray_offset, numverts); - CHECKGLERROR - if (gl_mesh_drawrangeelements.integer && qglDrawRangeElements != NULL) + int i, j, size; + const int *p; + if (!qglIsEnabled(GL_VERTEX_ARRAY)) + Con_Printf("R_Mesh_Draw: vertex array not enabled\n"); + for (j = 0, size = numverts * (int)sizeof(float[3]), p = gl_state.pointer_vertex;j < size;j += sizeof(int), p++) + paranoidblah += *p; + if (gl_state.pointer_color) { - qglDrawRangeElements(GL_TRIANGLES, varray_offset, varray_offset + numverts, numelements, GL_UNSIGNED_INT, (const GLuint *) varray_buf_elements); - CHECKGLERROR + if (!qglIsEnabled(GL_COLOR_ARRAY)) + Con_Printf("R_Mesh_Draw: color array set but not enabled\n"); + for (j = 0, size = numverts * (int)sizeof(float[4]), p = gl_state.pointer_color;j < size;j += sizeof(int), p++) + paranoidblah += *p; } - else + for (i = 0;i < backendunits;i++) { - qglDrawElements(GL_TRIANGLES, numelements, GL_UNSIGNED_INT, (const GLuint *) varray_buf_elements); - CHECKGLERROR + if (gl_state.units[i].t1d || gl_state.units[i].t2d || gl_state.units[i].t3d || gl_state.units[i].tcubemap || gl_state.units[i].arrayenabled) + { + if (gl_state.units[i].arrayenabled && !(gl_state.units[i].t1d || gl_state.units[i].t2d || gl_state.units[i].t3d || gl_state.units[i].tcubemap)) + Con_Printf("R_Mesh_Draw: array enabled but no texture bound\n"); + GL_ActiveTexture(i); + if (!qglIsEnabled(GL_TEXTURE_COORD_ARRAY)) + Con_Printf("R_Mesh_Draw: texcoord array set but not enabled\n"); + for (j = 0, size = numverts * ((gl_state.units[i].t3d || gl_state.units[i].tcubemap) ? (int)sizeof(float[3]) : (int)sizeof(float[2])), p = gl_state.units[i].pointer_texcoord;j < size;j += sizeof(int), p++) + paranoidblah += *p; + } } - qglUnlockArraysEXT(); + for (i = 0;i < numtriangles * 3;i++) + { + if (elements[i] < 0 || elements[i] >= numverts) + { + Con_Printf("R_Mesh_Draw: invalid vertex index %i (outside range 0 - %i) in elements list\n", elements[i], numverts); + return; + } + } + } + CHECKGLERROR + GL_LockArrays(0, numverts); + CHECKGLERROR + if (gl_mesh_testmanualfeeding.integer) + { + int i, j; + const GLfloat *p; + qglBegin(GL_TRIANGLES); + for (i = 0;i < numtriangles * 3;i++) + { + for (j = 0;j < backendunits;j++) + { + if (gl_state.units[j].pointer_texcoord) + { + if (backendunits > 1) + { + if (gl_state.units[j].t3d || gl_state.units[j].tcubemap) + { + p = ((const GLfloat *)(gl_state.units[j].pointer_texcoord)) + elements[i] * 3; + qglMultiTexCoord3f(GL_TEXTURE0_ARB + j, p[0], p[1], p[2]); + } + else + { + p = ((const GLfloat *)(gl_state.units[j].pointer_texcoord)) + elements[i] * 2; + qglMultiTexCoord2f(GL_TEXTURE0_ARB + j, p[0], p[1]); + } + } + else + { + if (gl_state.units[j].t3d || gl_state.units[j].tcubemap) + { + p = ((const GLfloat *)(gl_state.units[j].pointer_texcoord)) + elements[i] * 3; + qglTexCoord3f(p[0], p[1], p[2]); + } + else + { + p = ((const GLfloat *)(gl_state.units[j].pointer_texcoord)) + elements[i] * 2; + qglTexCoord2f(p[0], p[1]); + } + } + } + } + if (gl_state.pointer_color) + { + p = ((const GLfloat *)(gl_state.pointer_color)) + elements[i] * 4; + qglColor4f(p[0], p[1], p[2], p[3]); + } + p = ((const GLfloat *)(gl_state.pointer_vertex)) + elements[i] * 3; + qglVertex3f(p[0], p[1], p[2]); + } + qglEnd(); CHECKGLERROR } - else + else if (gl_mesh_testarrayelement.integer) { - qglDrawElements(GL_TRIANGLES, numelements, GL_UNSIGNED_INT, (const GLuint *) varray_buf_elements); + int i; + qglBegin(GL_TRIANGLES); + for (i = 0;i < numtriangles * 3;i++) + { + qglArrayElement(elements[i]); + } + qglEnd(); CHECKGLERROR } + else if (gl_mesh_drawrangeelements.integer && qglDrawRangeElements != NULL) + { + qglDrawRangeElements(GL_TRIANGLES, 0, numverts, numelements, GL_UNSIGNED_INT, elements);CHECKGLERROR + } + else + { + qglDrawElements(GL_TRIANGLES, numelements, GL_UNSIGNED_INT, elements);CHECKGLERROR + } + CHECKGLERROR + GL_LockArrays(0, 0); + CHECKGLERROR } } @@ -677,6 +775,9 @@ void R_Mesh_Finish(void) { int i; BACKENDACTIVECHECK + CHECKGLERROR + GL_LockArrays(0, 0); + CHECKGLERROR for (i = backendunits - 1;i >= 0;i--) { @@ -722,60 +823,23 @@ void R_Mesh_Matrix(const matrix4x4_t *matrix) } } -// sets up the requested state -void R_Mesh_MainState(const rmeshstate_t *m) +void R_Mesh_TextureMatrix(int unitnumber, const matrix4x4_t *matrix) { - BACKENDACTIVECHECK - - if (gl_state.blendfunc1 != m->blendfunc1 || gl_state.blendfunc2 != m->blendfunc2) - { - qglBlendFunc(gl_state.blendfunc1 = m->blendfunc1, gl_state.blendfunc2 = m->blendfunc2);CHECKGLERROR - if (gl_state.blendfunc2 == GL_ZERO) - { - if (gl_state.blendfunc1 == GL_ONE) - { - if (gl_state.blend) - { - gl_state.blend = 0; - qglDisable(GL_BLEND);CHECKGLERROR - } - } - else - { - if (!gl_state.blend) - { - gl_state.blend = 1; - qglEnable(GL_BLEND);CHECKGLERROR - } - } - } - else - { - if (!gl_state.blend) - { - gl_state.blend = 1; - qglEnable(GL_BLEND);CHECKGLERROR - } - } - } - if (gl_state.depthdisable != m->depthdisable) - { - gl_state.depthdisable = m->depthdisable; - if (gl_state.depthdisable) - qglDisable(GL_DEPTH_TEST); - else - qglEnable(GL_DEPTH_TEST); - } - if (gl_state.depthmask != (m->blendfunc2 == GL_ZERO || m->depthwrite)) + if (memcmp(&gl_state.units[unitnumber].matrix, matrix, sizeof(matrix4x4_t))) { - qglDepthMask(gl_state.depthmask = (m->blendfunc2 == GL_ZERO || m->depthwrite));CHECKGLERROR + matrix4x4_t tempmatrix; + gl_state.units[unitnumber].matrix = *matrix; + Matrix4x4_Transpose(&tempmatrix, &gl_state.units[unitnumber].matrix); + qglMatrixMode(GL_TEXTURE); + GL_ActiveTexture(unitnumber); + qglLoadMatrixf(&tempmatrix.m[0][0]); + qglMatrixMode(GL_MODELVIEW); } } -void R_Mesh_TextureState(const rmeshstate_t *m) +void R_Mesh_State_Texture(const rmeshstate_t *m) { - int i, combinergb, combinealpha; - float scale; + int i, combinergb, combinealpha, scale, arrayis3d; gltextureunit_t *unit; BACKENDACTIVECHECK @@ -786,149 +850,139 @@ void R_Mesh_TextureState(const rmeshstate_t *m) GL_SetupTextureState(); } - for (i = 0;i < backendunits;i++) + for (i = 0, unit = gl_state.units;i < backendunits;i++, unit++) { - unit = gl_state.units + i; - if (unit->t1d != m->tex1d[i] || unit->t2d != m->tex[i] || unit->t3d != m->tex3d[i] || unit->tcubemap != m->texcubemap[i]) + if (unit->t1d != m->tex1d[i]) { - if (gl_state.unit != i) + GL_ActiveTexture(i); + if (m->tex1d[i]) { - qglActiveTexture(GL_TEXTURE0_ARB + (gl_state.unit = i));CHECKGLERROR + if (unit->t1d == 0) + qglEnable(GL_TEXTURE_1D);CHECKGLERROR } - if (m->tex1d[i] || m->tex[i] || m->tex3d[i] || m->texcubemap[i]) + else { - if (!unit->arrayenabled) - { - unit->arrayenabled = true; - if (gl_state.clientunit != i) - { - qglClientActiveTexture(GL_TEXTURE0_ARB + (gl_state.clientunit = i));CHECKGLERROR - } - qglEnableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR - } + if (unit->t1d) + qglDisable(GL_TEXTURE_1D);CHECKGLERROR + } + qglBindTexture(GL_TEXTURE_1D, (unit->t1d = m->tex1d[i]));CHECKGLERROR + } + if (unit->t2d != m->tex[i]) + { + GL_ActiveTexture(i); + if (m->tex[i]) + { + if (unit->t2d == 0) + qglEnable(GL_TEXTURE_2D);CHECKGLERROR } else { - if (unit->arrayenabled) - { - unit->arrayenabled = false; - if (gl_state.clientunit != i) - { - qglClientActiveTexture(GL_TEXTURE0_ARB + (gl_state.clientunit = i));CHECKGLERROR - } - qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR - } + if (unit->t2d) + qglDisable(GL_TEXTURE_2D);CHECKGLERROR } - combinergb = m->texcombinergb[i]; - combinealpha = m->texcombinealpha[i]; - if (!combinergb) - combinergb = GL_MODULATE; - if (!combinealpha) - combinealpha = GL_MODULATE; - if (unit->combinergb != combinergb) + qglBindTexture(GL_TEXTURE_2D, (unit->t2d = m->tex[i]));CHECKGLERROR + } + if (unit->t3d != m->tex3d[i]) + { + GL_ActiveTexture(i); + if (m->tex3d[i]) { - unit->combinergb = combinergb; - if (gl_combine.integer) - { - qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, unit->combinergb);CHECKGLERROR - } - else - { - qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, unit->combinergb);CHECKGLERROR - } + if (unit->t3d == 0) + qglEnable(GL_TEXTURE_3D);CHECKGLERROR } - if (unit->combinealpha != combinealpha) + else { - unit->combinealpha = combinealpha; - if (gl_combine.integer) - { - qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, unit->combinealpha);CHECKGLERROR - } + if (unit->t3d) + qglDisable(GL_TEXTURE_3D);CHECKGLERROR } - if (unit->t1d != m->tex1d[i]) + qglBindTexture(GL_TEXTURE_3D, (unit->t3d = m->tex3d[i]));CHECKGLERROR + } + if (unit->tcubemap != m->texcubemap[i]) + { + GL_ActiveTexture(i); + if (m->texcubemap[i]) { - if (m->tex1d[i]) - { - if (unit->t1d == 0) - qglEnable(GL_TEXTURE_1D);CHECKGLERROR - } - else - { - if (unit->t1d) - qglDisable(GL_TEXTURE_1D);CHECKGLERROR - } - qglBindTexture(GL_TEXTURE_1D, (unit->t1d = m->tex1d[i]));CHECKGLERROR + if (unit->tcubemap == 0) + qglEnable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR } - if (unit->t2d != m->tex[i]) + else { - if (m->tex[i]) - { - if (unit->t2d == 0) - qglEnable(GL_TEXTURE_2D);CHECKGLERROR - } - else - { - if (unit->t2d) - qglDisable(GL_TEXTURE_2D);CHECKGLERROR - } - qglBindTexture(GL_TEXTURE_2D, (unit->t2d = m->tex[i]));CHECKGLERROR + if (unit->tcubemap) + qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR } - if (unit->t3d != m->tex3d[i]) + qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, (unit->tcubemap = m->texcubemap[i]));CHECKGLERROR + } + combinergb = m->texcombinergb[i]; + if (!combinergb) + combinergb = GL_MODULATE; + if (unit->combinergb != combinergb) + { + GL_ActiveTexture(i); + unit->combinergb = combinergb; + if (gl_combine.integer) { - if (m->tex3d[i]) - { - if (unit->t3d == 0) - qglEnable(GL_TEXTURE_3D);CHECKGLERROR - } - else - { - if (unit->t3d) - qglDisable(GL_TEXTURE_3D);CHECKGLERROR - } - qglBindTexture(GL_TEXTURE_3D, (unit->t3d = m->tex3d[i]));CHECKGLERROR + qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, unit->combinergb);CHECKGLERROR } - if (unit->tcubemap != m->texcubemap[i]) + else { - if (m->texcubemap[i]) - { - if (unit->tcubemap == 0) - qglEnable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR - } - else - { - if (unit->tcubemap) - qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR - } - qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, (unit->tcubemap = m->texcubemap[i]));CHECKGLERROR + qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, unit->combinergb);CHECKGLERROR } } - scale = max(m->texrgbscale[i], 1); - if (gl_state.units[i].rgbscale != scale) + combinealpha = m->texcombinealpha[i]; + if (!combinealpha) + combinealpha = GL_MODULATE; + if (unit->combinealpha != combinealpha) { - if (gl_state.unit != i) + GL_ActiveTexture(i); + unit->combinealpha = combinealpha; + if (gl_combine.integer) { - qglActiveTexture(GL_TEXTURE0_ARB + (gl_state.unit = i));CHECKGLERROR + qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, unit->combinealpha);CHECKGLERROR } - qglTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, (gl_state.units[i].rgbscale = scale));CHECKGLERROR + } + scale = max(m->texrgbscale[i], 1); + if (unit->rgbscale != scale) + { + GL_ActiveTexture(i); + qglTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, (unit->rgbscale = scale));CHECKGLERROR } scale = max(m->texalphascale[i], 1); - if (gl_state.units[i].alphascale != scale) + if (unit->alphascale != scale) + { + GL_ActiveTexture(i); + qglTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, (unit->alphascale = scale));CHECKGLERROR + } + arrayis3d = unit->t3d || unit->tcubemap; + if (unit->pointer_texcoord != m->pointer_texcoord[i] || unit->arrayis3d != arrayis3d) { - if (gl_state.unit != i) + GL_ClientActiveTexture(i); + if (m->pointer_texcoord[i]) + { + if (!unit->arrayenabled) + { + unit->arrayenabled = true; + qglEnableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR + } + } + else { - qglActiveTexture(GL_TEXTURE0_ARB + (gl_state.unit = i));CHECKGLERROR + if (unit->arrayenabled) + { + unit->arrayenabled = false; + qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR + } } - qglTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, (gl_state.units[i].alphascale = scale));CHECKGLERROR + unit->pointer_texcoord = m->pointer_texcoord[i]; + unit->arrayis3d = arrayis3d; + if (unit->arrayis3d) + qglTexCoordPointer(3, GL_FLOAT, sizeof(float[3]), unit->pointer_texcoord); + else + qglTexCoordPointer(2, GL_FLOAT, sizeof(float[2]), unit->pointer_texcoord); + CHECKGLERROR } } } -void R_Mesh_State(const rmeshstate_t *m) -{ - R_Mesh_MainState(m); - R_Mesh_TextureState(m); -} - /* ============================================================================== @@ -937,7 +991,7 @@ void R_Mesh_State(const rmeshstate_t *m) ============================================================================== */ -qboolean SCR_ScreenShot(char *filename, int x, int y, int width, int height) +qboolean SCR_ScreenShot(char *filename, int x, int y, int width, int height, qboolean jpeg) { qboolean ret; int i, j; @@ -960,7 +1014,10 @@ qboolean SCR_ScreenShot(char *filename, int x, int y, int width, int height) } } - ret = Image_WriteTGARGB_preflipped(filename, width, height, buffer); + if (jpeg) + ret = JPEG_SaveImage_preflipped (filename, width, height, buffer); + else + ret = Image_WriteTGARGB_preflipped (filename, width, height, buffer); Mem_Free(buffer); return ret; @@ -1055,3 +1112,262 @@ void SCR_UpdateScreen (void) } } + +//=========================================================================== +// dynamic vertex array buffer subsystem +//=========================================================================== + +float varray_vertex3f[65536*3]; +float varray_color4f[65536*4]; +float varray_texcoord2f[4][65536*2]; +float varray_texcoord3f[4][65536*3]; +float varray_normal3f[65536*3]; + +//=========================================================================== +// vertex array caching subsystem +//=========================================================================== + +typedef struct rcachearraylink_s +{ + struct rcachearraylink_s *next, *prev; + struct rcachearrayitem_s *data; +} +rcachearraylink_t; + +typedef struct rcachearrayitem_s +{ + // the original request structure + rcachearrayrequest_t request; + // active + int active; + // offset into r_mesh_rcachedata + int offset; + // for linking this into the sequential list + rcachearraylink_t sequentiallink; + // for linking this into the lookup list + rcachearraylink_t hashlink; +} +rcachearrayitem_t; + +#define RCACHEARRAY_HASHSIZE 65536 +#define RCACHEARRAY_ITEMS 4096 +#define RCACHEARRAY_DEFAULTSIZE (4 << 20) + +// all active items are linked into this chain in sorted order +static rcachearraylink_t r_mesh_rcachesequentialchain; +// all inactive items are linked into this chain in unknown order +static rcachearraylink_t r_mesh_rcachefreechain; +// all active items are also linked into these chains (using their hashlink) +static rcachearraylink_t r_mesh_rcachechain[RCACHEARRAY_HASHSIZE]; + +// all items are stored here, whether active or inactive +static rcachearrayitem_t r_mesh_rcacheitems[RCACHEARRAY_ITEMS]; + +// size of data buffer +static int r_mesh_rcachedata_size = RCACHEARRAY_DEFAULTSIZE; +// data buffer +static qbyte r_mesh_rcachedata[RCACHEARRAY_DEFAULTSIZE]; + +// current state +static int r_mesh_rcachedata_offset; +static rcachearraylink_t *r_mesh_rcachesequentialchain_current; + +static void R_Mesh_CacheArray_Startup(void) +{ + int i; + rcachearraylink_t *l; + // prepare all the linked lists + l = &r_mesh_rcachesequentialchain;l->next = l->prev = l;l->data = NULL; + l = &r_mesh_rcachefreechain;l->next = l->prev = l;l->data = NULL; + memset(&r_mesh_rcachechain, 0, sizeof(r_mesh_rcachechain)); + for (i = 0;i < RCACHEARRAY_HASHSIZE;i++) + { + l = &r_mesh_rcachechain[i]; + l->next = l->prev = l; + l->data = NULL; + } + memset(&r_mesh_rcacheitems, 0, sizeof(r_mesh_rcacheitems)); + for (i = 0;i < RCACHEARRAY_ITEMS;i++) + { + r_mesh_rcacheitems[i].hashlink.data = r_mesh_rcacheitems[i].sequentiallink.data = &r_mesh_rcacheitems[i]; + l = &r_mesh_rcacheitems[i].sequentiallink; + l->next = &r_mesh_rcachefreechain; + l->prev = l->next->prev; + l->next->prev = l->prev->next = l; + } + // clear other state + r_mesh_rcachedata_offset = 0; + r_mesh_rcachesequentialchain_current = &r_mesh_rcachesequentialchain; +} + +static void R_Mesh_CacheArray_Shutdown(void) +{ +} + +/* +static void R_Mesh_CacheArray_ValidateState(int num) +{ + rcachearraylink_t *l, *lhead; + lhead = &r_mesh_rcachesequentialchain; + if (r_mesh_rcachesequentialchain_current == lhead) + return; + for (l = lhead->next;l != lhead;l = l->next) + if (r_mesh_rcachesequentialchain_current == l) + return; + Sys_Error("%i", num); +} +*/ + +int R_Mesh_CacheArray(rcachearrayrequest_t *r) +{ + rcachearraylink_t *l, *lhead, *lnext; + rcachearrayitem_t *d; + int hashindex, offset, offsetend; + + //R_Mesh_CacheArray_ValidateState(3); + // calculate a hashindex to choose a cache chain + r->data = NULL; + hashindex = CRC_Block((void *)r, sizeof(*r)) % RCACHEARRAY_HASHSIZE; + + // is it already cached? + for (lhead = &r_mesh_rcachechain[hashindex], l = lhead->next;l != lhead;l = l->next) + { + if (!memcmp(&l->data->request, r, sizeof(l->data->request))) + { + // we have it cached already + r->data = r_mesh_rcachedata + l->data->offset; + return false; + } + } + + // we need to add a new cache item, this means finding a place for the new + // data and making sure we have a free item available, lots of work... + + // check if buffer needs to wrap + if (r_mesh_rcachedata_offset + r->data_size > r_mesh_rcachedata_size) + { + /* + if (r->data_size * 10 > r_mesh_rcachedata_size) + { + // realloc whole cache + } + */ + // reset back to start + r_mesh_rcachedata_offset = 0; + r_mesh_rcachesequentialchain_current = &r_mesh_rcachesequentialchain; + } + offset = r_mesh_rcachedata_offset; + r_mesh_rcachedata_offset += r->data_size; + offsetend = r_mesh_rcachedata_offset; + //R_Mesh_CacheArray_ValidateState(4); + + /* + { + int n; + for (lhead = &r_mesh_rcachesequentialchain, l = lhead->next, n = 0;l != lhead;l = l->next, n++); + Con_Printf("R_Mesh_CacheArray: new data range %i:%i, %i items are already linked\n", offset, offsetend, n); + } + */ + + // make room for the new data (remove old items) + lhead = &r_mesh_rcachesequentialchain; + l = r_mesh_rcachesequentialchain_current; + if (l == lhead) + l = l->next; + while (l != lhead && l->data->offset < offsetend && l->data->offset + l->data->request.data_size > offset) + { + //r_mesh_rcachesequentialchain_current = l; + //R_Mesh_CacheArray_ValidateState(8); + lnext = l->next; + // if at the end of the chain, wrap around + if (lnext == lhead) + lnext = lnext->next; + //r_mesh_rcachesequentialchain_current = lnext; + //R_Mesh_CacheArray_ValidateState(10); + + // unlink from sequential chain + l->next->prev = l->prev; + l->prev->next = l->next; + //R_Mesh_CacheArray_ValidateState(11); + // link into free chain + l->next = &r_mesh_rcachefreechain; + l->prev = l->next->prev; + l->next->prev = l->prev->next = l; + //R_Mesh_CacheArray_ValidateState(12); + + l = &l->data->hashlink; + // unlink from hash chain + l->next->prev = l->prev; + l->prev->next = l->next; + + l = lnext; + //r_mesh_rcachesequentialchain_current = l; + //R_Mesh_CacheArray_ValidateState(9); + } + //r_mesh_rcachesequentialchain_current = l; + //R_Mesh_CacheArray_ValidateState(5); + // gobble an extra item if we have no free items available + if (r_mesh_rcachefreechain.next == &r_mesh_rcachefreechain) + { + lnext = l->next; + + // unlink from sequential chain + l->next->prev = l->prev; + l->prev->next = l->next; + // link into free chain + l->next = &r_mesh_rcachefreechain; + l->prev = l->next->prev; + l->next->prev = l->prev->next = l; + + l = &l->data->hashlink; + // unlink from hash chain + l->next->prev = l->prev; + l->prev->next = l->next; + + l = lnext; + } + r_mesh_rcachesequentialchain_current = l; + //R_Mesh_CacheArray_ValidateState(6); + + // now take an item from the free chain + l = r_mesh_rcachefreechain.next; + // set it up + d = l->data; + d->request = *r; + d->offset = offset; + // unlink + l->next->prev = l->prev; + l->prev->next = l->next; + // relink to sequential + l->next = r_mesh_rcachesequentialchain_current->prev; + l->prev = l->next->prev; + while (l->next->data && l->data && l->next->data->offset <= d->offset) + { + //Con_Printf(">\n"); + l->next = l->next->next; + l->prev = l->prev->next; + } + while (l->prev->data && l->data && l->prev->data->offset >= d->offset) + { + //Con_Printf("<\n"); + l->prev = l->prev->prev; + l->next = l->next->prev; + } + l->next->prev = l->prev->next = l; + // also link into hash chain + l = &l->data->hashlink; + l->next = &r_mesh_rcachechain[hashindex]; + l->prev = l->next->prev; + l->prev->next = l; + l->next->prev = l->prev->next = l; + + + //r_mesh_rcachesequentialchain_current = d->sequentiallink.next; + + //R_Mesh_CacheArray_ValidateState(7); + // and finally set the data pointer + r->data = r_mesh_rcachedata + d->offset; + // and tell the caller to fill the array + return true; +} +