#include "jpeg.h"
#include "cl_collision.h"
-cvar_t gl_mesh_drawrangeelements = {0, "gl_mesh_drawrangeelements", "1"};
-cvar_t gl_mesh_testarrayelement = {0, "gl_mesh_testarrayelement", "0"};
-cvar_t gl_mesh_testmanualfeeding = {0, "gl_mesh_testmanualfeeding", "0"};
-cvar_t gl_paranoid = {0, "gl_paranoid", "0"};
-cvar_t gl_printcheckerror = {0, "gl_printcheckerror", "0"};
-cvar_t r_stereo_separation = {0, "r_stereo_separation", "4"};
-cvar_t r_stereo_sidebyside = {0, "r_stereo_sidebyside", "0"};
-cvar_t r_stereo_redblue = {0, "r_stereo_redblue", "0"};
-cvar_t r_stereo_redcyan = {0, "r_stereo_redcyan", "0"};
-cvar_t r_stereo_redgreen = {0, "r_stereo_redgreen", "0"};
-
-cvar_t r_render = {0, "r_render", "1"};
-cvar_t r_waterwarp = {CVAR_SAVE, "r_waterwarp", "1"};
-cvar_t gl_polyblend = {CVAR_SAVE, "gl_polyblend", "1"};
-cvar_t gl_dither = {CVAR_SAVE, "gl_dither", "1"}; // whether or not to use dithering
-cvar_t gl_lockarrays = {0, "gl_lockarrays", "1"};
+cvar_t gl_mesh_drawrangeelements = {0, "gl_mesh_drawrangeelements", "1", "use glDrawRangeElements function if available instead of glDrawElements (for performance comparisons or bug testing)"};
+cvar_t gl_mesh_testarrayelement = {0, "gl_mesh_testarrayelement", "0", "use glBegin(GL_TRIANGLES);glArrayElement();glEnd(); primitives instead of glDrawElements (useful to test for driver bugs with glDrawElements)"};
+cvar_t gl_mesh_testmanualfeeding = {0, "gl_mesh_testmanualfeeding", "0", "use glBegin(GL_TRIANGLES);glTexCoord2f();glVertex3f();glEnd(); primitives instead of glDrawElements (useful to test for driver bugs with glDrawElements)"};
+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_stereo_separation = {0, "r_stereo_separation", "4", "separation of eyes in the world (try negative values too)"};
+cvar_t r_stereo_sidebyside = {0, "r_stereo_sidebyside", "0", "side by side views (for those who can't afford glasses but can afford eye strain)"};
+cvar_t r_stereo_redblue = {0, "r_stereo_redblue", "0", "red/blue anaglyph stereo glasses (note: most of these glasses are actually red/cyan, try that one too)"};
+cvar_t r_stereo_redcyan = {0, "r_stereo_redcyan", "0", "red/cyan anaglyph stereo glasses, the kind given away at drive-in movies like Creature From The Black Lagoon In 3D"};
+cvar_t r_stereo_redgreen = {0, "r_stereo_redgreen", "0", "red/green anaglyph stereo glasses (for those who don't mind yellow)"};
+
+cvar_t r_render = {0, "r_render", "1", "enables rendering calls (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)"};
+cvar_t gl_lockarrays = {0, "gl_lockarrays", "1", "enables use of glLockArraysEXT, may cause glitches with some broken drivers"};
int gl_maxdrawrangeelementsvertices;
int gl_maxdrawrangeelementsindices;
}
#endif
-#define BACKENDACTIVECHECK if (!backendactive) Sys_Error("GL backend function called when backend is not active\n");
+#define BACKENDACTIVECHECK if (!backendactive) Sys_Error("GL backend function called when backend is not active");
void SCR_ScreenShot_f (void);
static matrix4x4_t backend_glmodelviewmatrix;
static matrix4x4_t backend_projectmatrix;
-static int backendunits, backendimageunits, backendarrayunits, backendactive;
-static mempool_t *gl_backend_mempool;
+static unsigned int backendunits, backendimageunits, backendarrayunits, backendactive;
/*
note: here's strip order for a terrain row:
static void R_Mesh_CacheArray_Shutdown(void);
void GL_Backend_AllocArrays(void)
{
- if (!gl_backend_mempool)
- gl_backend_mempool = Mem_AllocPool("GL_Backend", 0, NULL);
R_Mesh_CacheArray_Startup();
}
void GL_Backend_FreeArrays(void)
{
R_Mesh_CacheArray_Shutdown();
- Mem_FreePool(&gl_backend_mempool);
}
static void gl_backend_start(void)
if (gl_support_fragment_shader)
{
CHECKGLERROR
- qglGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &backendimageunits);
+ qglGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, (int *)&backendimageunits);
CHECKGLERROR
- qglGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, &backendarrayunits);
+ qglGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, (int *)&backendarrayunits);
CHECKGLERROR
Con_Printf("GLSL shader support detected: texture units = %i texenv, %i image, %i array\n", backendunits, backendimageunits, backendarrayunits);
}
{
}
-cvar_t scr_zoomwindow = {CVAR_SAVE, "scr_zoomwindow", "0"};
-cvar_t scr_zoomwindow_viewsizex = {CVAR_SAVE, "scr_zoomwindow_viewsizex", "20"};
-cvar_t scr_zoomwindow_viewsizey = {CVAR_SAVE, "scr_zoomwindow_viewsizey", "20"};
-cvar_t scr_zoomwindow_fov = {CVAR_SAVE, "scr_zoomwindow_fov", "20"};
+cvar_t scr_zoomwindow = {CVAR_SAVE, "scr_zoomwindow", "0", "displays a zoomed in overlay window"};
+cvar_t scr_zoomwindow_viewsizex = {CVAR_SAVE, "scr_zoomwindow_viewsizex", "20", "horizontal viewsize of zoom window"};
+cvar_t scr_zoomwindow_viewsizey = {CVAR_SAVE, "scr_zoomwindow_viewsizey", "20", "vertical viewsize of zoom window"};
+cvar_t scr_zoomwindow_fov = {CVAR_SAVE, "scr_zoomwindow_fov", "20", "fov of zoom window"};
void gl_backend_init(void)
{
void GL_SetupView_Orientation_Identity (void)
{
- Matrix4x4_CreateIdentity(&backend_viewmatrix);
+ backend_viewmatrix = identitymatrix;
memset(&backend_modelmatrix, 0, sizeof(backend_modelmatrix));
}
memset(&backend_modelmatrix, 0, sizeof(backend_modelmatrix));
}
-void GL_SetupView_Mode_Perspective (double fovx, double fovy, double zNear, double zFar)
+void GL_SetupView_Mode_Perspective (double frustumx, double frustumy, double zNear, double zFar)
{
- double xmax, ymax;
double m[16];
if (!r_render.integer)
// set up viewpoint
qglMatrixMode(GL_PROJECTION);CHECKGLERROR
qglLoadIdentity();CHECKGLERROR
- // pyramid slopes
- xmax = zNear * tan(fovx * M_PI / 360.0);
- ymax = zNear * tan(fovy * M_PI / 360.0);
// set view pyramid
- qglFrustum(-xmax, xmax, -ymax, ymax, zNear, zFar);CHECKGLERROR
+ qglFrustum(-frustumx * zNear, frustumx * zNear, -frustumy * zNear, frustumy * zNear, zNear, zFar);CHECKGLERROR
qglGetDoublev(GL_PROJECTION_MATRIX, m);
backend_projectmatrix.m[0][0] = m[0];
backend_projectmatrix.m[1][0] = m[1];
GL_SetupView_Orientation_Identity();
}
-void GL_SetupView_Mode_PerspectiveInfiniteFarClip (double fovx, double fovy, double zNear)
+void GL_SetupView_Mode_PerspectiveInfiniteFarClip (double frustumx, double frustumy, double zNear)
{
double nudge, m[16];
qglLoadIdentity();CHECKGLERROR
// set view pyramid
nudge = 1.0 - 1.0 / (1<<23);
- m[ 0] = 1.0 / tan(fovx * M_PI / 360.0);
+ m[ 0] = 1.0 / frustumx;
m[ 1] = 0;
m[ 2] = 0;
m[ 3] = 0;
m[ 4] = 0;
- m[ 5] = 1.0 / tan(fovy * M_PI / 360.0);
+ m[ 5] = 1.0 / frustumy;
m[ 6] = 0;
m[ 7] = 0;
m[ 8] = 0;
}
gltextureunit_t;
-static struct
+static struct gl_state_s
{
int blendfunc1;
int blendfunc2;
void GL_SetupTextureState(void)
{
- int i;
+ unsigned int i;
gltextureunit_t *unit;
CHECKGLERROR
- gl_state.unit = -1;
- gl_state.clientunit = -1;
+ gl_state.unit = MAX_TEXTUREUNITS;
+ gl_state.clientunit = MAX_TEXTUREUNITS;
for (i = 0;i < MAX_TEXTUREUNITS;i++)
{
unit = gl_state.units + i;
unit->combinergb = GL_MODULATE;
unit->combinealpha = GL_MODULATE;
unit->texmatrixenabled = false;
- unit->matrix = r_identitymatrix;
+ unit->matrix = identitymatrix;
}
for (i = 0;i < backendimageunits;i++)
GL_SetupTextureState();
}
-void GL_ActiveTexture(int num)
+void GL_ActiveTexture(unsigned int num)
{
if (gl_state.unit != num)
{
}
}
-void GL_ClientActiveTexture(int num)
+void GL_ClientActiveTexture(unsigned int num)
{
if (gl_state.clientunit != num)
{
{
if (gl_state.depthtest != state)
{
- if (r_showtrispass)
+ if (r_showtrispass && r_showdisabledepthtest.integer)
return;
gl_state.depthtest = state;
if (gl_state.depthtest)
int state = r*8 + g*4 + b*2 + a*1;
if (gl_state.colormask != state)
{
- if (r_showtrispass)
- return;
gl_state.colormask = state;
qglColorMask((GLboolean)r, (GLboolean)g, (GLboolean)b, (GLboolean)a);CHECKGLERROR
}
{
if (!r_showtrispass)
return;
- r_showtrispass = false;
+ r_showtrispass = 0;
GL_Color(cr * r_showtris.value, cg * r_showtris.value, cb * r_showtris.value, ca);
- r_showtrispass = true;
+ r_showtrispass = 1;
}
void GL_Scissor (int x, int y, int width, int height)
{
CHECKGLERROR
- qglScissor(x, vid.realheight - (y + height),width,height);
+ qglScissor(x, vid.height - (y + height),width,height);
CHECKGLERROR
}
void GL_Clear(int mask)
{
+ // in showtris rendering, don't clear the color buffer as that would hide
+ // the accumulated lines
if (r_showtrispass)
- return;
+ mask &= ~GL_COLOR_BUFFER_BIT;
qglClear(mask);CHECKGLERROR
}
{
GLint vertexshadercompiled, fragmentshadercompiled, programlinked;
GLuint vertexshaderobject, fragmentshaderobject, programobject = 0;
- char compilelog[4096];
+ char compilelog[MAX_INPUTLINE];
CHECKGLERROR
programobject = qglCreateProgramObjectARB();
qglGetObjectParameterivARB(vertexshaderobject, GL_OBJECT_COMPILE_STATUS_ARB, &vertexshadercompiled);
qglGetInfoLogARB(vertexshaderobject, sizeof(compilelog), NULL, compilelog);
if (compilelog[0])
- Con_Printf("vertex shader compile log:\n%s\n", compilelog);
+ Con_DPrintf("vertex shader compile log:\n%s\n", compilelog);
if (!vertexshadercompiled)
{
qglDeleteObjectARB(programobject);
qglGetObjectParameterivARB(fragmentshaderobject, GL_OBJECT_COMPILE_STATUS_ARB, &fragmentshadercompiled);
qglGetInfoLogARB(fragmentshaderobject, sizeof(compilelog), NULL, compilelog);
if (compilelog[0])
- Con_Printf("fragment shader compile log:\n%s\n", compilelog);
+ Con_DPrintf("fragment shader compile log:\n%s\n", compilelog);
if (!fragmentshadercompiled)
{
qglDeleteObjectARB(programobject);
qglGetInfoLogARB(programobject, sizeof(compilelog), NULL, compilelog);
if (compilelog[0])
{
- Con_Printf("program link log:\n%s\n", compilelog);
+ Con_DPrintf("program link log:\n%s\n", compilelog);
// 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
// renders triangles using vertices from the active arrays
int paranoidblah = 0;
-void R_Mesh_Draw(int numverts, int numtriangles, const int *elements)
+void R_Mesh_Draw(int firstvertex, int numvertices, int numtriangles, const int *elements)
{
- int numelements = numtriangles * 3;
- if (numverts == 0 || numtriangles == 0)
+ unsigned int numelements = numtriangles * 3;
+ if (numvertices < 3 || numtriangles < 1)
{
- Con_Printf("R_Mesh_Draw(%d, %d, %08p);\n", numverts, numtriangles, elements);
+ Con_Printf("R_Mesh_Draw(%d, %d, %d, %08p);\n", firstvertex, numvertices, numtriangles, elements);
return;
}
- CHECKGLERROR
+ //CHECKGLERROR
if (r_showtrispass)
{
- R_Mesh_Draw_ShowTris(numverts, numtriangles, elements);
+ R_Mesh_Draw_ShowTris(firstvertex, numvertices, numtriangles, elements);
return;
}
- c_meshs++;
- c_meshelements += numelements;
+ renderstats.meshes++;
+ renderstats.meshes_elements += numelements;
if (gl_paranoid.integer)
{
- int i, j, size;
+ unsigned int i, j, size;
const int *p;
if (!qglIsEnabled(GL_VERTEX_ARRAY))
Con_Print("R_Mesh_Draw: vertex array not enabled\n");
- for (j = 0, size = numverts * (int)sizeof(float[3]), p = gl_state.pointer_vertex;j < size;j += sizeof(int), p++)
+ 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 (!qglIsEnabled(GL_COLOR_ARRAY))
Con_Print("R_Mesh_Draw: color array set but not enabled\n");
- for (j = 0, size = numverts * (int)sizeof(float[4]), p = gl_state.pointer_color;j < size;j += sizeof(int), p++)
+ 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++)
GL_ClientActiveTexture(i);
if (!qglIsEnabled(GL_TEXTURE_COORD_ARRAY))
Con_Print("R_Mesh_Draw: texcoord array set but not enabled\n");
- for (j = 0, size = numverts * ((gl_state.units[i].t3d || gl_state.units[i].tcubemap) ? (int)sizeof(float[3]) : (int)sizeof(float[2])), p = gl_state.units[i].pointer_texcoord;j < size;j += sizeof(int), p++)
+ 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 < numtriangles * 3;i++)
+ for (i = 0;i < (unsigned int) numtriangles * 3;i++)
{
- if (elements[i] < 0 || elements[i] >= numverts)
+ if (elements[i] < firstvertex || elements[i] >= firstvertex + numvertices)
{
- Con_Printf("R_Mesh_Draw: invalid vertex index %i (outside range 0 - %i) in elements list\n", elements[i], numverts);
+ Con_Printf("R_Mesh_Draw: invalid vertex index %i (outside range %i - %i) in elements list\n", elements[i], firstvertex, firstvertex + numvertices);
return;
}
}
CHECKGLERROR
if (gl_mesh_testmanualfeeding.integer)
{
- int i, j;
+ unsigned int i, j;
const GLfloat *p;
qglBegin(GL_TRIANGLES);
- for (i = 0;i < numtriangles * 3;i++)
+ for (i = 0;i < (unsigned int) numtriangles * 3;i++)
{
for (j = 0;j < backendarrayunits;j++)
{
}
else if (gl_mesh_drawrangeelements.integer && qglDrawRangeElements != NULL)
{
- qglDrawRangeElements(GL_TRIANGLES, 0, numverts, numelements, GL_UNSIGNED_INT, elements);CHECKGLERROR
+ qglDrawRangeElements(GL_TRIANGLES, firstvertex, firstvertex + numvertices, numelements, GL_UNSIGNED_INT, elements);
+ CHECKGLERROR
}
else
{
- qglDrawElements(GL_TRIANGLES, numelements, GL_UNSIGNED_INT, elements);CHECKGLERROR
+ qglDrawElements(GL_TRIANGLES, numelements, GL_UNSIGNED_INT, elements);
+ CHECKGLERROR
}
- CHECKGLERROR
}
}
// restores backend state, used when done with 3D rendering
void R_Mesh_Finish(void)
{
- int i;
+ unsigned int i;
BACKENDACTIVECHECK
CHECKGLERROR
GL_LockArrays(0, 0);
qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, 0);CHECKGLERROR
}
}
- for (i = backendarrayunits - 1;i >= 0;i--)
+ for (i = 0;i < backendarrayunits;i++)
{
- GL_ActiveTexture(i);
+ GL_ActiveTexture(backendarrayunits - 1 - i);
qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
}
- for (i = backendunits - 1;i >= 0;i--)
+ for (i = 0;i < backendunits;i++)
{
- GL_ActiveTexture(i);
+ GL_ActiveTexture(backendunits - 1 - i);
qglDisable(GL_TEXTURE_1D);CHECKGLERROR
qglDisable(GL_TEXTURE_2D);CHECKGLERROR
if (gl_texture3d)
void R_Mesh_ColorPointer(const float *color4f)
{
+ if (r_showtrispass)
+ return;
if (gl_state.pointer_color != color4f)
{
CHECKGLERROR
void R_Mesh_TexCoordPointer(unsigned int unitnum, unsigned int numcomponents, const float *texcoord)
{
gltextureunit_t *unit = gl_state.units + unitnum;
+ if (r_showtrispass)
+ return;
// update array settings
if (texcoord)
{
}
}
-void R_Mesh_TexBindAll(unsigned int unitnum, unsigned int tex1d, unsigned int tex2d, unsigned int tex3d, unsigned int texcubemap)
+void R_Mesh_TexBindAll(unsigned int unitnum, int tex1d, int tex2d, int tex3d, int texcubemap)
{
gltextureunit_t *unit = gl_state.units + unitnum;
- if (unitnum >= backendunits)
+ if (unitnum >= backendimageunits)
+ return;
+ if (r_showtrispass)
return;
// update 1d texture binding
if (unit->t1d != tex1d)
}
}
-void R_Mesh_TexBind1D(unsigned int unitnum, unsigned int texnum)
+void R_Mesh_TexBind1D(unsigned int unitnum, int texnum)
{
gltextureunit_t *unit = gl_state.units + unitnum;
- if (unitnum >= backendunits)
+ if (unitnum >= backendimageunits)
+ return;
+ if (r_showtrispass)
return;
// update 1d texture binding
if (unit->t1d != texnum)
{
GL_ActiveTexture(unitnum);
- if (texnum)
- {
- if (unit->t1d == 0)
- qglEnable(GL_TEXTURE_1D);
- }
- else
+ if (unitnum < backendunits)
{
- if (unit->t1d)
- qglDisable(GL_TEXTURE_1D);
+ if (texnum)
+ {
+ if (unit->t1d == 0)
+ qglEnable(GL_TEXTURE_1D);
+ }
+ else
+ {
+ if (unit->t1d)
+ qglDisable(GL_TEXTURE_1D);
+ }
}
unit->t1d = texnum;
qglBindTexture(GL_TEXTURE_1D, unit->t1d);
if (unit->t2d)
{
GL_ActiveTexture(unitnum);
- if (unit->t2d)
- qglDisable(GL_TEXTURE_2D);
+ if (unitnum < backendunits)
+ {
+ if (unit->t2d)
+ qglDisable(GL_TEXTURE_2D);
+ }
unit->t2d = 0;
qglBindTexture(GL_TEXTURE_2D, unit->t2d);
CHECKGLERROR
if (unit->t3d)
{
GL_ActiveTexture(unitnum);
- if (unit->t3d)
- qglDisable(GL_TEXTURE_3D);
+ if (unitnum < backendunits)
+ {
+ if (unit->t3d)
+ qglDisable(GL_TEXTURE_3D);
+ }
unit->t3d = 0;
qglBindTexture(GL_TEXTURE_3D, unit->t3d);
CHECKGLERROR
if (unit->tcubemap)
{
GL_ActiveTexture(unitnum);
- if (unit->tcubemap)
- qglDisable(GL_TEXTURE_CUBE_MAP_ARB);
+ if (unitnum < backendunits)
+ {
+ if (unit->tcubemap)
+ qglDisable(GL_TEXTURE_CUBE_MAP_ARB);
+ }
unit->tcubemap = 0;
qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);
CHECKGLERROR
}
}
-void R_Mesh_TexBind(unsigned int unitnum, unsigned int texnum)
+void R_Mesh_TexBind(unsigned int unitnum, int texnum)
{
gltextureunit_t *unit = gl_state.units + unitnum;
- if (unitnum >= backendunits)
+ if (unitnum >= backendimageunits)
+ return;
+ if (r_showtrispass)
return;
// update 1d texture binding
if (unit->t1d)
{
GL_ActiveTexture(unitnum);
- if (unit->t1d)
- qglDisable(GL_TEXTURE_1D);
+ if (unitnum < backendunits)
+ {
+ if (unit->t1d)
+ qglDisable(GL_TEXTURE_1D);
+ }
unit->t1d = 0;
qglBindTexture(GL_TEXTURE_1D, unit->t1d);
CHECKGLERROR
if (unit->t2d != texnum)
{
GL_ActiveTexture(unitnum);
- if (texnum)
- {
- if (unit->t2d == 0)
- qglEnable(GL_TEXTURE_2D);
- }
- else
+ if (unitnum < backendunits)
{
- if (unit->t2d)
- qglDisable(GL_TEXTURE_2D);
+ if (texnum)
+ {
+ if (unit->t2d == 0)
+ qglEnable(GL_TEXTURE_2D);
+ }
+ else
+ {
+ if (unit->t2d)
+ qglDisable(GL_TEXTURE_2D);
+ }
}
unit->t2d = texnum;
qglBindTexture(GL_TEXTURE_2D, unit->t2d);
if (unit->t3d)
{
GL_ActiveTexture(unitnum);
- if (unit->t3d)
- qglDisable(GL_TEXTURE_3D);
+ if (unitnum < backendunits)
+ {
+ if (unit->t3d)
+ qglDisable(GL_TEXTURE_3D);
+ }
unit->t3d = 0;
qglBindTexture(GL_TEXTURE_3D, unit->t3d);
CHECKGLERROR
if (unit->tcubemap != 0)
{
GL_ActiveTexture(unitnum);
- if (unit->tcubemap)
- qglDisable(GL_TEXTURE_CUBE_MAP_ARB);
+ if (unitnum < backendunits)
+ {
+ if (unit->tcubemap)
+ qglDisable(GL_TEXTURE_CUBE_MAP_ARB);
+ }
unit->tcubemap = 0;
qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);
CHECKGLERROR
}
}
-void R_Mesh_TexBind3D(unsigned int unitnum, unsigned int texnum)
+void R_Mesh_TexBind3D(unsigned int unitnum, int texnum)
{
gltextureunit_t *unit = gl_state.units + unitnum;
- if (unitnum >= backendunits)
+ if (unitnum >= backendimageunits)
+ return;
+ if (r_showtrispass)
return;
// update 1d texture binding
if (unit->t1d)
{
GL_ActiveTexture(unitnum);
- if (unit->t1d)
- qglDisable(GL_TEXTURE_1D);
+ if (unitnum < backendunits)
+ {
+ if (unit->t1d)
+ qglDisable(GL_TEXTURE_1D);
+ }
unit->t1d = 0;
qglBindTexture(GL_TEXTURE_1D, unit->t1d);
CHECKGLERROR
if (unit->t2d)
{
GL_ActiveTexture(unitnum);
- if (unit->t2d)
- qglDisable(GL_TEXTURE_2D);
+ if (unitnum < backendunits)
+ {
+ if (unit->t2d)
+ qglDisable(GL_TEXTURE_2D);
+ }
unit->t2d = 0;
qglBindTexture(GL_TEXTURE_2D, unit->t2d);
CHECKGLERROR
if (unit->t3d != texnum)
{
GL_ActiveTexture(unitnum);
- if (texnum)
- {
- if (unit->t3d == 0)
- qglEnable(GL_TEXTURE_3D);
- }
- else
+ if (unitnum < backendunits)
{
- if (unit->t3d)
- qglDisable(GL_TEXTURE_3D);
+ if (texnum)
+ {
+ if (unit->t3d == 0)
+ qglEnable(GL_TEXTURE_3D);
+ }
+ else
+ {
+ if (unit->t3d)
+ qglDisable(GL_TEXTURE_3D);
+ }
}
unit->t3d = texnum;
qglBindTexture(GL_TEXTURE_3D, unit->t3d);
if (unit->tcubemap != 0)
{
GL_ActiveTexture(unitnum);
- if (unit->tcubemap)
- qglDisable(GL_TEXTURE_CUBE_MAP_ARB);
+ if (unitnum < backendunits)
+ {
+ if (unit->tcubemap)
+ qglDisable(GL_TEXTURE_CUBE_MAP_ARB);
+ }
unit->tcubemap = 0;
qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);
CHECKGLERROR
}
}
-void R_Mesh_TexBindCubeMap(unsigned int unitnum, unsigned int texnum)
+void R_Mesh_TexBindCubeMap(unsigned int unitnum, int texnum)
{
gltextureunit_t *unit = gl_state.units + unitnum;
- if (unitnum >= backendunits)
+ if (unitnum >= backendimageunits)
+ return;
+ if (r_showtrispass)
return;
// update 1d texture binding
if (unit->t1d)
{
GL_ActiveTexture(unitnum);
- if (unit->t1d)
- qglDisable(GL_TEXTURE_1D);
+ if (unitnum < backendunits)
+ {
+ if (unit->t1d)
+ qglDisable(GL_TEXTURE_1D);
+ }
unit->t1d = 0;
qglBindTexture(GL_TEXTURE_1D, unit->t1d);
CHECKGLERROR
if (unit->t2d)
{
GL_ActiveTexture(unitnum);
- if (unit->t2d)
- qglDisable(GL_TEXTURE_2D);
+ if (unitnum < backendunits)
+ {
+ if (unit->t2d)
+ qglDisable(GL_TEXTURE_2D);
+ }
unit->t2d = 0;
qglBindTexture(GL_TEXTURE_2D, unit->t2d);
CHECKGLERROR
if (unit->t3d)
{
GL_ActiveTexture(unitnum);
- if (unit->t3d)
- qglDisable(GL_TEXTURE_3D);
+ if (unitnum < backendunits)
+ {
+ if (unit->t3d)
+ qglDisable(GL_TEXTURE_3D);
+ }
unit->t3d = 0;
qglBindTexture(GL_TEXTURE_3D, unit->t3d);
CHECKGLERROR
if (unit->tcubemap != texnum)
{
GL_ActiveTexture(unitnum);
- if (texnum)
- {
- if (unit->tcubemap == 0)
- qglEnable(GL_TEXTURE_CUBE_MAP_ARB);
- }
- else
+ if (unitnum < backendunits)
{
- if (unit->tcubemap)
- qglDisable(GL_TEXTURE_CUBE_MAP_ARB);
+ if (texnum)
+ {
+ if (unit->tcubemap == 0)
+ qglEnable(GL_TEXTURE_CUBE_MAP_ARB);
+ }
+ else
+ {
+ if (unit->tcubemap)
+ qglDisable(GL_TEXTURE_CUBE_MAP_ARB);
+ }
}
unit->tcubemap = texnum;
qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);
void R_Mesh_TexMatrix(unsigned int unitnum, const matrix4x4_t *matrix)
{
gltextureunit_t *unit = gl_state.units + unitnum;
+ if (r_showtrispass)
+ return;
if (matrix->m[3][3])
{
// texmatrix specified, check if it is different
void R_Mesh_TexCombine(unsigned int unitnum, int combinergb, int combinealpha, int rgbscale, int alphascale)
{
gltextureunit_t *unit = gl_state.units + unitnum;
+ if (r_showtrispass)
+ return;
if (gl_combine.integer)
{
// GL_ARB_texture_env_combine
void R_Mesh_State(const rmeshstate_t *m)
{
- int i;
+ unsigned int i;
BACKENDACTIVECHECK
R_Mesh_VertexPointer(m->pointer_vertex);
-
- if (r_showtrispass)
- return;
-
R_Mesh_ColorPointer(m->pointer_color);
if (gl_backend_rebindtextures)
}
}
-void R_Mesh_Draw_ShowTris(int numverts, int numtriangles, const int *elements)
+void R_Mesh_Draw_ShowTris(int firstvertex, int numvertices, int numtriangles, const int *elements)
{
qglBegin(GL_LINES);
for (;numtriangles;numtriangles--, elements += 3)
==============================================================================
*/
-qboolean SCR_ScreenShot(char *filename, qbyte *buffer1, qbyte *buffer2, qbyte *buffer3, int x, int y, int width, int height, qboolean flipx, qboolean flipy, qboolean flipdiagonal, qboolean jpeg)
+qboolean SCR_ScreenShot(char *filename, unsigned char *buffer1, unsigned char *buffer2, unsigned char *buffer3, int x, int y, int width, int height, qboolean flipx, qboolean flipy, qboolean flipdiagonal, qboolean jpeg, qboolean gammacorrect)
{
int indices[3] = {0,1,2};
qboolean ret;
qglReadPixels (x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, buffer1);
CHECKGLERROR
- if (scr_screenshot_gamma.value != 1)
+ if (scr_screenshot_gamma.value != 1 && gammacorrect)
{
int i;
double igamma = 1.0 / scr_screenshot_gamma.value;
if (r_render.integer)
{
// clear to black
- qglClearColor(0,0,0,0);CHECKGLERROR
+ if (fogenabled)
+ qglClearColor(fogcolor[0],fogcolor[1],fogcolor[2],0);
+ else
+ qglClearColor(0,0,0,0);
+ CHECKGLERROR
qglClearDepth(1);CHECKGLERROR
if (gl_stencil)
{
}
}
-/*
-====================
-CalcFov
-====================
-*/
-float CalcFov (float fov_x, float width, float height)
-{
- // calculate vision size and alter by aspect, then convert back to angle
- return atan (((height/width)/vid_pixelaspect.value)*tan(fov_x/360.0*M_PI))*360.0/M_PI;
-}
+qboolean CL_VM_UpdateView (void);
+void SCR_DrawConsole (void);
int r_stereo_side;
void SCR_DrawScreen (void)
{
- for (r_showtrispass = 0;r_showtrispass <= (r_showtris.value > 0);r_showtrispass++)
- {
- R_Mesh_Start();
+ R_Mesh_Start();
+ if (r_timereport_active)
R_TimeReport("setup");
- if (r_showtrispass)
+ if (cls.signon == SIGNONS)
+ {
+ float size;
+
+ size = scr_viewsize.value * (1.0 / 100.0);
+ size = min(size, 1);
+
+ if (r_stereo_sidebyside.integer)
{
- rmeshstate_t m;
- r_showtrispass = 0;
- GL_BlendFunc(GL_ONE, GL_ONE);
- GL_DepthTest(GL_FALSE);
- GL_DepthMask(GL_FALSE);
- memset(&m, 0, sizeof(m));
- R_Mesh_State(&m);
- GL_ShowTrisColor(0.2,0.2,0.2,1);
- r_showtrispass = 1;
+ r_refdef.width = vid.width * size / 2.5;
+ r_refdef.height = vid.height * size / 2.5 * (1 - bound(0, r_letterbox.value, 100) / 100);
+ r_refdef.x = (vid.width - r_refdef.width * 2.5) * 0.5;
+ r_refdef.y = (vid.height - r_refdef.height)/2;
+ if (r_stereo_side)
+ r_refdef.x += r_refdef.width * 1.5;
}
-
- if (cls.signon == SIGNONS)
+ else
{
- float size;
+ r_refdef.width = vid.width * size;
+ r_refdef.height = vid.height * size * (1 - bound(0, r_letterbox.value, 100) / 100);
+ r_refdef.x = (vid.width - r_refdef.width)/2;
+ r_refdef.y = (vid.height - r_refdef.height)/2;
+ }
- size = scr_viewsize.value * (1.0 / 100.0);
- size = min(size, 1);
+ // LordHavoc: viewzoom (zoom in for sniper rifles, etc)
+ // LordHavoc: this is designed to produce widescreen fov values
+ // when the screen is wider than 4/3 width/height aspect, to do
+ // this it simply assumes the requested fov is the vertical fov
+ // for a 4x3 display, if the ratio is not 4x3 this makes the fov
+ // higher/lower according to the ratio
+ r_refdef.frustum_y = tan(scr_fov.value * cl.viewzoom * M_PI / 360.0) * (3.0/4.0);
+ r_refdef.frustum_x = r_refdef.frustum_y * (float)r_refdef.width / (float)r_refdef.height / vid_pixelheight.value;
- if (r_stereo_sidebyside.integer)
- {
- r_refdef.width = vid.realwidth * size / 2.5;
- r_refdef.height = vid.realheight * size / 2.5 * (1 - bound(0, r_letterbox.value, 100) / 100);
- r_refdef.x = (vid.realwidth - r_refdef.width * 2.5) * 0.5;
- r_refdef.y = (vid.realheight - r_refdef.height)/2;
- if (r_stereo_side)
- r_refdef.x += r_refdef.width * 1.5;
- }
- else
- {
- r_refdef.width = vid.realwidth * size;
- r_refdef.height = vid.realheight * size * (1 - bound(0, r_letterbox.value, 100) / 100);
- r_refdef.x = (vid.realwidth - r_refdef.width)/2;
- r_refdef.y = (vid.realheight - r_refdef.height)/2;
- }
-
- // LordHavoc: viewzoom (zoom in for sniper rifles, etc)
- r_refdef.fov_x = scr_fov.value * r_refdef.fovscale_x;
- r_refdef.fov_y = CalcFov (scr_fov.value, r_refdef.width, r_refdef.height) * r_refdef.fovscale_y;
+ r_refdef.frustum_x *= r_refdef.frustumscale_x;
+ r_refdef.frustum_y *= r_refdef.frustumscale_y;
+ if(!CL_VM_UpdateView())
R_RenderView();
+ else
+ SCR_DrawConsole();
- if (scr_zoomwindow.integer)
- {
- float sizex = bound(10, scr_zoomwindow_viewsizex.value, 100) / 100.0;
- float sizey = bound(10, scr_zoomwindow_viewsizey.value, 100) / 100.0;
- r_refdef.width = vid.realwidth * sizex;
- r_refdef.height = vid.realheight * sizey;
- r_refdef.x = (vid.realwidth - r_refdef.width)/2;
- r_refdef.y = 0;
- r_refdef.fov_x = scr_zoomwindow_fov.value * r_refdef.fovscale_x;
- r_refdef.fov_y = CalcFov(scr_zoomwindow_fov.value, r_refdef.width, r_refdef.height) * r_refdef.fovscale_y;
+ if (scr_zoomwindow.integer)
+ {
+ float sizex = bound(10, scr_zoomwindow_viewsizex.value, 100) / 100.0;
+ float sizey = bound(10, scr_zoomwindow_viewsizey.value, 100) / 100.0;
+ r_refdef.width = vid.width * sizex;
+ r_refdef.height = vid.height * sizey;
+ r_refdef.x = (vid.width - r_refdef.width)/2;
+ r_refdef.y = 0;
+
+ r_refdef.frustum_y = tan(scr_zoomwindow_fov.value * cl.viewzoom * M_PI / 360.0) * (3.0/4.0);
+ r_refdef.frustum_x = r_refdef.frustum_y * vid_pixelheight.value * (float)r_refdef.width / (float)r_refdef.height;
+ r_refdef.frustum_x *= r_refdef.frustumscale_x;
+ r_refdef.frustum_y *= r_refdef.frustumscale_y;
+
+ if(!CL_VM_UpdateView())
R_RenderView();
- }
}
+ }
- if (!r_stereo_sidebyside.integer)
- {
- r_refdef.width = vid.realwidth;
- r_refdef.height = vid.realheight;
- r_refdef.x = 0;
- r_refdef.y = 0;
- }
+ if (!r_stereo_sidebyside.integer)
+ {
+ r_refdef.width = vid.width;
+ r_refdef.height = vid.height;
+ r_refdef.x = 0;
+ r_refdef.y = 0;
+ }
- // draw 2D stuff
- R_DrawQueue();
+ // draw 2D stuff
+ R_DrawQueue();
- R_Mesh_Finish();
+ R_Mesh_Finish();
+ if (r_timereport_active)
R_TimeReport("meshfinish");
- }
- r_showtrispass = 0;
}
void SCR_UpdateLoadingScreen (void)
if (vid_hidden)
return;
r_showtrispass = 0;
- VID_GetWindowSize(&vid.realx, &vid.realy, &vid.realwidth, &vid.realheight);
VID_UpdateGamma(false);
- qglViewport(0, 0, vid.realwidth, vid.realheight);
+ qglViewport(0, 0, vid.width, vid.height);
//qglDisable(GL_SCISSOR_TEST);
//qglDepthMask(1);
qglColorMask(1,1,1,1);
R_Textures_Frame();
GL_SetupView_Mode_Ortho(0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100);
R_Mesh_Start();
- R_Mesh_Matrix(&r_identitymatrix);
+ R_Mesh_Matrix(&identitymatrix);
// draw the loading plaque
- pic = Draw_CachePic("gfx/loading.lmp");
+ pic = Draw_CachePic("gfx/loading", false);
x = (vid_conwidth.integer - pic->width)/2;
y = (vid_conheight.integer - pic->height)/2;
GL_Color(1,1,1,1);
varray_texcoord2f[0][4] = 1;varray_texcoord2f[0][5] = 1;
varray_texcoord2f[0][6] = 0;varray_texcoord2f[0][7] = 1;
GL_LockArrays(0, 4);
- R_Mesh_Draw(4, 2, polygonelements);
+ R_Mesh_Draw(0, 4, 2, polygonelements);
GL_LockArrays(0, 0);
R_Mesh_Finish();
// refresh
- VID_Finish();
+ VID_Finish(false);
}
/*
if (r_textureunits.integer < 1)
Cvar_SetValueQuick(&r_textureunits, 1);
- if (gl_combine.integer && (!gl_combine_extension || r_textureunits.integer < 2))
+ if (gl_combine.integer && !gl_combine_extension)
Cvar_SetValueQuick(&gl_combine, 0);
+ r_showtrispass = 0;
+
CHECKGLERROR
- qglViewport(0, 0, vid.realwidth, vid.realheight);
+ qglViewport(0, 0, vid.width, vid.height);
qglDisable(GL_SCISSOR_TEST);
qglDepthMask(1);
qglColorMask(1,1,1,1);
qglClear(GL_COLOR_BUFFER_BIT);
CHECKGLERROR
- R_TimeReport("clear");
+ if (r_timereport_active)
+ R_TimeReport("clear");
if (r_stereo_redblue.integer || r_stereo_redgreen.integer || r_stereo_redcyan.integer || r_stereo_sidebyside.integer)
{
r_refdef.viewentitymatrix = originalmatrix;
}
else
- {
- r_showtrispass = false;
SCR_DrawScreen();
- if (r_showtris.value > 0)
- {
- rmeshstate_t m;
- GL_BlendFunc(GL_ONE, GL_ONE);
- GL_DepthTest(GL_FALSE);
- GL_DepthMask(GL_FALSE);
- memset(&m, 0, sizeof(m));
- R_Mesh_State(&m);
- r_showtrispass = true;
- GL_ShowTrisColor(0.2,0.2,0.2,1);
- SCR_DrawScreen();
- r_showtrispass = false;
- }
- }
-
- VID_Finish();
- R_TimeReport("finish");
+ VID_Finish(true);
+ if (r_timereport_active)
+ R_TimeReport("finish");
}
// size of data buffer
static int r_mesh_rcachedata_size = RCACHEARRAY_DEFAULTSIZE;
// data buffer
-static qbyte r_mesh_rcachedata[RCACHEARRAY_DEFAULTSIZE];
+static unsigned char r_mesh_rcachedata[RCACHEARRAY_DEFAULTSIZE];
// current state
static int r_mesh_rcachedata_offset;
//R_Mesh_CacheArray_ValidateState(3);
// calculate a hashindex to choose a cache chain
r->data = NULL;
- hashindex = CRC_Block((void *)r, sizeof(*r)) % RCACHEARRAY_HASHSIZE;
+ hashindex = CRC_Block((unsigned char *)r, sizeof(*r)) % RCACHEARRAY_HASHSIZE;
// is it already cached?
for (lhead = &r_mesh_rcachechain[hashindex], l = lhead->next;l != lhead;l = l->next)