summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2000-02-08 23:42:14 +0000
committerBrian Paul <[email protected]>2000-02-08 23:42:14 +0000
commitbab8f790aed0085ef4353db69d3c6c537f1174b6 (patch)
tree18b6e0655dcbfe1a15736146a140af4d8b1a90e2
parent99e89283d6f8f2cbe8bb85da6a0ed144b54de7f8 (diff)
glDrawPixels w/ format=GL_COLOR_INDEX was broken
-rw-r--r--src/mesa/main/drawpix.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 6724929be68..38de1a0434a 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -1,10 +1,10 @@
-/* $Id: drawpix.c,v 1.11 2000/02/02 19:17:57 brianp Exp $ */
+/* $Id: drawpix.c,v 1.12 2000/02/08 23:42:14 brianp Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
- * Copyright (C) 1999 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -703,9 +703,9 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
break;
case GL_COLOR_INDEX:
if (ctx->Visual->RGBAflag)
- draw_index_pixels(ctx, x, y, width, height, type, pixels);
- else
draw_rgba_pixels(ctx, x,y, width, height, format, type, pixels);
+ else
+ draw_index_pixels(ctx, x, y, width, height, type, pixels);
break;
case GL_RED:
case GL_GREEN: