qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-18 23:11:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename char_queue to draw_queue.

Browse source
This commit is contained in:
Bill Currie 2012-07-03 14:45:16 +09:00
parent b25de4d995
commit eefefb79b0
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libs/video/renderer/glsl/glsl_draw.c
View file

@ -104,7 +104,7 @@ static struct {
static scrap_t *draw_scrap; // hold all 2d images static scrap_t *draw_scrap; // hold all 2d images
static byte white_block[8 * 8]; static byte white_block[8 * 8];
static dstring_t *char_queue; static dstring_t *draw_queue;
static qpic_t *conchars; static qpic_t *conchars;
static int conback_texture; static int conback_texture;
static qpic_t *crosshair_pic; static qpic_t *crosshair_pic;
@ -249,9 +249,9 @@ draw_pic (float x, float y, int w, int h, qpic_t *pic,
int size = sizeof (verts); int size = sizeof (verts);
make_quad (pic, x, y, w, h, srcx, srcy, srcw, srch, verts, color); make_quad (pic, x, y, w, h, srcx, srcy, srcw, srch, verts, color);
char_queue->size += size; draw_queue->size += size;
dstring_adjust (char_queue); dstring_adjust (draw_queue);
v = char_queue->str + char_queue->size - size; v = draw_queue->str + draw_queue->size - size;
memcpy (v, verts, size); memcpy (v, verts, size);
} }
@ -379,7 +379,7 @@ glsl_Draw_Init (void)
//loading //loading
crosshaircolor->callback (crosshaircolor); crosshaircolor->callback (crosshaircolor);
char_queue = dstring_new (); draw_queue = dstring_new ();
vert = GLSL_CompileShader ("quakeico.vert", quakeicon_vert, vert = GLSL_CompileShader ("quakeico.vert", quakeicon_vert,
GL_VERTEX_SHADER); GL_VERTEX_SHADER);
@ -445,12 +445,12 @@ flush_2d (void)
GLSL_ScrapFlush (draw_scrap); GLSL_ScrapFlush (draw_scrap);
qfeglBindTexture (GL_TEXTURE_2D, GLSL_ScrapTexture (draw_scrap)); qfeglBindTexture (GL_TEXTURE_2D, GLSL_ScrapTexture (draw_scrap));
qfeglVertexAttribPointer (quake_2d.vertex.location, 4, GL_FLOAT, qfeglVertexAttribPointer (quake_2d.vertex.location, 4, GL_FLOAT,
0, 32, char_queue->str); 0, 32, draw_queue->str);
qfeglVertexAttribPointer (quake_2d.color.location, 4, GL_FLOAT, qfeglVertexAttribPointer (quake_2d.color.location, 4, GL_FLOAT,
0, 32, char_queue->str + 16); 0, 32, draw_queue->str + 16);
qfeglDrawArrays (GL_TRIANGLES, 0, char_queue->size / 32); qfeglDrawArrays (GL_TRIANGLES, 0, draw_queue->size / 32);
char_queue->size = 0; draw_queue->size = 0;
} }
void void
@ -733,8 +733,6 @@ set_2d (int width, int height)
qfeglActiveTexture (GL_TEXTURE0 + 0); qfeglActiveTexture (GL_TEXTURE0 + 0);
qfeglEnable (GL_TEXTURE_2D); qfeglEnable (GL_TEXTURE_2D);
qfeglBindTexture (GL_TEXTURE_2D, GLSL_ScrapTexture (draw_scrap)); qfeglBindTexture (GL_TEXTURE_2D, GLSL_ScrapTexture (draw_scrap));
qfeglVertexAttrib4f (quake_2d.color.location, 1, 1, 1, 1);
} }
void void
@ -759,13 +757,13 @@ GLSL_End2D (void)
void void
GLSL_DrawReset (void) GLSL_DrawReset (void)
{ {
char_queue->size = 0; draw_queue->size = 0;
} }
void void
GLSL_FlushText (void) GLSL_FlushText (void)
{ {
if (char_queue->size) if (draw_queue->size)
flush_2d (); flush_2d ();
} }