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)"};
}
#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);
+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;
+ qboolean active;
+}
+gl_state_t;
+
+static gl_state_t gl_state;
+
+static memexpandablearray_t gl_bufferobjectinfoarray;
+
static r_viewport_t backend_viewport;
static matrix4x4_t backend_modelmatrix;
static matrix4x4_t backend_modelviewmatrix;
-static unsigned int backendunits, backendimageunits, backendarrayunits, backendactive;
-
/*
note: here's strip order for a terrain row:
0--1--2--3--4
}
*/
-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)
{
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)
+ if (vid.support.arb_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);
+ Con_DPrintf("GLSL shader support detected: texture units = %i texenv, %i image, %i array\n", vid.texunits, vid.teximageunits, vid.texarrayunits);
+ vid.teximageunits = bound(1, vid.teximageunits, MAX_TEXTUREUNITS);
+ vid.texarrayunits = bound(1, vid.texarrayunits, MAX_TEXTUREUNITS);
}
else
- Con_DPrintf("GL_MAX_TEXTUREUNITS = %i\n", backendunits);
-
- GL_Backend_AllocArrays();
+ Con_DPrintf("GL_MAX_TEXTUREUNITS = %i\n", vid.texunits);
Mem_ExpandableArray_NewArray(&gl_bufferobjectinfoarray, r_main_mempool, sizeof(gl_bufferobjectinfo_t), 128);
CHECKGLERROR
- backendactive = true;
+ gl_state.active = true;
+ GL_Backend_ResetState();
}
static void gl_backend_shutdown(void)
{
- backendunits = 0;
- backendimageunits = 0;
- backendarrayunits = 0;
- backendactive = false;
+ gl_state.active = false;
Con_DPrint("OpenGL Backend shutting down\n");
Mem_ExpandableArray_FreeArray(&gl_bufferobjectinfoarray);
- GL_Backend_FreeArrays();
+ memset(&gl_state, 0, sizeof(gl_state));
}
static void gl_backend_newmap(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);
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);
{
matrix4x4_t tempmatrix, basematrix;
memset(v, 0, sizeof(*v));
+
+ if(v_flipped.integer)
+ frustumx = -frustumx;
+
v->type = R_VIEWPORTTYPE_PERSPECTIVE;
v->cameramatrix = *cameramatrix;
v->x = x;
Matrix4x4_ConcatRotate(&basematrix, 90, 0, 0, 1);
Matrix4x4_Concat(&v->viewmatrix, &basematrix, &tempmatrix);
- //FIXME v_flipped_state is evil, this probably screws things up somewhere
- if(v_flipped_state)
- {
- Matrix4x4_Transpose(&basematrix, &v->viewmatrix);
- Matrix4x4_ConcatScale3(&basematrix, -1, 1, 1);
- Matrix4x4_Transpose(&v->viewmatrix, &basematrix);
- }
-
Matrix4x4_FromArrayDoubleGL(&v->projectmatrix, v->m);
if (nearplane)
matrix4x4_t tempmatrix, basematrix;
const double nudge = 1.0 - 1.0 / (1<<23);
memset(v, 0, sizeof(*v));
+
+ if(v_flipped.integer)
+ frustumx = -frustumx;
+
v->type = R_VIEWPORTTYPE_PERSPECTIVE_INFINITEFARCLIP;
v->cameramatrix = *cameramatrix;
v->x = x;
Matrix4x4_ConcatRotate(&basematrix, 90, 0, 0, 1);
Matrix4x4_Concat(&v->viewmatrix, &basematrix, &tempmatrix);
- //FIXME v_flipped_state is evil, this probably screws things up somewhere
- if(v_flipped_state)
- {
- Matrix4x4_Transpose(&basematrix, &v->viewmatrix);
- Matrix4x4_ConcatScale3(&basematrix, -1, 1, 1);
- Matrix4x4_Transpose(&v->viewmatrix, &basematrix);
- }
-
Matrix4x4_FromArrayDoubleGL(&v->projectmatrix, v->m);
if (nearplane)
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)
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;
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);
qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
// FIXME: v_flipped_state is evil, this probably breaks somewhere
- GL_SetMirrorState(v_flipped.integer && v->type != R_VIEWPORTTYPE_ORTHO);
+ 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);
*v = backend_viewport;
}
-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;
-}
-gltextureunit_t;
-
-static 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;
-}
-gl_state;
-
static void GL_BindVBO(int bufferobject)
{
if (gl_state.vertexbufferobject != 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;
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);
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)
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;
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)
CHECKGLERROR
}
-int gl_backend_rebindtextures;
-
void GL_Backend_RenumberElements(int *out, int count, const int *in, int offset)
{
int i;
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)
{
}
CHECKGLERROR
}
- if (r_render.integer)
+ if (r_render.integer || r_refdef.draw2dstage)
{
CHECKGLERROR
if (gl_mesh_testmanualfeeding.integer)
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)
{
// 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)
{
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)
{
// 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)
// 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)
}
}
-void R_Mesh_TexBindAll(unsigned int unitnum, int tex1d, int tex2d, int tex3d, int texcubemap, int texrectangle)
+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)
{
if (unit->t3d != tex3d)
{
GL_ActiveTexture(unitnum);
- if (unitnum < backendunits)
+ if (unitnum < vid.texunits)
{
if (tex3d)
{
if (unit->tcubemap != texcubemap)
{
GL_ActiveTexture(unitnum);
- if (unitnum < backendunits)
+ if (unitnum < vid.texunits)
{
if (texcubemap)
{
if (unit->trectangle != texrectangle)
{
GL_ActiveTexture(unitnum);
- if (unitnum < backendunits)
+ if (unitnum < vid.texunits)
{
if (texrectangle)
{
}
}
-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)
{
if (unit->t3d)
{
GL_ActiveTexture(unitnum);
- if (unitnum < backendunits)
+ if (unitnum < vid.texunits)
{
if (unit->t3d)
{
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_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 (unitnum < vid.texunits)
{
if (unit->tcubemap)
{
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 (unitnum < vid.texunits)
{
if (unit->trectangle)
{
}
}
-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)
{
// 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
}
}
{
gltextureunit_t *unit = gl_state.units + unitnum;
CHECKGLERROR
- if (gl_combine.integer)
- {
- // GL_ARB_texture_env_combine
- if (!combinergb)
- combinergb = GL_MODULATE;
- if (!combinealpha)
- combinealpha = GL_MODULATE;
- if (!rgbscale)
- rgbscale = 1;
- if (!alphascale)
- alphascale = 1;
+ if (!combinergb)
+ combinergb = GL_MODULATE;
+ if (!combinealpha)
+ combinealpha = GL_MODULATE;
+ if (!rgbscale)
+ rgbscale = 1;
+ if (!alphascale)
+ alphascale = 1;
+ if (combinergb != combinealpha || rgbscale != 1 || alphascale != 1 || combinergb == GL_DOT3_RGBA_ARB || combinergb == GL_DOT3_RGB_ARB)
+ {
+ 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;
}
if (unit->rgbscale != rgbscale)
{
+ unit->rgbscale = rgbscale;
GL_ActiveTexture(unitnum);
- qglTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, (unit->rgbscale = rgbscale));CHECKGLERROR
+ 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 = alphascale));CHECKGLERROR
+ qglTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, unit->alphascale);CHECKGLERROR
}
}
else
{
- // 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
}
}
}
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++)
+ for (i = 0;i < vid.teximageunits;i++)
+ R_Mesh_TexBindAll(i, m->tex[i], m->tex3d[i], m->texcubemap[i], m->texrectangle[i]);
+ for (i = 0;i < vid.texarrayunits;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++)
+ for (i = 0;i < vid.texunits;i++)
{
R_Mesh_TexMatrix(i, &m->texmatrix[i]);
R_Mesh_TexCombine(i, m->texcombinergb[i], m->texcombinealpha[i], m->texrgbscale[i], m->texalphascale[i]);
BACKENDACTIVECHECK
CHECKGLERROR
- if (gl_backend_rebindtextures)
- {
- gl_backend_rebindtextures = false;
- GL_SetupTextureState();
- CHECKGLERROR
- }
-
- for (unitnum = 0;unitnum < backendimageunits;unitnum++)
+ for (unitnum = 0;unitnum < vid.teximageunits;unitnum++)
{
gltextureunit_t *unit = gl_state.units + unitnum;
- // update 1d texture binding
- if (unit->t1d)
- {
- GL_ActiveTexture(unitnum);
- if (unitnum < backendunits)
- {
- 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 (unitnum < vid.texunits)
{
qglDisable(GL_TEXTURE_2D);CHECKGLERROR
}
if (unit->t3d)
{
GL_ActiveTexture(unitnum);
- if (unitnum < backendunits)
+ if (unitnum < vid.texunits)
{
qglDisable(GL_TEXTURE_3D);CHECKGLERROR
}
if (unit->tcubemap)
{
GL_ActiveTexture(unitnum);
- if (unitnum < backendunits)
+ if (unitnum < vid.texunits)
{
qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR
}
if (unit->trectangle)
{
GL_ActiveTexture(unitnum);
- if (unitnum < backendunits)
+ if (unitnum < vid.texunits)
{
qglDisable(GL_TEXTURE_RECTANGLE_ARB);CHECKGLERROR
}
qglBindTexture(GL_TEXTURE_RECTANGLE_ARB, unit->trectangle);CHECKGLERROR
}
}
- for (unitnum = 0;unitnum < backendarrayunits;unitnum++)
+ for (unitnum = 0;unitnum < vid.texarrayunits;unitnum++)
{
gltextureunit_t *unit = gl_state.units + unitnum;
// texture array unit is disabled, disable the array
qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
}
}
- for (unitnum = 0;unitnum < backendunits;unitnum++)
+ for (unitnum = 0;unitnum < vid.texunits;unitnum++)
{
gltextureunit_t *unit = gl_state.units + unitnum;
// no texmatrix specified, revert to identity