summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2006-09-13 21:02:32 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2006-09-13 21:02:32 +0000
commitfd2e402359e39d2afb9dcce9c64fe09906c4a877 (patch)
tree9c4035f829894cd4a746ec272b8381680aa5818a /src
parentbd5331f9e86bdb112624ac30bf6b843675a5830c (diff)
added GL_CURRENT_RASTER_SECONDARY_COLOR query (OpenGL 2.1)
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/get.c18
-rw-r--r--src/mesa/main/get_gen.py7
2 files changed, 24 insertions, 1 deletions
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 3da2e68988..086785911e 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -259,6 +259,12 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
params[2] = FLOAT_TO_BOOLEAN(ctx->Current.RasterPos[2]);
params[3] = FLOAT_TO_BOOLEAN(ctx->Current.RasterPos[3]);
break;
+ case GL_CURRENT_RASTER_SECONDARY_COLOR:
+ params[0] = FLOAT_TO_BOOLEAN(ctx->Current.RasterSecondaryColor[0]);
+ params[1] = FLOAT_TO_BOOLEAN(ctx->Current.RasterSecondaryColor[1]);
+ params[2] = FLOAT_TO_BOOLEAN(ctx->Current.RasterSecondaryColor[2]);
+ params[3] = FLOAT_TO_BOOLEAN(ctx->Current.RasterSecondaryColor[3]);
+ break;
case GL_CURRENT_RASTER_TEXTURE_COORDS:
{
const GLuint texUnit = ctx->Texture.CurrentUnit;
@@ -2077,6 +2083,12 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
params[2] = ctx->Current.RasterPos[2];
params[3] = ctx->Current.RasterPos[3];
break;
+ case GL_CURRENT_RASTER_SECONDARY_COLOR:
+ params[0] = ctx->Current.RasterSecondaryColor[0];
+ params[1] = ctx->Current.RasterSecondaryColor[1];
+ params[2] = ctx->Current.RasterSecondaryColor[2];
+ params[3] = ctx->Current.RasterSecondaryColor[3];
+ break;
case GL_CURRENT_RASTER_TEXTURE_COORDS:
{
const GLuint texUnit = ctx->Texture.CurrentUnit;
@@ -3895,6 +3907,12 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
params[2] = IROUND(ctx->Current.RasterPos[2]);
params[3] = IROUND(ctx->Current.RasterPos[3]);
break;
+ case GL_CURRENT_RASTER_SECONDARY_COLOR:
+ params[0] = FLOAT_TO_INT(ctx->Current.RasterSecondaryColor[0]);
+ params[1] = FLOAT_TO_INT(ctx->Current.RasterSecondaryColor[1]);
+ params[2] = FLOAT_TO_INT(ctx->Current.RasterSecondaryColor[2]);
+ params[3] = FLOAT_TO_INT(ctx->Current.RasterSecondaryColor[3]);
+ break;
case GL_CURRENT_RASTER_TEXTURE_COORDS:
{
const GLuint texUnit = ctx->Texture.CurrentUnit;
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index e6e1828800..4680fea277 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -2,7 +2,7 @@
# Mesa 3-D graphics library
#
-# Copyright (C) 1999-2005 Brian Paul All Rights Reserved.
+# Copyright (C) 1999-2006 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"),
@@ -157,6 +157,11 @@ StateVars = [
"ctx->Current.RasterPos[1]",
"ctx->Current.RasterPos[2]",
"ctx->Current.RasterPos[3]"], "", None ),
+ ( "GL_CURRENT_RASTER_SECONDARY_COLOR", GLfloatN,
+ ["ctx->Current.RasterSecondaryColor[0]",
+ "ctx->Current.RasterSecondaryColor[1]",
+ "ctx->Current.RasterSecondaryColor[2]",
+ "ctx->Current.RasterSecondaryColor[3]"], "", None ),
( "GL_CURRENT_RASTER_TEXTURE_COORDS", GLfloat,
["ctx->Current.RasterTexCoords[texUnit][0]",
"ctx->Current.RasterTexCoords[texUnit][1]",