diff options
| author | Andrey Nazarov <skuller@skuller.net> | 2011-03-25 19:59:39 +0300 |
|---|---|---|
| committer | Andrey Nazarov <skuller@skuller.net> | 2011-03-26 14:43:07 +0300 |
| commit | bc9ae76c1f5c91810cd36e5d19ccad3790b35715 (patch) | |
| tree | 2c90fa2b993f10bc3924f53ea2fded0c8824d00c /src/gl_state.c | |
| parent | e7a0d43b36389b2a0304b30963b8db18517fd8e6 (diff) | |
Clean up and fix 32-bit color API.
Make color_t a union to work around aliasing issues. Get rid of
FastColorCopy macro in favor of direct assignment. Get rid of
DRAW_COLOR_* macros in favor of separate APIs for clearing and setting
32-bit color and alpha values. Rename R_DrawFill/R_DrawFillEx into
R_DrawFill8/R_DrawFill32 for consistency. Remove unused fields from
laser_t struct. Fix 32-bit particles fading out too soon. Fix console
text drawing with software renderer. Fix possible SCR_ParseColor buffer
overflow.
Diffstat (limited to 'src/gl_state.c')
| -rw-r--r-- | src/gl_state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gl_state.c b/src/gl_state.c index 41d8289..353fc98 100644 --- a/src/gl_state.c +++ b/src/gl_state.c @@ -157,8 +157,8 @@ void GL_Setup2D( void ) { qglOrtho( 0, r_config.width, r_config.height, 0, -1, 1 ); draw.scale = 1; - FastColorCopy( colorWhite, draw.colors[0] ); - FastColorCopy( colorWhite, draw.colors[1] ); + draw.colors[0].u32 = U32_WHITE; + draw.colors[1].u32 = U32_WHITE; if( draw.flags & DRAW_CLIP_MASK ) { qglDisable( GL_SCISSOR_TEST ); |