summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-01-22 00:42:45 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-01-22 00:42:45 +0000
commit7ab14f00f02540520d6d36dd576b5e88db909923 (patch)
tree358119b9ee5b5a0f53ddffe6450cf5377638ca6f
parent041d5d3aee42f06522baec9a12f353d8173fcde6 (diff)
glGet(GL_CURRENT_SECONDARY_COLOR) should return 4 values, not 3
-rw-r--r--src/mesa/main/get.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 9541ab00fc..8a0aa50b19 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1,4 +1,4 @@
-/* $Id: get.c,v 1.103 2003/01/21 21:47:50 brianp Exp $ */
+/* $Id: get.c,v 1.104 2003/01/22 00:42:45 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -1246,6 +1246,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
params[0] = INT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0]);
params[1] = INT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1]);
params[2] = INT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2]);
+ params[3] = INT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][3]);
break;
case GL_SECONDARY_COLOR_ARRAY_EXT:
CHECK_EXTENSION_B(EXT_secondary_color, pname);
@@ -2644,6 +2645,7 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
params[0] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0];
params[1] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1];
params[2] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2];
+ params[3] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][3];
break;
case GL_SECONDARY_COLOR_ARRAY_EXT:
CHECK_EXTENSION_D(EXT_secondary_color, pname);
@@ -4016,6 +4018,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
params[0] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0];
params[1] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1];
params[2] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2];
+ params[3] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][3];
break;
case GL_SECONDARY_COLOR_ARRAY_EXT:
CHECK_EXTENSION_F(EXT_secondary_color, pname);
@@ -5426,6 +5429,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
params[0] = FLOAT_TO_INT( (ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0]) );
params[1] = FLOAT_TO_INT( (ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1]) );
params[2] = FLOAT_TO_INT( (ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2]) );
+ params[3] = FLOAT_TO_INT( (ctx->Current.Attrib[VERT_ATTRIB_COLOR1][3]) );
break;
case GL_SECONDARY_COLOR_ARRAY_EXT:
CHECK_EXTENSION_I(EXT_secondary_color, pname);