X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=gl_backend.c;h=4dbdc8ce25c969eb720cd8cad63927fbadd3b187;hb=302711d37e168e57a9e2c8003084a22a3285c555;hp=3fcd972b59a496581e85141891dbd677813e593c;hpb=837989dcaaf9e9382aad695c216bd07c4b8f3c66;p=xonotic%2Fdarkplaces.git diff --git a/gl_backend.c b/gl_backend.c index 3fcd972b..4dbdc8ce 100644 --- a/gl_backend.c +++ b/gl_backend.c @@ -12,7 +12,12 @@ cvar_t r_render = {0, "r_render", "1", "enables rendering calls (you want this o cvar_t r_waterwarp = {CVAR_SAVE, "r_waterwarp", "1", "warp view while underwater"}; cvar_t gl_polyblend = {CVAR_SAVE, "gl_polyblend", "1", "tints view while underwater, hurt, etc"}; cvar_t gl_dither = {CVAR_SAVE, "gl_dither", "1", "enables OpenGL dithering (16bit looks bad with this off)"}; -cvar_t gl_lockarrays = {0, "gl_lockarrays", "1", "enables use of glLockArraysEXT, may cause glitches with some broken drivers"}; +cvar_t gl_lockarrays = {0, "gl_lockarrays", "0", "enables use of glLockArraysEXT, may cause glitches with some broken drivers, and may be slower than normal"}; +cvar_t gl_lockarrays_minimumvertices = {0, "gl_lockarrays_minimumvertices", "1", "minimum number of vertices required for use of glLockArraysEXT, setting this too low may reduce performance"}; +cvar_t gl_vbo = {0, "gl_vbo", "1", "make use of GL_ARB_vertex_buffer_object extension to store static geometry in video memory for faster rendering"}; + +cvar_t v_flipped = {0, "v_flipped", "0", "mirror the screen (poor man's left handed mode)"}; +qboolean v_flipped_state = false; int gl_maxdrawrangeelementsvertices; int gl_maxdrawrangeelementsindices; @@ -142,6 +147,22 @@ void GL_Backend_FreeArrays(void) { } +void GL_VBOStats_f(void) +{ + GL_Mesh_ListVBOs(true); +} + +typedef struct gl_bufferobjectinfo_s +{ + int target; + int object; + size_t size; + char name[MAX_QPATH]; +} +gl_bufferobjectinfo_t; + +memexpandablearray_t gl_bufferobjectinfoarray; + static void gl_backend_start(void) { Con_Print("OpenGL Backend starting...\n"); @@ -178,6 +199,8 @@ static void gl_backend_start(void) GL_Backend_AllocArrays(); + Mem_ExpandableArray_NewArray(&gl_bufferobjectinfoarray, r_main_mempool, sizeof(gl_bufferobjectinfo_t), 128); + Con_Printf("OpenGL backend started.\n"); CHECKGLERROR @@ -194,6 +217,8 @@ static void gl_backend_shutdown(void) Con_Print("OpenGL Backend shutting down\n"); + Mem_ExpandableArray_FreeArray(&gl_bufferobjectinfoarray); + GL_Backend_FreeArrays(); } @@ -225,8 +250,11 @@ void gl_backend_init(void) Cvar_RegisterVariable(&r_render); Cvar_RegisterVariable(&r_waterwarp); Cvar_RegisterVariable(&gl_polyblend); + Cvar_RegisterVariable(&v_flipped); Cvar_RegisterVariable(&gl_dither); Cvar_RegisterVariable(&gl_lockarrays); + Cvar_RegisterVariable(&gl_lockarrays_minimumvertices); + Cvar_RegisterVariable(&gl_vbo); Cvar_RegisterVariable(&gl_paranoid); Cvar_RegisterVariable(&gl_printcheckerror); #ifdef NORENDER @@ -237,12 +265,17 @@ void gl_backend_init(void) Cvar_RegisterVariable(&gl_mesh_testarrayelement); Cvar_RegisterVariable(&gl_mesh_testmanualfeeding); + Cmd_AddCommand("gl_vbostats", GL_VBOStats_f, "prints a list of all buffer objects (vertex data and triangle elements) and total video memory used by them\n"); + R_RegisterModule("GL_Backend", gl_backend_start, gl_backend_shutdown, gl_backend_newmap); } +void GL_SetMirrorState(qboolean state); + void GL_SetupView_Orientation_Identity (void) { backend_viewmatrix = identitymatrix; + GL_SetMirrorState(false); memset(&backend_modelmatrix, 0, sizeof(backend_modelmatrix)); } @@ -253,6 +286,15 @@ void GL_SetupView_Orientation_FromEntity(const matrix4x4_t *matrix) Matrix4x4_CreateRotate(&basematrix, -90, 1, 0, 0); Matrix4x4_ConcatRotate(&basematrix, 90, 0, 0, 1); Matrix4x4_Concat(&backend_viewmatrix, &basematrix, &tempmatrix); + + GL_SetMirrorState(v_flipped.integer); + if(v_flipped_state) + { + Matrix4x4_Transpose(&basematrix, &backend_viewmatrix); + Matrix4x4_ConcatScale3(&basematrix, -1, 1, 1); + Matrix4x4_Transpose(&backend_viewmatrix, &basematrix); + } + //Matrix4x4_ConcatRotate(&backend_viewmatrix, -angles[2], 1, 0, 0); //Matrix4x4_ConcatRotate(&backend_viewmatrix, -angles[0], 0, 1, 0); //Matrix4x4_ConcatRotate(&backend_viewmatrix, -angles[1], 0, 0, 1); @@ -328,10 +370,12 @@ void GL_SetupView_Mode_Ortho (double x1, double y1, double x2, double y2, double typedef struct gltextureunit_s { + const void *pointer_texcoord; + size_t pointer_texcoord_offset; + int pointer_texcoord_buffer; int t1d, t2d, t3d, tcubemap; int arrayenabled; unsigned int arraycomponents; - const void *pointer_texcoord; int rgbscale, alphascale; int combinergb, combinealpha; // FIXME: add more combine stuff @@ -351,6 +395,7 @@ static struct gl_state_s GLboolean depthmask; int colormask; // stored as bottom 4 bits: r g b a (3 2 1 0 order) int depthtest; + float depthrange[2]; int alphatest; int scissortest; unsigned int unit; @@ -359,11 +404,40 @@ static struct gl_state_s float color4f[4]; int lockrange_first; int lockrange_count; + int vertexbufferobject; + int elementbufferobject; + qboolean pointer_color_enabled; const void *pointer_vertex; const void *pointer_color; + size_t pointer_vertex_offset; + size_t pointer_color_offset; + int pointer_vertex_buffer; + int pointer_color_buffer; } gl_state; +static void GL_BindVBO(int bufferobject) +{ + if (gl_state.vertexbufferobject != bufferobject) + { + gl_state.vertexbufferobject = bufferobject; + CHECKGLERROR + qglBindBufferARB(GL_ARRAY_BUFFER_ARB, bufferobject); + CHECKGLERROR + } +} + +static void GL_BindEBO(int bufferobject) +{ + if (gl_state.elementbufferobject != bufferobject) + { + gl_state.elementbufferobject = bufferobject; + CHECKGLERROR + qglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, bufferobject); + CHECKGLERROR + } +} + void GL_SetupTextureState(void) { unsigned int i; @@ -381,6 +455,8 @@ void GL_SetupTextureState(void) unit->arrayenabled = false; unit->arraycomponents = 0; unit->pointer_texcoord = NULL; + unit->pointer_texcoord_buffer = 0; + unit->pointer_texcoord_offset = 0; unit->rgbscale = 1; unit->alphascale = 1; unit->combinergb = GL_MODULATE; @@ -407,6 +483,7 @@ void GL_SetupTextureState(void) for (i = 0;i < backendarrayunits;i++) { GL_ClientActiveTexture(i); + GL_BindVBO(0); qglTexCoordPointer(2, GL_FLOAT, sizeof(float[2]), NULL);CHECKGLERROR qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR } @@ -469,9 +546,7 @@ void GL_Backend_ResetState(void) 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; - gl_state.cullface = GL_FRONT; // quake is backwards, this culls back faces + gl_state.cullface = v_flipped_state ? GL_BACK : GL_FRONT; // quake is backwards, this culls back faces gl_state.cullfaceenable = true; CHECKGLERROR @@ -487,6 +562,12 @@ void GL_Backend_ResetState(void) qglEnable(GL_DEPTH_TEST);CHECKGLERROR qglDepthMask(gl_state.depthmask);CHECKGLERROR + if (gl_support_arb_vertex_buffer_object) + { + qglBindBufferARB(GL_ARRAY_BUFFER_ARB, 0); + qglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0); + } + qglVertexPointer(3, GL_FLOAT, sizeof(float[3]), NULL);CHECKGLERROR qglEnableClientState(GL_VERTEX_ARRAY);CHECKGLERROR @@ -589,9 +670,41 @@ void GL_DepthTest(int state) } } +void GL_DepthRange(float nearfrac, float farfrac) +{ + if (gl_state.depthrange[0] != nearfrac || gl_state.depthrange[1] != farfrac) + { + gl_state.depthrange[0] = nearfrac; + gl_state.depthrange[1] = farfrac; + qglDepthRange(nearfrac, farfrac); + } +} + +void GL_SetMirrorState(qboolean state) +{ + if(!state != !v_flipped_state) + { + // change cull face mode! + if(gl_state.cullface == GL_BACK) + qglCullFace((gl_state.cullface = GL_FRONT)); + else if(gl_state.cullface == GL_FRONT) + qglCullFace((gl_state.cullface = GL_BACK)); + } + v_flipped_state = state; +} + void GL_CullFace(int state) { CHECKGLERROR + + if(v_flipped_state) + { + if(state == GL_FRONT) + state = GL_BACK; + else if(state == GL_BACK) + state = GL_FRONT; + } + if (state != GL_NONE) { if (!gl_state.cullfaceenable) @@ -645,7 +758,7 @@ void GL_ColorMask(int r, int g, int b, int a) void GL_Color(float cr, float cg, float cb, float ca) { - 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) + if (gl_state.pointer_color_enabled || gl_state.color4f[0] != cr || gl_state.color4f[1] != cg || gl_state.color4f[2] != cb || gl_state.color4f[3] != ca) { gl_state.color4f[0] = cr; gl_state.color4f[1] = cg; @@ -659,6 +772,11 @@ void GL_Color(float cr, float cg, float cb, float ca) void GL_LockArrays(int first, int count) { + if (count < gl_lockarrays_minimumvertices.integer) + { + first = 0; + count = 0; + } if (gl_state.lockrange_count != count || gl_state.lockrange_first != first) { if (gl_state.lockrange_count) @@ -822,14 +940,16 @@ void GL_Backend_RenumberElements(int *out, int count, const int *in, int offset) // renders triangles using vertices from the active arrays int paranoidblah = 0; -void R_Mesh_Draw(int firstvertex, int numvertices, int numtriangles, const int *elements) +void R_Mesh_Draw(int firstvertex, int numvertices, int numtriangles, const int *elements, int bufferobject, size_t bufferoffset) { unsigned int numelements = numtriangles * 3; if (numvertices < 3 || numtriangles < 1) { - Con_Printf("R_Mesh_Draw(%d, %d, %d, %8p);\n", firstvertex, numvertices, numtriangles, elements); + Con_Printf("R_Mesh_Draw(%d, %d, %d, %8p, %i, %p);\n", firstvertex, numvertices, numtriangles, elements, bufferobject, (void *)bufferoffset); return; } + if (!gl_vbo.integer) + bufferobject = 0; CHECKGLERROR r_refdef.stats.meshes++; r_refdef.stats.meshes_elements += numelements; @@ -837,18 +957,25 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int numtriangles, const int * { unsigned int i, j, size; const int *p; + // note: there's no validation done here on buffer objects because it + // is somewhat difficult to get at the data, and gl_paranoid can be + // used without buffer objects if the need arises + // (the data could be gotten using glMapBuffer but it would be very + // slow due to uncachable video memory reads) if (!qglIsEnabled(GL_VERTEX_ARRAY)) Con_Print("R_Mesh_Draw: vertex array not enabled\n"); CHECKGLERROR - for (j = 0, size = numvertices * 3, p = (int *)((float *)gl_state.pointer_vertex + firstvertex * 3);j < size;j++, p++) - paranoidblah += *p; - if (gl_state.pointer_color) + if (gl_state.pointer_vertex) + for (j = 0, size = numvertices * 3, p = (int *)((float *)gl_state.pointer_vertex + firstvertex * 3);j < size;j++, p++) + paranoidblah += *p; + if (gl_state.pointer_color_enabled) { if (!qglIsEnabled(GL_COLOR_ARRAY)) Con_Print("R_Mesh_Draw: color array set but not enabled\n"); CHECKGLERROR - for (j = 0, size = numvertices * 4, p = (int *)((float *)gl_state.pointer_color + firstvertex * 4);j < size;j++, p++) - paranoidblah += *p; + if (gl_state.pointer_color && gl_state.pointer_color_enabled) + for (j = 0, size = numvertices * 4, p = (int *)((float *)gl_state.pointer_color + firstvertex * 4);j < size;j++, p++) + paranoidblah += *p; } for (i = 0;i < backendarrayunits;i++) { @@ -858,8 +985,9 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int numtriangles, const int * if (!qglIsEnabled(GL_TEXTURE_COORD_ARRAY)) Con_Print("R_Mesh_Draw: texcoord array set but not enabled\n"); CHECKGLERROR - for (j = 0, size = numvertices * gl_state.units[i].arraycomponents, p = (int *)((float *)gl_state.units[i].pointer_texcoord + firstvertex * gl_state.units[i].arraycomponents);j < size;j++, p++) - paranoidblah += *p; + if (gl_state.units[i].pointer_texcoord && gl_state.units[i].arrayenabled) + for (j = 0, size = numvertices * gl_state.units[i].arraycomponents, p = (int *)((float *)gl_state.units[i].pointer_texcoord + firstvertex * gl_state.units[i].arraycomponents);j < size;j++, p++) + paranoidblah += *p; } } for (i = 0;i < (unsigned int) numtriangles * 3;i++) @@ -884,7 +1012,7 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int numtriangles, const int * { for (j = 0;j < backendarrayunits;j++) { - if (gl_state.units[j].pointer_texcoord) + if (gl_state.units[j].pointer_texcoord && gl_state.units[j].arrayenabled) { if (backendarrayunits > 1) { @@ -934,7 +1062,7 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int numtriangles, const int * } } } - if (gl_state.pointer_color) + if (gl_state.pointer_color && gl_state.pointer_color_enabled) { p = ((const GLfloat *)(gl_state.pointer_color)) + elements[i] * 4; qglColor4f(p[0], p[1], p[2], p[3]); @@ -958,12 +1086,14 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int numtriangles, const int * } else if (gl_mesh_drawrangeelements.integer && qglDrawRangeElements != NULL) { - qglDrawRangeElements(GL_TRIANGLES, firstvertex, firstvertex + numvertices, numelements, GL_UNSIGNED_INT, elements); + GL_BindEBO(bufferobject); + qglDrawRangeElements(GL_TRIANGLES, firstvertex, firstvertex + numvertices, numelements, GL_UNSIGNED_INT, bufferobject ? (void *)bufferoffset : elements); CHECKGLERROR } else { - qglDrawElements(GL_TRIANGLES, numelements, GL_UNSIGNED_INT, elements); + GL_BindEBO(bufferobject); + qglDrawElements(GL_TRIANGLES, numelements, GL_UNSIGNED_INT, bufferobject ? (void *)bufferoffset : elements); CHECKGLERROR } } @@ -1026,6 +1156,76 @@ void R_Mesh_Finish(void) qglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);CHECKGLERROR } +int R_Mesh_CreateStaticBufferObject(unsigned int target, void *data, size_t size, const char *name) +{ + gl_bufferobjectinfo_t *info; + GLuint bufferobject; + + if (!gl_vbo.integer) + return 0; + + qglGenBuffersARB(1, &bufferobject); + switch(target) + { + case GL_ELEMENT_ARRAY_BUFFER_ARB: GL_BindEBO(bufferobject);break; + case GL_ARRAY_BUFFER_ARB: GL_BindVBO(bufferobject);break; + default: Sys_Error("R_Mesh_CreateStaticBufferObject: unknown target type %i\n", target);return 0; + } + qglBufferDataARB(target, size, data, GL_STATIC_DRAW_ARB); + + info = Mem_ExpandableArray_AllocRecord(&gl_bufferobjectinfoarray); + memset(info, 0, sizeof(*info)); + info->target = target; + info->object = bufferobject; + info->size = size; + strlcpy(info->name, name, sizeof(info->name)); + + return (int)bufferobject; +} + +void R_Mesh_DestroyBufferObject(int bufferobject) +{ + int i, endindex; + gl_bufferobjectinfo_t *info; + + qglDeleteBuffersARB(1, (GLuint *)&bufferobject); + + endindex = Mem_ExpandableArray_IndexRange(&gl_bufferobjectinfoarray); + for (i = 0;i < endindex;i++) + { + info = Mem_ExpandableArray_RecordAtIndex(&gl_bufferobjectinfoarray, i); + if (!info) + continue; + if (info->object == bufferobject) + { + Mem_ExpandableArray_FreeRecord(&gl_bufferobjectinfoarray, (void *)info); + break; + } + } +} + +void GL_Mesh_ListVBOs(qboolean printeach) +{ + int i, endindex; + size_t ebocount = 0, ebomemory = 0; + size_t vbocount = 0, vbomemory = 0; + gl_bufferobjectinfo_t *info; + endindex = Mem_ExpandableArray_IndexRange(&gl_bufferobjectinfoarray); + for (i = 0;i < endindex;i++) + { + info = Mem_ExpandableArray_RecordAtIndex(&gl_bufferobjectinfoarray, i); + if (!info) + continue; + switch(info->target) + { + case GL_ELEMENT_ARRAY_BUFFER_ARB: ebocount++;ebomemory += info->size;if (printeach) Con_Printf("EBO #%i %s = %i bytes\n", info->object, info->name, (int)info->size);break; + case GL_ARRAY_BUFFER_ARB: vbocount++;vbomemory += info->size;if (printeach) Con_Printf("VBO #%i %s = %i bytes\n", info->object, info->name, (int)info->size);break; + default: Con_Printf("gl_vbostats: unknown target type %i\n", info->target);break; + } + } + Con_Printf("vertex buffers: %i element buffers totalling %i bytes (%.3f MB), %i vertex buffers totalling %i bytes (%.3f MB), combined %i bytes (%.3fMB)\n", (int)ebocount, (int)ebomemory, ebomemory / 1048576.0, (int)vbocount, (int)vbomemory, vbomemory / 1048576.0, (int)(ebomemory + vbomemory), (ebomemory + vbomemory) / 1048576.0); +} + void R_Mesh_Matrix(const matrix4x4_t *matrix) { if (memcmp(matrix, &backend_modelmatrix, sizeof(matrix4x4_t))) @@ -1039,52 +1239,72 @@ void R_Mesh_Matrix(const matrix4x4_t *matrix) } } -void R_Mesh_VertexPointer(const float *vertex3f) +void R_Mesh_VertexPointer(const float *vertex3f, int bufferobject, size_t bufferoffset) { - if (gl_state.pointer_vertex != vertex3f) + if (!gl_vbo.integer) + bufferobject = 0; + if (gl_state.pointer_vertex != vertex3f || gl_state.pointer_vertex_buffer != bufferobject || gl_state.pointer_vertex_offset != bufferoffset) { gl_state.pointer_vertex = vertex3f; + gl_state.pointer_vertex_buffer = bufferobject; + gl_state.pointer_vertex_offset = bufferoffset; CHECKGLERROR - qglVertexPointer(3, GL_FLOAT, sizeof(float[3]), gl_state.pointer_vertex); - CHECKGLERROR + GL_BindVBO(bufferobject); + qglVertexPointer(3, GL_FLOAT, sizeof(float[3]), bufferobject ? (void *)bufferoffset : vertex3f);CHECKGLERROR } } -void R_Mesh_ColorPointer(const float *color4f) +void R_Mesh_ColorPointer(const float *color4f, int bufferobject, size_t bufferoffset) { - if (gl_state.pointer_color != color4f) + // note: this can not rely on bufferobject to decide whether a color array + // is supplied, because surfmesh_t shares one vbo for all arrays, which + // means that a valid vbo may be supplied even if there is no color array. + if (color4f) { - CHECKGLERROR - if (!gl_state.pointer_color) + if (!gl_vbo.integer) + bufferobject = 0; + // caller wants color array enabled + if (!gl_state.pointer_color_enabled) { + gl_state.pointer_color_enabled = true; + CHECKGLERROR qglEnableClientState(GL_COLOR_ARRAY);CHECKGLERROR } - else if (!color4f) + if (gl_state.pointer_color != color4f || gl_state.pointer_color_buffer != bufferobject || gl_state.pointer_color_offset != bufferoffset) { + gl_state.pointer_color = color4f; + gl_state.pointer_color_buffer = bufferobject; + gl_state.pointer_color_offset = bufferoffset; + CHECKGLERROR + GL_BindVBO(bufferobject); + qglColorPointer(4, GL_FLOAT, sizeof(float[4]), bufferobject ? (void *)bufferoffset : color4f);CHECKGLERROR + } + } + else + { + // caller wants color array disabled + if (gl_state.pointer_color_enabled) + { + gl_state.pointer_color_enabled = false; + CHECKGLERROR qglDisableClientState(GL_COLOR_ARRAY);CHECKGLERROR // when color array is on the glColor gets trashed, set it again qglColor4f(gl_state.color4f[0], gl_state.color4f[1], gl_state.color4f[2], gl_state.color4f[3]);CHECKGLERROR } - gl_state.pointer_color = color4f; - qglColorPointer(4, GL_FLOAT, sizeof(float[4]), gl_state.pointer_color);CHECKGLERROR } } -void R_Mesh_TexCoordPointer(unsigned int unitnum, unsigned int numcomponents, const float *texcoord) +void R_Mesh_TexCoordPointer(unsigned int unitnum, unsigned int numcomponents, const float *texcoord, int bufferobject, size_t bufferoffset) { gltextureunit_t *unit = gl_state.units + unitnum; // update array settings CHECKGLERROR + // note: there is no need to check bufferobject here because all cases + // that involve a valid bufferobject also supply a texcoord array if (texcoord) { - // texcoord array - if (unit->pointer_texcoord != texcoord || unit->arraycomponents != numcomponents) - { - unit->pointer_texcoord = texcoord; - unit->arraycomponents = numcomponents; - GL_ClientActiveTexture(unitnum); - qglTexCoordPointer(unit->arraycomponents, GL_FLOAT, sizeof(float) * unit->arraycomponents, unit->pointer_texcoord);CHECKGLERROR - } + if (!gl_vbo.integer) + bufferobject = 0; // texture array unit is enabled, enable the array if (!unit->arrayenabled) { @@ -1092,6 +1312,17 @@ void R_Mesh_TexCoordPointer(unsigned int unitnum, unsigned int numcomponents, co GL_ClientActiveTexture(unitnum); qglEnableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR } + // texcoord array + if (unit->pointer_texcoord != texcoord || unit->pointer_texcoord_buffer != bufferobject || unit->pointer_texcoord_offset != bufferoffset || unit->arraycomponents != numcomponents) + { + unit->pointer_texcoord = texcoord; + unit->pointer_texcoord_buffer = bufferobject; + unit->pointer_texcoord_offset = bufferoffset; + unit->arraycomponents = numcomponents; + GL_ClientActiveTexture(unitnum); + GL_BindVBO(bufferobject); + qglTexCoordPointer(unit->arraycomponents, GL_FLOAT, sizeof(float) * unit->arraycomponents, bufferobject ? (void *)bufferoffset : texcoord);CHECKGLERROR + } } else { @@ -1605,9 +1836,9 @@ void R_Mesh_TextureState(const rmeshstate_t *m) for (i = 0;i < backendarrayunits;i++) { if (m->pointer_texcoord3f[i]) - R_Mesh_TexCoordPointer(i, 3, m->pointer_texcoord3f[i]); + R_Mesh_TexCoordPointer(i, 3, m->pointer_texcoord3f[i], m->pointer_texcoord_bufferobject[i], m->pointer_texcoord_bufferoffset[i]); else - R_Mesh_TexCoordPointer(i, 2, m->pointer_texcoord[i]); + R_Mesh_TexCoordPointer(i, 2, m->pointer_texcoord[i], m->pointer_texcoord_bufferobject[i], m->pointer_texcoord_bufferoffset[i]); } for (i = 0;i < backendunits;i++) {