nouveau: unbreak nv40

[mesa.git] / src / mesa / main / get_gen.py

diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index e6e1828800f7e463cf76b6fbdbe338fec2633e01..0f2ca00b831d4a727f23015536be0712f84b7887 100644 (file)
--- 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]",
@@ -380,7 +385,7 @@ StateVars = [
          ["ctx->ProjectionMatrixStack.Depth + 1"], "", None ),
        ( "GL_READ_BUFFER", GLenum, ["ctx->ReadBuffer->ColorReadBuffer"], "", None ),
        ( "GL_RED_BIAS", GLfloat, ["ctx->Pixel.RedBias"], "", None ),
-       ( "GL_RED_BITS", GLint, [" ctx->DrawBuffer->Visual.redBits "], "", None ),
+       ( "GL_RED_BITS", GLint, ["ctx->DrawBuffer->Visual.redBits"], "", None ),
        ( "GL_RED_SCALE", GLfloat, ["ctx->Pixel.RedScale"], "", None ),
        ( "GL_RENDER_MODE", GLenum, ["ctx->RenderMode"], "", None ),
        ( "GL_RESCALE_NORMAL", GLboolean,
@@ -953,6 +958,7 @@ StateVars = [
        # OpenGL 2.0
        ( "GL_STENCIL_BACK_FUNC", GLenum, ["ctx->Stencil.Function[1]"], "", None ),
        ( "GL_STENCIL_BACK_VALUE_MASK", GLint, ["ctx->Stencil.ValueMask[1]"], "", None ),
+       ( "GL_STENCIL_BACK_WRITEMASK", GLint, ["ctx->Stencil.WriteMask[1]"], "", None ),
        ( "GL_STENCIL_BACK_REF", GLint, ["ctx->Stencil.Ref[1]"], "", None ),
        ( "GL_STENCIL_BACK_FAIL", GLenum, ["ctx->Stencil.FailFunc[1]"], "", None ),
        ( "GL_STENCIL_BACK_PASS_DEPTH_FAIL", GLenum, ["ctx->Stencil.ZFailFunc[1]"], "", None ),
@@ -973,17 +979,19 @@ StateVars = [
 
        # GL_ARB_fragment_shader
        ( "GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB", GLint,
-         ["MAX_FRAGMENT_UNIFORM_COMPONENTS"], "", ["ARB_fragment_shader"] ),
+         ["ctx->Const.FragmentProgram.MaxUniformComponents"], "",
+         ["ARB_fragment_shader"] ),
        ( "GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB", GLenum,
          ["ctx->Hint.FragmentShaderDerivative"], "", ["ARB_fragment_shader"] ),
 
        # GL_ARB_vertex_shader
        ( "GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB", GLint,
-         ["MAX_VERTEX_UNIFORM_COMPONENTS"], "", ["ARB_vertex_shader"] ),
+         ["ctx->Const.VertexProgram.MaxUniformComponents"], "",
+         ["ARB_vertex_shader"] ),
        ( "GL_MAX_VARYING_FLOATS_ARB", GLint,
-         ["MAX_VARYING_FLOATS"], "", ["ARB_vertex_shader"] ),
+         ["ctx->Const.MaxVaryingFloats"], "", ["ARB_vertex_shader"] ),
        ( "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB", GLint,
-         ["MAX_VERTEX_TEXTURE_IMAGE_UNITS"], "", ["ARB_vertex_shader"] ),
+         ["ctx->Const.MaxVertexTextureImageUnits"], "", ["ARB_vertex_shader"] ),
        ( "GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB", GLint,
          ["MAX_COMBINED_TEXTURE_IMAGE_UNITS"], "", ["ARB_vertex_shader"] )
 ]