X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_backend.c;h=ecc972d94951293c17857d73713a89684d1782c8;hb=e68da68713dfb19c88e7c639348b604b3c480b47;hp=78e5642119c5854ad9e9afd1833bd181ec20e7e5;hpb=2b76697346df4c7edc88b811e7d266f900fbb95a;p=xonotic%2Fdarkplaces.git diff --git a/gl_backend.c b/gl_backend.c index 78e56421..ecc972d9 100644 --- a/gl_backend.c +++ b/gl_backend.c @@ -9,7 +9,8 @@ cvar_t gl_mesh_prefer_short_elements = {0, "gl_mesh_prefer_short_elements", "1", cvar_t gl_paranoid = {0, "gl_paranoid", "0", "enables OpenGL error checking and other tests"}; cvar_t gl_printcheckerror = {0, "gl_printcheckerror", "0", "prints all OpenGL error checks, useful to identify location of driver crashes"}; -cvar_t r_render = {0, "r_render", "1", "enables rendering calls (you want this on!)"}; +cvar_t r_render = {0, "r_render", "1", "enables rendering 3D views (you want this on!)"}; +cvar_t r_renderview = {0, "r_renderview", "1", "enables rendering 3D views (you want this on!)"}; 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)"}; @@ -21,6 +22,16 @@ cvar_t gl_fbo = {CVAR_SAVE, "gl_fbo", "1", "make use of GL_ARB_framebuffer_objec cvar_t v_flipped = {0, "v_flipped", "0", "mirror the screen (poor man's left handed mode)"}; qboolean v_flipped_state = false; +r_viewport_t gl_viewport; +matrix4x4_t gl_modelmatrix; +matrix4x4_t gl_viewmatrix; +matrix4x4_t gl_modelviewmatrix; +matrix4x4_t gl_projectionmatrix; +matrix4x4_t gl_modelviewprojectionmatrix; +float gl_modelview16f[16]; +float gl_modelviewprojection16f[16]; +qboolean gl_modelmatrixchanged; + int gl_maxdrawrangeelementsvertices; int gl_maxdrawrangeelementsindices; @@ -78,15 +89,74 @@ void GL_PrintError(int errornumber, char *filename, int linenumber) } #endif -#define BACKENDACTIVECHECK if (!backendactive) Sys_Error("GL backend function called when backend is not active"); +#define BACKENDACTIVECHECK if (!gl_state.active) Sys_Error("GL backend function called when backend is not active"); void SCR_ScreenShot_f (void); -static r_viewport_t backend_viewport; -static matrix4x4_t backend_modelmatrix; -static matrix4x4_t backend_modelviewmatrix; +typedef struct gl_bufferobjectinfo_s +{ + int target; + int object; + size_t size; + char name[MAX_QPATH]; +} +gl_bufferobjectinfo_t; + +typedef struct gltextureunit_s +{ + const void *pointer_texcoord; + size_t pointer_texcoord_offset; + int pointer_texcoord_buffer; + int t2d, t3d, tcubemap, trectangle; + int arrayenabled; + unsigned int arraycomponents; + int rgbscale, alphascale; + int combine; + int combinergb, combinealpha; + // texmatrixenabled exists only to avoid unnecessary texmatrix compares + int texmatrixenabled; + matrix4x4_t matrix; +} +gltextureunit_t; + +typedef struct gl_state_s +{ + int cullface; + int cullfaceenable; + int blendfunc1; + int blendfunc2; + int blend; + GLboolean depthmask; + int colormask; // stored as bottom 4 bits: r g b a (3 2 1 0 order) + int depthtest; + float depthrange[2]; + float polygonoffset[2]; + int alphatest; + int scissortest; + unsigned int unit; + unsigned int clientunit; + gltextureunit_t units[MAX_TEXTUREUNITS]; + 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; + + memexpandablearray_t bufferobjectinfoarray; + + qboolean active; +} +gl_state_t; + +static gl_state_t gl_state; -static unsigned int backendunits, backendimageunits, backendarrayunits, backendactive; /* note: here's strip order for a terrain row: @@ -142,87 +212,38 @@ for (y = 0;y < rows - 1;y++) } */ -unsigned short polygonelements[(POLYGONELEMENTS_MAXPOINTS-2)*3]; -unsigned short quadelements[QUADELEMENTS_MAXQUADS*6]; - -void GL_Backend_AllocArrays(void) -{ -} - -void GL_Backend_FreeArrays(void) -{ -} +int polygonelement3i[(POLYGONELEMENTS_MAXPOINTS-2)*3]; +unsigned short polygonelement3s[(POLYGONELEMENTS_MAXPOINTS-2)*3]; +int quadelement3i[QUADELEMENTS_MAXQUADS*6]; +unsigned short quadelement3s[QUADELEMENTS_MAXQUADS*6]; 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_ResetState(void); static void gl_backend_start(void) { - CHECKGLERROR - - if (qglDrawRangeElements != NULL) - { - CHECKGLERROR - qglGetIntegerv(GL_MAX_ELEMENTS_VERTICES, &gl_maxdrawrangeelementsvertices); - CHECKGLERROR - qglGetIntegerv(GL_MAX_ELEMENTS_INDICES, &gl_maxdrawrangeelementsindices); - CHECKGLERROR - Con_DPrintf("GL_MAX_ELEMENTS_VERTICES = %i\nGL_MAX_ELEMENTS_INDICES = %i\n", gl_maxdrawrangeelementsvertices, gl_maxdrawrangeelementsindices); - } - - backendunits = bound(1, gl_textureunits, MAX_TEXTUREUNITS); - backendimageunits = backendunits; - backendarrayunits = backendunits; - if (gl_support_fragment_shader) - { - CHECKGLERROR - qglGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, (int *)&backendimageunits); - CHECKGLERROR - qglGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, (int *)&backendarrayunits); - CHECKGLERROR - Con_DPrintf("GLSL shader support detected: texture units = %i texenv, %i image, %i array\n", backendunits, backendimageunits, backendarrayunits); - backendimageunits = bound(1, backendimageunits, MAX_TEXTUREUNITS); - backendarrayunits = bound(1, backendarrayunits, MAX_TEXTUREUNITS); - } - else - Con_DPrintf("GL_MAX_TEXTUREUNITS = %i\n", backendunits); - - GL_Backend_AllocArrays(); + memset(&gl_state, 0, sizeof(gl_state)); - Mem_ExpandableArray_NewArray(&gl_bufferobjectinfoarray, r_main_mempool, sizeof(gl_bufferobjectinfo_t), 128); + Mem_ExpandableArray_NewArray(&gl_state.bufferobjectinfoarray, r_main_mempool, sizeof(gl_bufferobjectinfo_t), 128); Con_DPrintf("OpenGL backend started.\n"); CHECKGLERROR - backendactive = true; + GL_Backend_ResetState(); } static void gl_backend_shutdown(void) { - backendunits = 0; - backendimageunits = 0; - backendarrayunits = 0; - backendactive = false; - Con_DPrint("OpenGL Backend shutting down\n"); - Mem_ExpandableArray_FreeArray(&gl_bufferobjectinfoarray); + Mem_ExpandableArray_FreeArray(&gl_state.bufferobjectinfoarray); - GL_Backend_FreeArrays(); + memset(&gl_state, 0, sizeof(gl_state)); } static void gl_backend_newmap(void) @@ -235,22 +256,28 @@ void gl_backend_init(void) for (i = 0;i < POLYGONELEMENTS_MAXPOINTS - 2;i++) { - polygonelements[i * 3 + 0] = 0; - polygonelements[i * 3 + 1] = i + 1; - polygonelements[i * 3 + 2] = i + 2; + polygonelement3s[i * 3 + 0] = 0; + polygonelement3s[i * 3 + 1] = i + 1; + polygonelement3s[i * 3 + 2] = i + 2; } // elements for rendering a series of quads as triangles for (i = 0;i < QUADELEMENTS_MAXQUADS;i++) { - quadelements[i * 6 + 0] = i * 4; - quadelements[i * 6 + 1] = i * 4 + 1; - quadelements[i * 6 + 2] = i * 4 + 2; - quadelements[i * 6 + 3] = i * 4; - quadelements[i * 6 + 4] = i * 4 + 2; - quadelements[i * 6 + 5] = i * 4 + 3; + quadelement3s[i * 6 + 0] = i * 4; + quadelement3s[i * 6 + 1] = i * 4 + 1; + quadelement3s[i * 6 + 2] = i * 4 + 2; + quadelement3s[i * 6 + 3] = i * 4; + quadelement3s[i * 6 + 4] = i * 4 + 2; + quadelement3s[i * 6 + 5] = i * 4 + 3; } + for (i = 0;i < (POLYGONELEMENTS_MAXPOINTS - 2)*3;i++) + polygonelement3i[i] = polygonelement3s[i]; + for (i = 0;i < QUADELEMENTS_MAXQUADS*3;i++) + quadelement3i[i] = quadelement3s[i]; + Cvar_RegisterVariable(&r_render); + Cvar_RegisterVariable(&r_renderview); Cvar_RegisterVariable(&r_waterwarp); Cvar_RegisterVariable(&gl_polyblend); Cvar_RegisterVariable(&v_flipped); @@ -260,9 +287,6 @@ void gl_backend_init(void) Cvar_RegisterVariable(&gl_vbo); Cvar_RegisterVariable(&gl_paranoid); Cvar_RegisterVariable(&gl_printcheckerror); -#ifdef NORENDER - Cvar_SetValue("r_render", 0); -#endif Cvar_RegisterVariable(&gl_mesh_drawrangeelements); Cvar_RegisterVariable(&gl_mesh_testarrayelement); @@ -288,10 +312,10 @@ void R_Viewport_TransformToScreen(const r_viewport_t *v, const vec4_t in, vec4_t out[2] = v->z + (out[2] * iw + 1.0f) * v->depth * 0.5f; } -static void R_Viewport_ApplyNearClipPlane(r_viewport_t *v, double normalx, double normaly, double normalz, double dist) +static void R_Viewport_ApplyNearClipPlane(r_viewport_t *v, float normalx, float normaly, float normalz, float dist) { - double q[4]; - double d; + float q[4]; + float d; float clipPlane[4], v3[3], v4[3]; float normal[3]; @@ -309,7 +333,7 @@ static void R_Viewport_ApplyNearClipPlane(r_viewport_t *v, double normalx, doubl // testing code for comparing results float clipPlane2[4]; VectorCopy4(clipPlane, clipPlane2); - R_Mesh_Matrix(&identitymatrix); + R_EntityMatrix(&identitymatrix); VectorSet(q, normal[0], normal[1], normal[2], -dist); qglClipPlane(GL_CLIP_PLANE0, q); qglGetClipPlane(GL_CLIP_PLANE0, q); @@ -336,7 +360,7 @@ static void R_Viewport_ApplyNearClipPlane(r_viewport_t *v, double normalx, doubl v->m[14] = clipPlane[3] * d; } -void R_Viewport_InitOrtho(r_viewport_t *v, const matrix4x4_t *cameramatrix, int x, int y, int width, int height, double x1, double y1, double x2, double y2, double nearclip, double farclip, const double *nearplane) +void R_Viewport_InitOrtho(r_viewport_t *v, const matrix4x4_t *cameramatrix, int x, int y, int width, int height, float x1, float y1, float x2, float y2, float nearclip, float farclip, const float *nearplane) { float left = x1, right = x2, bottom = y2, top = y1, zNear = nearclip, zFar = farclip; memset(v, 0, sizeof(*v)); @@ -355,9 +379,11 @@ void R_Viewport_InitOrtho(r_viewport_t *v, const matrix4x4_t *cameramatrix, int v->m[13] = - (top + bottom)/(top - bottom); v->m[14] = - (zFar + zNear)/(zFar - zNear); v->m[15] = 1; + v->screentodepth[0] = -farclip / (farclip - nearclip); + v->screentodepth[1] = farclip * nearclip / (farclip - nearclip); Matrix4x4_Invert_Full(&v->viewmatrix, &v->cameramatrix); - Matrix4x4_FromArrayDoubleGL(&v->projectmatrix, v->m); + Matrix4x4_FromArrayFloatGL(&v->projectmatrix, v->m); if (nearplane) R_Viewport_ApplyNearClipPlane(v, nearplane[0], nearplane[1], nearplane[2], nearplane[3]); @@ -373,7 +399,7 @@ void R_Viewport_InitOrtho(r_viewport_t *v, const matrix4x4_t *cameramatrix, int #endif } -void R_Viewport_InitPerspective(r_viewport_t *v, const matrix4x4_t *cameramatrix, int x, int y, int width, int height, double frustumx, double frustumy, double nearclip, double farclip, const double *nearplane) +void R_Viewport_InitPerspective(r_viewport_t *v, const matrix4x4_t *cameramatrix, int x, int y, int width, int height, float frustumx, float frustumy, float nearclip, float farclip, const float *nearplane) { matrix4x4_t tempmatrix, basematrix; memset(v, 0, sizeof(*v)); @@ -394,22 +420,24 @@ void R_Viewport_InitPerspective(r_viewport_t *v, const matrix4x4_t *cameramatrix v->m[10] = -(farclip + nearclip) / (farclip - nearclip); v->m[11] = -1; v->m[14] = -2 * nearclip * farclip / (farclip - nearclip); + v->screentodepth[0] = -farclip / (farclip - nearclip); + v->screentodepth[1] = farclip * nearclip / (farclip - nearclip); Matrix4x4_Invert_Full(&tempmatrix, &v->cameramatrix); Matrix4x4_CreateRotate(&basematrix, -90, 1, 0, 0); Matrix4x4_ConcatRotate(&basematrix, 90, 0, 0, 1); Matrix4x4_Concat(&v->viewmatrix, &basematrix, &tempmatrix); - Matrix4x4_FromArrayDoubleGL(&v->projectmatrix, v->m); + Matrix4x4_FromArrayFloatGL(&v->projectmatrix, v->m); if (nearplane) R_Viewport_ApplyNearClipPlane(v, nearplane[0], nearplane[1], nearplane[2], nearplane[3]); } -void R_Viewport_InitPerspectiveInfinite(r_viewport_t *v, const matrix4x4_t *cameramatrix, int x, int y, int width, int height, double frustumx, double frustumy, double nearclip, const double *nearplane) +void R_Viewport_InitPerspectiveInfinite(r_viewport_t *v, const matrix4x4_t *cameramatrix, int x, int y, int width, int height, float frustumx, float frustumy, float nearclip, const float *nearplane) { matrix4x4_t tempmatrix, basematrix; - const double nudge = 1.0 - 1.0 / (1<<23); + const float nudge = 1.0 - 1.0 / (1<<23); memset(v, 0, sizeof(*v)); if(v_flipped.integer) @@ -428,13 +456,15 @@ void R_Viewport_InitPerspectiveInfinite(r_viewport_t *v, const matrix4x4_t *came v->m[10] = -nudge; v->m[11] = -1; v->m[14] = -2 * nearclip * nudge; + v->screentodepth[0] = (v->m[10] + 1) * 0.5 - 1; + v->screentodepth[1] = v->m[14] * -0.5; Matrix4x4_Invert_Full(&tempmatrix, &v->cameramatrix); Matrix4x4_CreateRotate(&basematrix, -90, 1, 0, 0); Matrix4x4_ConcatRotate(&basematrix, 90, 0, 0, 1); Matrix4x4_Concat(&v->viewmatrix, &basematrix, &tempmatrix); - Matrix4x4_FromArrayDoubleGL(&v->projectmatrix, v->m); + Matrix4x4_FromArrayFloatGL(&v->projectmatrix, v->m); if (nearplane) R_Viewport_ApplyNearClipPlane(v, nearplane[0], nearplane[1], nearplane[2], nearplane[3]); @@ -442,42 +472,83 @@ void R_Viewport_InitPerspectiveInfinite(r_viewport_t *v, const matrix4x4_t *came float cubeviewmatrix[6][16] = { - { - 0, 0,-1, 0, - 0,-1, 0, 0, - -1, 0, 0, 0, - 0, 0, 0, 1, - }, - { - 0, 0, 1, 0, - 0,-1, 0, 0, - 1, 0, 0, 0, - 0, 0, 0, 1, - }, - { - 1, 0, 0, 0, - 0, 0,-1, 0, - 0, 1, 0, 0, - 0, 0, 0, 1, - }, - { - 1, 0, 0, 0, - 0, 0, 1, 0, - 0,-1, 0, 0, - 0, 0, 0, 1, - }, - { - 1, 0, 0, 0, - 0,-1, 0, 0, - 0, 0,-1, 0, - 0, 0, 0, 1, - }, - { - -1, 0, 0, 0, - 0,-1, 0, 0, - 0, 0, 1, 0, - 0, 0, 0, 1, - }, + // standard cubemap projections + { // +X + 0, 0,-1, 0, + 0,-1, 0, 0, + -1, 0, 0, 0, + 0, 0, 0, 1, + }, + { // -X + 0, 0, 1, 0, + 0,-1, 0, 0, + 1, 0, 0, 0, + 0, 0, 0, 1, + }, + { // +Y + 1, 0, 0, 0, + 0, 0,-1, 0, + 0, 1, 0, 0, + 0, 0, 0, 1, + }, + { // -Y + 1, 0, 0, 0, + 0, 0, 1, 0, + 0,-1, 0, 0, + 0, 0, 0, 1, + }, + { // +Z + 1, 0, 0, 0, + 0,-1, 0, 0, + 0, 0,-1, 0, + 0, 0, 0, 1, + }, + { // -Z + -1, 0, 0, 0, + 0,-1, 0, 0, + 0, 0, 1, 0, + 0, 0, 0, 1, + }, +}; +float rectviewmatrix[6][16] = +{ + // sign-preserving cubemap projections + { // +X + 0, 0,-1, 0, + 0, 1, 0, 0, + 1, 0, 0, 0, + 0, 0, 0, 1, + }, + { // -X + 0, 0, 1, 0, + 0, 1, 0, 0, + 1, 0, 0, 0, + 0, 0, 0, 1, + }, + { // +Y + 1, 0, 0, 0, + 0, 0,-1, 0, + 0, 1, 0, 0, + 0, 0, 0, 1, + }, + { // -Y + 1, 0, 0, 0, + 0, 0, 1, 0, + 0, 1, 0, 0, + 0, 0, 0, 1, + }, + { // +Z + 1, 0, 0, 0, + 0, 1, 0, 0, + 0, 0,-1, 0, + 0, 0, 0, 1, + }, + { // -Z + 1, 0, 0, 0, + 0, 1, 0, 0, + 0, 0, 1, 0, + 0, 0, 0, 1, + }, }; void R_Viewport_InitCubeSideView(r_viewport_t *v, const matrix4x4_t *cameramatrix, int side, int size, float nearclip, float farclip, const float *nearplane) @@ -497,7 +568,7 @@ void R_Viewport_InitCubeSideView(r_viewport_t *v, const matrix4x4_t *cameramatri Matrix4x4_FromArrayFloatGL(&basematrix, cubeviewmatrix[side]); Matrix4x4_Invert_Simple(&tempmatrix, &v->cameramatrix); Matrix4x4_Concat(&v->viewmatrix, &basematrix, &tempmatrix); - Matrix4x4_FromArrayDoubleGL(&v->projectmatrix, v->m); + Matrix4x4_FromArrayFloatGL(&v->projectmatrix, v->m); if (nearplane) R_Viewport_ApplyNearClipPlane(v, nearplane[0], nearplane[1], nearplane[2], nearplane[3]); @@ -506,8 +577,6 @@ void R_Viewport_InitCubeSideView(r_viewport_t *v, const matrix4x4_t *cameramatri void R_Viewport_InitRectSideView(r_viewport_t *v, const matrix4x4_t *cameramatrix, int side, int size, int border, float nearclip, float farclip, const float *nearplane) { matrix4x4_t tempmatrix, basematrix; - if (border > size - 2) - border = size - 2; memset(v, 0, sizeof(*v)); v->type = R_VIEWPORTTYPE_PERSPECTIVECUBESIDE; v->cameramatrix = *cameramatrix; @@ -521,10 +590,10 @@ void R_Viewport_InitRectSideView(r_viewport_t *v, const matrix4x4_t *cameramatri v->m[11] = -1; v->m[14] = -2 * nearclip * farclip / (farclip - nearclip); - Matrix4x4_FromArrayFloatGL(&basematrix, cubeviewmatrix[side]); + Matrix4x4_FromArrayFloatGL(&basematrix, rectviewmatrix[side]); Matrix4x4_Invert_Simple(&tempmatrix, &v->cameramatrix); Matrix4x4_Concat(&v->viewmatrix, &basematrix, &tempmatrix); - Matrix4x4_FromArrayDoubleGL(&v->projectmatrix, v->m); + Matrix4x4_FromArrayFloatGL(&v->projectmatrix, v->m); if (nearplane) R_Viewport_ApplyNearClipPlane(v, nearplane[0], nearplane[1], nearplane[2], nearplane[3]); @@ -532,79 +601,41 @@ void R_Viewport_InitRectSideView(r_viewport_t *v, const matrix4x4_t *cameramatri void R_SetViewport(const r_viewport_t *v) { - float glmatrix[16]; - backend_viewport = *v; + gl_viewport = *v; CHECKGLERROR qglViewport(v->x, v->y, v->width, v->height);CHECKGLERROR - // Load the projection matrix into OpenGL - qglMatrixMode(GL_PROJECTION);CHECKGLERROR - qglLoadMatrixd(backend_viewport.m);CHECKGLERROR - qglMatrixMode(GL_MODELVIEW);CHECKGLERROR - // FIXME: v_flipped_state is evil, this probably breaks somewhere GL_SetMirrorState(v_flipped.integer && (v->type == R_VIEWPORTTYPE_PERSPECTIVE || v->type == R_VIEWPORTTYPE_PERSPECTIVE_INFINITEFARCLIP)); - // directly force an update of the modelview matrix - Matrix4x4_Concat(&backend_modelviewmatrix, &backend_viewport.viewmatrix, &backend_modelmatrix); - Matrix4x4_ToArrayFloatGL(&backend_modelviewmatrix, glmatrix); - qglLoadMatrixf(glmatrix);CHECKGLERROR -} + // copy over the matrices to our state + gl_viewmatrix = v->viewmatrix; + gl_projectionmatrix = v->projectmatrix; -void R_GetViewport(r_viewport_t *v) -{ - *v = backend_viewport; -} + switch(vid.renderpath) + { + case RENDERPATH_GL20: + case RENDERPATH_CGGL: +// break; + case RENDERPATH_GL13: + case RENDERPATH_GL11: + // Load the projection matrix into OpenGL + qglMatrixMode(GL_PROJECTION);CHECKGLERROR + qglLoadMatrixf(gl_viewport.m);CHECKGLERROR + qglMatrixMode(GL_MODELVIEW);CHECKGLERROR + break; + } -typedef struct gltextureunit_s -{ - const void *pointer_texcoord; - size_t pointer_texcoord_offset; - int pointer_texcoord_buffer; - int t1d, t2d, t3d, tcubemap, trectangle; - int arrayenabled; - unsigned int arraycomponents; - int rgbscale, alphascale; - int combinergb, combinealpha; - // FIXME: add more combine stuff - // texmatrixenabled exists only to avoid unnecessary texmatrix compares - int texmatrixenabled; - matrix4x4_t matrix; + // force an update of the derived matrices + gl_modelmatrixchanged = true; + R_EntityMatrix(&gl_modelmatrix); } -gltextureunit_t; -static struct gl_state_s +void R_GetViewport(r_viewport_t *v) { - int cullface; - int cullfaceenable; - int blendfunc1; - int blendfunc2; - int blend; - GLboolean depthmask; - int colormask; // stored as bottom 4 bits: r g b a (3 2 1 0 order) - int depthtest; - float depthrange[2]; - float polygonoffset[2]; - int alphatest; - int scissortest; - unsigned int unit; - unsigned int clientunit; - gltextureunit_t units[MAX_TEXTUREUNITS]; - 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; + *v = gl_viewport; } -gl_state; static void GL_BindVBO(int bufferobject) { @@ -628,112 +659,10 @@ static void GL_BindEBO(int bufferobject) } } -void GL_SetupTextureState(void) +static void GL_Backend_ResetState(void) { unsigned int i; - gltextureunit_t *unit; - CHECKGLERROR - gl_state.unit = MAX_TEXTUREUNITS; - gl_state.clientunit = MAX_TEXTUREUNITS; - for (i = 0;i < MAX_TEXTUREUNITS;i++) - { - unit = gl_state.units + i; - unit->t1d = 0; - unit->t2d = 0; - unit->t3d = 0; - unit->tcubemap = 0; - 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; - unit->combinealpha = GL_MODULATE; - unit->texmatrixenabled = false; - unit->matrix = identitymatrix; - } - - for (i = 0;i < backendimageunits;i++) - { - GL_ActiveTexture(i); - qglBindTexture(GL_TEXTURE_1D, 0);CHECKGLERROR - qglBindTexture(GL_TEXTURE_2D, 0);CHECKGLERROR - if (gl_texture3d) - { - qglBindTexture(GL_TEXTURE_3D, 0);CHECKGLERROR - } - if (gl_texturecubemap) - { - qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, 0);CHECKGLERROR - } - if (gl_texturerectangle) - { - qglBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);CHECKGLERROR - } - } - - 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 - } - - for (i = 0;i < backendunits;i++) - { - GL_ActiveTexture(i); - qglDisable(GL_TEXTURE_1D);CHECKGLERROR - qglDisable(GL_TEXTURE_2D);CHECKGLERROR - if (gl_texture3d) - { - qglDisable(GL_TEXTURE_3D);CHECKGLERROR - } - if (gl_texturecubemap) - { - qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR - } - if (gl_texturerectangle) - { - qglDisable(GL_TEXTURE_RECTANGLE_ARB);CHECKGLERROR - } - qglMatrixMode(GL_TEXTURE);CHECKGLERROR - qglLoadIdentity();CHECKGLERROR - qglMatrixMode(GL_MODELVIEW);CHECKGLERROR - if (gl_combine.integer) - { - qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_ARB);CHECKGLERROR - 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_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 - qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, GL_MODULATE);CHECKGLERROR - qglTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_ARB, GL_TEXTURE);CHECKGLERROR - qglTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_ALPHA_ARB, GL_PREVIOUS_ARB);CHECKGLERROR - qglTexEnvi(GL_TEXTURE_ENV, GL_SOURCE2_ALPHA_ARB, GL_CONSTANT_ARB);CHECKGLERROR - qglTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA_ARB, GL_SRC_ALPHA);CHECKGLERROR - qglTexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_ALPHA_ARB, GL_SRC_ALPHA);CHECKGLERROR - qglTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_ALPHA_ARB, GL_SRC_ALPHA);CHECKGLERROR - qglTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, 1);CHECKGLERROR - qglTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, 1);CHECKGLERROR - } - else - { - qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);CHECKGLERROR - } - CHECKGLERROR - } - CHECKGLERROR -} - -void GL_Backend_ResetState(void) -{ - memset(&gl_state, 0, sizeof(gl_state)); + gl_state.active = true; gl_state.depthtest = true; gl_state.alphatest = false; gl_state.blendfunc1 = GL_ONE; @@ -763,13 +692,13 @@ void GL_Backend_ResetState(void) qglDepthMask(gl_state.depthmask);CHECKGLERROR qglPolygonOffset(gl_state.polygonoffset[0], gl_state.polygonoffset[1]); - if (gl_support_arb_vertex_buffer_object) + if (vid.support.arb_vertex_buffer_object) { qglBindBufferARB(GL_ARRAY_BUFFER_ARB, 0); qglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0); } - if (gl_support_ext_framebuffer_object) + if (vid.support.ext_framebuffer_object) { qglBindRenderbufferEXT(GL_RENDERBUFFER_EXT, 0); qglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); @@ -784,7 +713,57 @@ void GL_Backend_ResetState(void) GL_Color(0, 0, 0, 0); GL_Color(1, 1, 1, 1); - GL_SetupTextureState(); + gl_state.unit = MAX_TEXTUREUNITS; + gl_state.clientunit = MAX_TEXTUREUNITS; + for (i = 0;i < vid.teximageunits;i++) + { + GL_ActiveTexture(i); + qglBindTexture(GL_TEXTURE_2D, 0);CHECKGLERROR + if (vid.support.ext_texture_3d) + { + qglBindTexture(GL_TEXTURE_3D, 0);CHECKGLERROR + } + if (vid.support.arb_texture_cube_map) + { + qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, 0);CHECKGLERROR + } + if (vid.support.arb_texture_rectangle) + { + qglBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);CHECKGLERROR + } + } + + for (i = 0;i < vid.texarrayunits;i++) + { + GL_ClientActiveTexture(i); + GL_BindVBO(0); + qglTexCoordPointer(2, GL_FLOAT, sizeof(float[2]), NULL);CHECKGLERROR + qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR + } + + for (i = 0;i < vid.texunits;i++) + { + GL_ActiveTexture(i); + qglDisable(GL_TEXTURE_2D);CHECKGLERROR + if (vid.support.ext_texture_3d) + { + qglDisable(GL_TEXTURE_3D);CHECKGLERROR + } + if (vid.support.arb_texture_cube_map) + { + qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR + } + if (vid.support.arb_texture_rectangle) + { + qglDisable(GL_TEXTURE_RECTANGLE_ARB);CHECKGLERROR + } + qglMatrixMode(GL_TEXTURE);CHECKGLERROR + qglLoadIdentity();CHECKGLERROR + qglMatrixMode(GL_MODELVIEW);CHECKGLERROR + qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);CHECKGLERROR + CHECKGLERROR + } + CHECKGLERROR } void GL_ActiveTexture(unsigned int num) @@ -1003,7 +982,7 @@ void GL_LockArrays(int first, int count) qglUnlockArraysEXT(); CHECKGLERROR } - if (count && gl_supportslockarrays && gl_lockarrays.integer && r_render.integer) + if (count && vid.support.ext_compiled_vertex_array && gl_lockarrays.integer) { gl_state.lockrange_first = first; gl_state.lockrange_count = count; @@ -1050,7 +1029,6 @@ void R_Mesh_Start(void) Con_Printf("WARNING: gl_printcheckerror is on but gl_paranoid is off, turning it on...\n"); Cvar_SetValueQuick(&gl_paranoid, 1); } - GL_Backend_ResetState(); } qboolean GL_Backend_CompileShader(int programobject, GLenum shadertypeenum, const char *shadertype, int numstrings, const char **strings) @@ -1065,7 +1043,7 @@ qboolean GL_Backend_CompileShader(int programobject, GLenum shadertypeenum, cons qglCompileShaderARB(shaderobject);CHECKGLERROR qglGetObjectParameterivARB(shaderobject, GL_OBJECT_COMPILE_STATUS_ARB, &shadercompiled);CHECKGLERROR qglGetInfoLogARB(shaderobject, sizeof(compilelog), NULL, compilelog);CHECKGLERROR - if (compilelog[0] && developer.integer > 0) + if (compilelog[0] && developer.integer > 0 && (strstr(compilelog, "error") || strstr(compilelog, "ERROR") || strstr(compilelog, "Error") || strstr(compilelog, "WARNING") || strstr(compilelog, "warning") || strstr(compilelog, "Warning"))) { int i, j, pretextlines = 0; for (i = 0;i < numstrings - 1;i++) @@ -1111,7 +1089,8 @@ unsigned int GL_Backend_CompileProgram(int vertexstrings_count, const char **ver qglGetInfoLogARB(programobject, sizeof(linklog), NULL, linklog);CHECKGLERROR if (linklog[0]) { - Con_DPrintf("program link log:\n%s\n", linklog); + if (strstr(linklog, "error") || strstr(linklog, "ERROR") || strstr(linklog, "Error") || strstr(linklog, "WARNING") || strstr(linklog, "warning") || strstr(linklog, "Warning")) + Con_DPrintf("program link log:\n%s\n", linklog); // software vertex shader is ok but software fragment shader is WAY // too slow, fail program if so. // NOTE: this string might be ATI specific, but that's ok because the @@ -1136,8 +1115,6 @@ void GL_Backend_FreeProgram(unsigned int prog) CHECKGLERROR } -int gl_backend_rebindtextures; - void GL_Backend_RenumberElements(int *out, int count, const int *in, int offset) { int i; @@ -1213,7 +1190,7 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int firsttriangle, int numtri 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++) + for (i = 0;i < vid.texarrayunits;i++) { if (gl_state.units[i].arrayenabled) { @@ -1250,7 +1227,7 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int firsttriangle, int numtri } CHECKGLERROR } - if (r_render.integer) + if (r_render.integer || r_refdef.draw2dstage) { CHECKGLERROR if (gl_mesh_testmanualfeeding.integer) @@ -1261,11 +1238,11 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int firsttriangle, int numtri for (i = 0;i < (unsigned int) numtriangles * 3;i++) { element = element3i ? element3i[i] : element3s[i]; - for (j = 0;j < backendarrayunits;j++) + for (j = 0;j < vid.texarrayunits;j++) { if (gl_state.units[j].pointer_texcoord && gl_state.units[j].arrayenabled) { - if (backendarrayunits > 1) + if (vid.texarrayunits > 1) { if (gl_state.units[j].arraycomponents == 4) { @@ -1403,67 +1380,7 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int firsttriangle, int numtri // restores backend state, used when done with 3D rendering void R_Mesh_Finish(void) { - unsigned int i; - BACKENDACTIVECHECK - CHECKGLERROR - GL_LockArrays(0, 0); - CHECKGLERROR - - for (i = 0;i < backendimageunits;i++) - { - GL_ActiveTexture(i); - qglBindTexture(GL_TEXTURE_1D, 0);CHECKGLERROR - qglBindTexture(GL_TEXTURE_2D, 0);CHECKGLERROR - if (gl_texture3d) - { - qglBindTexture(GL_TEXTURE_3D, 0);CHECKGLERROR - } - if (gl_texturecubemap) - { - qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, 0);CHECKGLERROR - } - if (gl_texturerectangle) - { - qglBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);CHECKGLERROR - } - } - for (i = 0;i < backendarrayunits;i++) - { - GL_ActiveTexture(backendarrayunits - 1 - i); - qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR - } - for (i = 0;i < backendunits;i++) - { - GL_ActiveTexture(backendunits - 1 - i); - qglDisable(GL_TEXTURE_1D);CHECKGLERROR - qglDisable(GL_TEXTURE_2D);CHECKGLERROR - if (gl_texture3d) - { - qglDisable(GL_TEXTURE_3D);CHECKGLERROR - } - if (gl_texturecubemap) - { - qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR - } - if (gl_texturerectangle) - { - qglDisable(GL_TEXTURE_RECTANGLE_ARB);CHECKGLERROR - } - qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);CHECKGLERROR - if (gl_combine.integer) - { - qglTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, 1);CHECKGLERROR - qglTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, 1);CHECKGLERROR - } - } - qglDisableClientState(GL_COLOR_ARRAY);CHECKGLERROR - qglDisableClientState(GL_VERTEX_ARRAY);CHECKGLERROR - - qglDisable(GL_BLEND);CHECKGLERROR - qglEnable(GL_DEPTH_TEST);CHECKGLERROR - qglDepthMask(GL_TRUE);CHECKGLERROR - 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) { @@ -1482,7 +1399,7 @@ int R_Mesh_CreateStaticBufferObject(unsigned int target, void *data, size_t size } qglBufferDataARB(target, size, data, GL_STATIC_DRAW_ARB); - info = (gl_bufferobjectinfo_t *) Mem_ExpandableArray_AllocRecord(&gl_bufferobjectinfoarray); + info = (gl_bufferobjectinfo_t *) Mem_ExpandableArray_AllocRecord(&gl_state.bufferobjectinfoarray); memset(info, 0, sizeof(*info)); info->target = target; info->object = bufferobject; @@ -1499,15 +1416,15 @@ void R_Mesh_DestroyBufferObject(int bufferobject) qglDeleteBuffersARB(1, (GLuint *)&bufferobject); - endindex = Mem_ExpandableArray_IndexRange(&gl_bufferobjectinfoarray); + endindex = Mem_ExpandableArray_IndexRange(&gl_state.bufferobjectinfoarray); for (i = 0;i < endindex;i++) { - info = (gl_bufferobjectinfo_t *) Mem_ExpandableArray_RecordAtIndex(&gl_bufferobjectinfoarray, i); + info = (gl_bufferobjectinfo_t *) Mem_ExpandableArray_RecordAtIndex(&gl_state.bufferobjectinfoarray, i); if (!info) continue; if (info->object == bufferobject) { - Mem_ExpandableArray_FreeRecord(&gl_bufferobjectinfoarray, (void *)info); + Mem_ExpandableArray_FreeRecord(&gl_state.bufferobjectinfoarray, (void *)info); break; } } @@ -1519,10 +1436,10 @@ void GL_Mesh_ListVBOs(qboolean printeach) size_t ebocount = 0, ebomemory = 0; size_t vbocount = 0, vbomemory = 0; gl_bufferobjectinfo_t *info; - endindex = Mem_ExpandableArray_IndexRange(&gl_bufferobjectinfoarray); + endindex = Mem_ExpandableArray_IndexRange(&gl_state.bufferobjectinfoarray); for (i = 0;i < endindex;i++) { - info = (gl_bufferobjectinfo_t *) Mem_ExpandableArray_RecordAtIndex(&gl_bufferobjectinfoarray, i); + info = (gl_bufferobjectinfo_t *) Mem_ExpandableArray_RecordAtIndex(&gl_state.bufferobjectinfoarray, i); if (!info) continue; switch(info->target) @@ -1535,22 +1452,9 @@ void GL_Mesh_ListVBOs(qboolean printeach) 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))) - { - float glmatrix[16]; - backend_modelmatrix = *matrix; - Matrix4x4_Concat(&backend_modelviewmatrix, &backend_viewport.viewmatrix, &backend_modelmatrix); - Matrix4x4_ToArrayFloatGL(&backend_modelviewmatrix, glmatrix); - CHECKGLERROR - qglLoadMatrixf(glmatrix);CHECKGLERROR - } -} - void R_Mesh_VertexPointer(const float *vertex3f, int bufferobject, size_t bufferoffset) { - if (!gl_vbo.integer) + if (!gl_vbo.integer || gl_mesh_testarrayelement.integer) bufferobject = 0; if (gl_state.pointer_vertex != vertex3f || gl_state.pointer_vertex_buffer != bufferobject || gl_state.pointer_vertex_offset != bufferoffset) { @@ -1570,7 +1474,7 @@ void R_Mesh_ColorPointer(const float *color4f, int bufferobject, size_t bufferof // means that a valid vbo may be supplied even if there is no color array. if (color4f) { - if (!gl_vbo.integer) + if (!gl_vbo.integer || gl_mesh_testarrayelement.integer) bufferobject = 0; // caller wants color array enabled if (!gl_state.pointer_color_enabled) @@ -1612,7 +1516,7 @@ void R_Mesh_TexCoordPointer(unsigned int unitnum, unsigned int numcomponents, co // that involve a valid bufferobject also supply a texcoord array if (texcoord) { - if (!gl_vbo.integer) + if (!gl_vbo.integer || gl_mesh_testarrayelement.integer) bufferobject = 0; // texture array unit is enabled, enable the array if (!unit->arrayenabled) @@ -1645,40 +1549,39 @@ void R_Mesh_TexCoordPointer(unsigned int unitnum, unsigned int numcomponents, co } } -void R_Mesh_TexBindAll(unsigned int unitnum, int tex1d, int tex2d, int tex3d, int texcubemap, int texrectangle) +int R_Mesh_TexBound(unsigned int unitnum, int id) +{ + gltextureunit_t *unit = gl_state.units + unitnum; + if (unitnum >= vid.teximageunits) + return 0; + if (id == GL_TEXTURE_2D) + return unit->t2d; + if (id == GL_TEXTURE_3D) + return unit->t3d; + if (id == GL_TEXTURE_CUBE_MAP_ARB) + return unit->tcubemap; + if (id == GL_TEXTURE_RECTANGLE_ARB) + return unit->trectangle; + return 0; +} + +void R_Mesh_CopyToTexture(int texnum, int tx, int ty, int sx, int sy, int width, int height) +{ + R_Mesh_TexBind(0, texnum); + GL_ActiveTexture(0);CHECKGLERROR + qglCopyTexSubImage2D(GL_TEXTURE_2D, 0, tx, ty, sx, sy, width, height);CHECKGLERROR +} + +void R_Mesh_TexBindAll(unsigned int unitnum, int tex2d, int tex3d, int texcubemap, int texrectangle) { gltextureunit_t *unit = gl_state.units + unitnum; - if (unitnum >= backendimageunits) + if (unitnum >= vid.teximageunits) return; - // update 1d texture binding - if (unit->t1d != tex1d) - { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) - { - if (tex1d) - { - if (unit->t1d == 0) - { - qglEnable(GL_TEXTURE_1D);CHECKGLERROR - } - } - else - { - if (unit->t1d) - { - qglDisable(GL_TEXTURE_1D);CHECKGLERROR - } - } - } - unit->t1d = tex1d; - qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR - } // update 2d texture binding if (unit->t2d != tex2d) { GL_ActiveTexture(unitnum); - if (unitnum < backendunits) + if (unitnum < vid.texunits) { if (tex2d) { @@ -1702,7 +1605,7 @@ void R_Mesh_TexBindAll(unsigned int unitnum, int tex1d, int tex2d, int tex3d, in if (unit->t3d != tex3d) { GL_ActiveTexture(unitnum); - if (unitnum < backendunits) + if (unitnum < vid.texunits) { if (tex3d) { @@ -1726,7 +1629,7 @@ void R_Mesh_TexBindAll(unsigned int unitnum, int tex1d, int tex2d, int tex3d, in if (unit->tcubemap != texcubemap) { GL_ActiveTexture(unitnum); - if (unitnum < backendunits) + if (unitnum < vid.texunits) { if (texcubemap) { @@ -1750,7 +1653,7 @@ void R_Mesh_TexBindAll(unsigned int unitnum, int tex1d, int tex2d, int tex3d, in if (unit->trectangle != texrectangle) { GL_ActiveTexture(unitnum); - if (unitnum < backendunits) + if (unitnum < vid.texunits) { if (texrectangle) { @@ -1772,117 +1675,16 @@ void R_Mesh_TexBindAll(unsigned int unitnum, int tex1d, int tex2d, int tex3d, in } } -void R_Mesh_TexBind1D(unsigned int unitnum, int texnum) -{ - gltextureunit_t *unit = gl_state.units + unitnum; - if (unitnum >= backendimageunits) - return; - // update 1d texture binding - if (unit->t1d != texnum) - { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) - { - if (texnum) - { - if (unit->t1d == 0) - { - qglEnable(GL_TEXTURE_1D);CHECKGLERROR - } - } - else - { - if (unit->t1d) - { - qglDisable(GL_TEXTURE_1D);CHECKGLERROR - } - } - } - unit->t1d = texnum; - qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR - } - // update 2d texture binding - if (unit->t2d) - { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) - { - if (unit->t2d) - { - qglDisable(GL_TEXTURE_2D);CHECKGLERROR - } - } - unit->t2d = 0; - qglBindTexture(GL_TEXTURE_2D, unit->t2d);CHECKGLERROR - } - // update 3d texture binding - if (unit->t3d) - { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) - { - if (unit->t3d) - { - qglDisable(GL_TEXTURE_3D);CHECKGLERROR - } - } - unit->t3d = 0; - qglBindTexture(GL_TEXTURE_3D, unit->t3d);CHECKGLERROR - } - // update cubemap texture binding - if (unit->tcubemap) - { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) - { - if (unit->tcubemap) - { - qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR - } - } - unit->tcubemap = 0; - qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR - } - // update rectangle texture binding - if (unit->trectangle) - { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) - { - if (unit->trectangle) - { - qglDisable(GL_TEXTURE_RECTANGLE_ARB);CHECKGLERROR - } - } - unit->trectangle = 0; - qglBindTexture(GL_TEXTURE_RECTANGLE_ARB, unit->trectangle);CHECKGLERROR - } -} - void R_Mesh_TexBind(unsigned int unitnum, int texnum) { gltextureunit_t *unit = gl_state.units + unitnum; - if (unitnum >= backendimageunits) + if (unitnum >= vid.teximageunits) return; - // update 1d texture binding - if (unit->t1d) - { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) - { - if (unit->t1d) - { - qglDisable(GL_TEXTURE_1D);CHECKGLERROR - } - } - unit->t1d = 0; - qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR - } // update 2d texture binding if (unit->t2d != texnum) { GL_ActiveTexture(unitnum); - if (unitnum < backendunits) + if (unitnum < vid.texunits) { if (texnum) { @@ -1906,7 +1708,7 @@ void R_Mesh_TexBind(unsigned int unitnum, int texnum) if (unit->t3d) { GL_ActiveTexture(unitnum); - if (unitnum < backendunits) + if (unitnum < vid.texunits) { if (unit->t3d) { @@ -1920,7 +1722,7 @@ void R_Mesh_TexBind(unsigned int unitnum, int texnum) if (unit->tcubemap != 0) { GL_ActiveTexture(unitnum); - if (unitnum < backendunits) + if (unitnum < vid.texunits) { if (unit->tcubemap) { @@ -1934,7 +1736,7 @@ void R_Mesh_TexBind(unsigned int unitnum, int texnum) if (unit->trectangle != 0) { GL_ActiveTexture(unitnum); - if (unitnum < backendunits) + if (unitnum < vid.texunits) { if (unit->trectangle) { @@ -1946,285 +1748,24 @@ void R_Mesh_TexBind(unsigned int unitnum, int texnum) } } -void R_Mesh_TexBind3D(unsigned int unitnum, int texnum) -{ - gltextureunit_t *unit = gl_state.units + unitnum; - if (unitnum >= backendimageunits) - return; - // update 1d texture binding - if (unit->t1d) - { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) - { - if (unit->t1d) - { - qglDisable(GL_TEXTURE_1D);CHECKGLERROR - } - } - unit->t1d = 0; - qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR - } - // update 2d texture binding - if (unit->t2d) - { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) - { - if (unit->t2d) - { - qglDisable(GL_TEXTURE_2D);CHECKGLERROR - } - } - unit->t2d = 0; - qglBindTexture(GL_TEXTURE_2D, unit->t2d);CHECKGLERROR - } - // update 3d texture binding - if (unit->t3d != texnum) - { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) - { - if (texnum) - { - if (unit->t3d == 0) - { - qglEnable(GL_TEXTURE_3D);CHECKGLERROR - } - } - else - { - if (unit->t3d) - { - qglDisable(GL_TEXTURE_3D);CHECKGLERROR - } - } - } - unit->t3d = texnum; - qglBindTexture(GL_TEXTURE_3D, unit->t3d);CHECKGLERROR - } - // update cubemap texture binding - if (unit->tcubemap != 0) - { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) - { - if (unit->tcubemap) - { - qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR - } - } - unit->tcubemap = 0; - qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR - } - // update rectangle texture binding - if (unit->trectangle != 0) - { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) - { - if (unit->trectangle) - { - qglDisable(GL_TEXTURE_RECTANGLE_ARB);CHECKGLERROR - } - } - unit->trectangle = 0; - qglBindTexture(GL_TEXTURE_RECTANGLE_ARB, unit->trectangle);CHECKGLERROR - } -} - -void R_Mesh_TexBindCubeMap(unsigned int unitnum, int texnum) -{ - gltextureunit_t *unit = gl_state.units + unitnum; - if (unitnum >= backendimageunits) - return; - // update 1d texture binding - if (unit->t1d) - { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) - { - if (unit->t1d) - { - qglDisable(GL_TEXTURE_1D);CHECKGLERROR - } - } - unit->t1d = 0; - qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR - } - // update 2d texture binding - if (unit->t2d) - { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) - { - if (unit->t2d) - { - qglDisable(GL_TEXTURE_2D);CHECKGLERROR - } - } - unit->t2d = 0; - qglBindTexture(GL_TEXTURE_2D, unit->t2d);CHECKGLERROR - } - // update 3d texture binding - if (unit->t3d) - { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) - { - if (unit->t3d) - { - qglDisable(GL_TEXTURE_3D);CHECKGLERROR - } - } - unit->t3d = 0; - qglBindTexture(GL_TEXTURE_3D, unit->t3d);CHECKGLERROR - } - // update cubemap texture binding - if (unit->tcubemap != texnum) - { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) - { - if (texnum) - { - if (unit->tcubemap == 0) - { - qglEnable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR - } - } - else - { - if (unit->tcubemap) - { - qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR - } - } - } - unit->tcubemap = texnum; - qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR - } - // update rectangle texture binding - if (unit->trectangle != 0) - { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) - { - if (unit->trectangle) - { - qglDisable(GL_TEXTURE_RECTANGLE_ARB);CHECKGLERROR - } - } - unit->trectangle = 0; - qglBindTexture(GL_TEXTURE_RECTANGLE_ARB, unit->trectangle);CHECKGLERROR - } -} - -void R_Mesh_TexBindRectangle(unsigned int unitnum, int texnum) -{ - gltextureunit_t *unit = gl_state.units + unitnum; - if (unitnum >= backendimageunits) - return; - // update 1d texture binding - if (unit->t1d) - { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) - { - if (unit->t1d) - { - qglDisable(GL_TEXTURE_1D);CHECKGLERROR - } - } - unit->t1d = 0; - qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR - } - // update 2d texture binding - if (unit->t2d) - { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) - { - if (unit->t2d) - { - qglDisable(GL_TEXTURE_2D);CHECKGLERROR - } - } - unit->t2d = 0; - qglBindTexture(GL_TEXTURE_2D, unit->t2d);CHECKGLERROR - } - // update 3d texture binding - if (unit->t3d) - { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) - { - if (unit->t3d) - { - qglDisable(GL_TEXTURE_3D);CHECKGLERROR - } - } - unit->t3d = 0; - qglBindTexture(GL_TEXTURE_3D, unit->t3d);CHECKGLERROR - } - // update cubemap texture binding - if (unit->tcubemap != 0) - { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) - { - if (unit->tcubemap) - { - qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR - } - } - unit->tcubemap = 0; - qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR - } - // update rectangle texture binding - if (unit->trectangle != texnum) - { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) - { - if (texnum) - { - if (unit->trectangle == 0) - { - qglEnable(GL_TEXTURE_RECTANGLE_ARB);CHECKGLERROR - } - } - else - { - if (unit->trectangle) - { - qglDisable(GL_TEXTURE_RECTANGLE_ARB);CHECKGLERROR - } - } - } - unit->trectangle = texnum; - qglBindTexture(GL_TEXTURE_RECTANGLE_ARB, unit->trectangle);CHECKGLERROR - } -} - -static const double gl_identitymatrix[16] = {1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1}; +static const float gl_identitymatrix[16] = {1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1}; void R_Mesh_TexMatrix(unsigned int unitnum, const matrix4x4_t *matrix) { gltextureunit_t *unit = gl_state.units + unitnum; - if (matrix->m[3][3]) + if (matrix && matrix->m[3][3]) { // texmatrix specified, check if it is different if (!unit->texmatrixenabled || memcmp(&unit->matrix, matrix, sizeof(matrix4x4_t))) { - double glmatrix[16]; + float glmatrix[16]; unit->texmatrixenabled = true; unit->matrix = *matrix; CHECKGLERROR - Matrix4x4_ToArrayDoubleGL(&unit->matrix, glmatrix); + Matrix4x4_ToArrayFloatGL(&unit->matrix, glmatrix); GL_ActiveTexture(unitnum); qglMatrixMode(GL_TEXTURE);CHECKGLERROR - qglLoadMatrixd(glmatrix);CHECKGLERROR + qglLoadMatrixf(glmatrix);CHECKGLERROR qglMatrixMode(GL_MODELVIEW);CHECKGLERROR } } @@ -2248,8 +1789,13 @@ void R_Mesh_TexCombine(unsigned int unitnum, int combinergb, int combinealpha, i { gltextureunit_t *unit = gl_state.units + unitnum; CHECKGLERROR - if (gl_combine.integer) + switch(vid.renderpath) { + case RENDERPATH_GL20: + case RENDERPATH_CGGL: + // do nothing + break; + case RENDERPATH_GL13: // GL_ARB_texture_env_combine if (!combinergb) combinergb = GL_MODULATE; @@ -2259,74 +1805,66 @@ void R_Mesh_TexCombine(unsigned int unitnum, int combinergb, int combinealpha, i rgbscale = 1; if (!alphascale) alphascale = 1; - if (unit->combinergb != combinergb) - { - unit->combinergb = combinergb; - GL_ActiveTexture(unitnum); - qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, unit->combinergb);CHECKGLERROR - } - if (unit->combinealpha != combinealpha) - { - unit->combinealpha = combinealpha; - GL_ActiveTexture(unitnum); - qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, unit->combinealpha);CHECKGLERROR - } - if (unit->rgbscale != rgbscale) + if (combinergb != combinealpha || rgbscale != 1 || alphascale != 1) { - GL_ActiveTexture(unitnum); - qglTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, (unit->rgbscale = rgbscale));CHECKGLERROR + if (combinergb == GL_DECAL) + combinergb = GL_INTERPOLATE_ARB; + if (unit->combine != GL_COMBINE_ARB) + { + unit->combine = GL_COMBINE_ARB; + GL_ActiveTexture(unitnum); + qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_ARB);CHECKGLERROR + qglTexEnvi(GL_TEXTURE_ENV, GL_SOURCE2_RGB_ARB, GL_TEXTURE);CHECKGLERROR // for GL_INTERPOLATE_ARB mode + } + if (unit->combinergb != combinergb) + { + unit->combinergb = combinergb; + GL_ActiveTexture(unitnum); + qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, unit->combinergb);CHECKGLERROR + } + if (unit->combinealpha != combinealpha) + { + unit->combinealpha = combinealpha; + GL_ActiveTexture(unitnum); + qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, unit->combinealpha);CHECKGLERROR + } + if (unit->rgbscale != rgbscale) + { + unit->rgbscale = rgbscale; + GL_ActiveTexture(unitnum); + qglTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, unit->rgbscale);CHECKGLERROR + } + if (unit->alphascale != alphascale) + { + unit->alphascale = alphascale; + GL_ActiveTexture(unitnum); + qglTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, unit->alphascale);CHECKGLERROR + } } - if (unit->alphascale != alphascale) + else { - GL_ActiveTexture(unitnum); - qglTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, (unit->alphascale = alphascale));CHECKGLERROR + if (unit->combine != combinergb) + { + unit->combine = combinergb; + GL_ActiveTexture(unitnum); + qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, unit->combine);CHECKGLERROR + } } - } - else - { + break; + case RENDERPATH_GL11: // normal GL texenv if (!combinergb) combinergb = GL_MODULATE; - if (unit->combinergb != combinergb) + if (unit->combine != combinergb) { - unit->combinergb = combinergb; + unit->combine = combinergb; GL_ActiveTexture(unitnum); - qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, unit->combinergb);CHECKGLERROR + qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, unit->combine);CHECKGLERROR } + break; } } -void R_Mesh_TextureState(const rmeshstate_t *m) -{ - unsigned int i; - - BACKENDACTIVECHECK - - CHECKGLERROR - if (gl_backend_rebindtextures) - { - gl_backend_rebindtextures = false; - GL_SetupTextureState(); - CHECKGLERROR - } - - for (i = 0;i < backendimageunits;i++) - R_Mesh_TexBindAll(i, m->tex1d[i], m->tex[i], m->tex3d[i], m->texcubemap[i], m->texrectangle[i]); - for (i = 0;i < backendarrayunits;i++) - { - if (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], m->pointer_texcoord_bufferobject[i], m->pointer_texcoord_bufferoffset[i]); - } - for (i = 0;i < backendunits;i++) - { - R_Mesh_TexMatrix(i, &m->texmatrix[i]); - R_Mesh_TexCombine(i, m->texcombinergb[i], m->texcombinealpha[i], m->texrgbscale[i], m->texalphascale[i]); - } - CHECKGLERROR -} - void R_Mesh_ResetTextureState(void) { unsigned int unitnum; @@ -2334,132 +1872,119 @@ void R_Mesh_ResetTextureState(void) BACKENDACTIVECHECK CHECKGLERROR - if (gl_backend_rebindtextures) - { - gl_backend_rebindtextures = false; - GL_SetupTextureState(); - CHECKGLERROR - } - - for (unitnum = 0;unitnum < backendimageunits;unitnum++) + switch(vid.renderpath) { - gltextureunit_t *unit = gl_state.units + unitnum; - // update 1d texture binding - if (unit->t1d) + case RENDERPATH_GL20: + case RENDERPATH_CGGL: + for (unitnum = 0;unitnum < vid.teximageunits;unitnum++) { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) + gltextureunit_t *unit = gl_state.units + unitnum; + if (unit->t2d) { - qglDisable(GL_TEXTURE_1D);CHECKGLERROR + unit->t2d = 0; + GL_ActiveTexture(unitnum); + qglBindTexture(GL_TEXTURE_2D, unit->t2d);CHECKGLERROR } - unit->t1d = 0; - qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR - } - // update 2d texture binding - if (unit->t2d) - { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) + if (unit->t3d) { - qglDisable(GL_TEXTURE_2D);CHECKGLERROR + unit->t3d = 0; + GL_ActiveTexture(unitnum); + qglBindTexture(GL_TEXTURE_3D, unit->t3d);CHECKGLERROR } - unit->t2d = 0; - qglBindTexture(GL_TEXTURE_2D, unit->t2d);CHECKGLERROR - } - // update 3d texture binding - if (unit->t3d) - { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) + if (unit->tcubemap) { - qglDisable(GL_TEXTURE_3D);CHECKGLERROR + unit->tcubemap = 0; + GL_ActiveTexture(unitnum); + qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR } - unit->t3d = 0; - qglBindTexture(GL_TEXTURE_3D, unit->t3d);CHECKGLERROR - } - // update cubemap texture binding - if (unit->tcubemap) - { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) + if (unit->trectangle) { - qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR + unit->trectangle = 0; + GL_ActiveTexture(unitnum); + qglBindTexture(GL_TEXTURE_RECTANGLE_ARB, unit->trectangle);CHECKGLERROR } - unit->tcubemap = 0; - qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR } - // update rectangle texture binding - if (unit->trectangle) + for (unitnum = 0;unitnum < vid.texarrayunits;unitnum++) { - GL_ActiveTexture(unitnum); - if (unitnum < backendunits) + gltextureunit_t *unit = gl_state.units + unitnum; + if (unit->arrayenabled) { - qglDisable(GL_TEXTURE_RECTANGLE_ARB);CHECKGLERROR + unit->arrayenabled = false; + GL_ClientActiveTexture(unitnum); + qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR } - unit->trectangle = 0; - qglBindTexture(GL_TEXTURE_RECTANGLE_ARB, unit->trectangle);CHECKGLERROR - } - } - for (unitnum = 0;unitnum < backendarrayunits;unitnum++) - { - gltextureunit_t *unit = gl_state.units + unitnum; - // texture array unit is disabled, disable the array - if (unit->arrayenabled) - { - unit->arrayenabled = false; - GL_ClientActiveTexture(unitnum); - qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR } - } - for (unitnum = 0;unitnum < backendunits;unitnum++) - { - gltextureunit_t *unit = gl_state.units + unitnum; - // no texmatrix specified, revert to identity - if (unit->texmatrixenabled) + for (unitnum = 0;unitnum < vid.texunits;unitnum++) { - unit->texmatrixenabled = false; - unit->matrix = identitymatrix; - CHECKGLERROR - GL_ActiveTexture(unitnum); - qglMatrixMode(GL_TEXTURE);CHECKGLERROR - qglLoadIdentity();CHECKGLERROR - qglMatrixMode(GL_MODELVIEW);CHECKGLERROR + gltextureunit_t *unit = gl_state.units + unitnum; + if (unit->texmatrixenabled) + { + unit->texmatrixenabled = false; + unit->matrix = identitymatrix; + CHECKGLERROR + GL_ActiveTexture(unitnum); + qglMatrixMode(GL_TEXTURE);CHECKGLERROR + qglLoadIdentity();CHECKGLERROR + qglMatrixMode(GL_MODELVIEW);CHECKGLERROR + } } - if (gl_combine.integer) + break; + case RENDERPATH_GL13: + case RENDERPATH_GL11: + for (unitnum = 0;unitnum < vid.texunits;unitnum++) { - // GL_ARB_texture_env_combine - if (unit->combinergb != GL_MODULATE) + gltextureunit_t *unit = gl_state.units + unitnum; + if (unit->t2d) { - unit->combinergb = GL_MODULATE; + unit->t2d = 0; GL_ActiveTexture(unitnum); - qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, unit->combinergb);CHECKGLERROR + qglDisable(GL_TEXTURE_2D);CHECKGLERROR + qglBindTexture(GL_TEXTURE_2D, unit->t2d);CHECKGLERROR } - if (unit->combinealpha != GL_MODULATE) + if (unit->t3d) { - unit->combinealpha = GL_MODULATE; + unit->t3d = 0; GL_ActiveTexture(unitnum); - qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, unit->combinealpha);CHECKGLERROR + qglDisable(GL_TEXTURE_3D);CHECKGLERROR + qglBindTexture(GL_TEXTURE_3D, unit->t3d);CHECKGLERROR } - if (unit->rgbscale != 1) + if (unit->tcubemap) { + unit->tcubemap = 0; GL_ActiveTexture(unitnum); - qglTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, (unit->rgbscale = 1));CHECKGLERROR + qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR + qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR } - if (unit->alphascale != 1) + if (unit->trectangle) { + unit->trectangle = 0; GL_ActiveTexture(unitnum); - qglTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, (unit->alphascale = 1));CHECKGLERROR + qglDisable(GL_TEXTURE_RECTANGLE_ARB);CHECKGLERROR + qglBindTexture(GL_TEXTURE_RECTANGLE_ARB, unit->trectangle);CHECKGLERROR } - } - else - { - // normal GL texenv - if (unit->combinergb != GL_MODULATE) + if (unit->arrayenabled) { - unit->combinergb = GL_MODULATE; + unit->arrayenabled = false; + GL_ClientActiveTexture(unitnum); + qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR + } + if (unit->texmatrixenabled) + { + unit->texmatrixenabled = false; + unit->matrix = identitymatrix; + CHECKGLERROR GL_ActiveTexture(unitnum); - qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, unit->combinergb);CHECKGLERROR + qglMatrixMode(GL_TEXTURE);CHECKGLERROR + qglLoadIdentity();CHECKGLERROR + qglMatrixMode(GL_MODELVIEW);CHECKGLERROR + } + if (unit->combine != GL_MODULATE) + { + unit->combine = GL_MODULATE; + GL_ActiveTexture(unitnum); + qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, unit->combine);CHECKGLERROR } } + break; } }