diff options
| author | Michal Krol <michal@vmware.com> | 2010-03-10 15:49:30 +0100 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2010-03-10 15:49:30 +0100 |
| commit | 3ce4375912c8ea488460e593e07c5bb15b92dca9 (patch) | |
| tree | 1011fa439bd829fd46a44fd99478135848800e73 /src/mesa/main/get_gen.py | |
| parent | f59f28093ea827bd234d8e1a36bdd56a9fce5f09 (diff) | |
| parent | 9b348d0ed125a22be3f318ac60cef6f201edfdab (diff) | |
Merge branch 'master' into gallium-sampler-view
Conflicts:
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
src/gallium/auxiliary/tgsi/tgsi_exec.c
src/gallium/auxiliary/util/u_blitter.c
src/gallium/drivers/i915/i915_context.h
src/gallium/drivers/i965/brw_context.h
src/gallium/drivers/llvmpipe/lp_context.h
src/gallium/drivers/nv50/nv50_context.h
src/gallium/drivers/nv50/nv50_state_validate.c
src/gallium/drivers/nv50/nv50_tex.c
src/gallium/drivers/r300/r300_blit.c
src/gallium/drivers/r300/r300_context.h
src/gallium/drivers/r300/r300_emit.c
src/gallium/drivers/r300/r300_state.c
src/gallium/drivers/softpipe/sp_context.h
src/gallium/drivers/svga/svga_context.h
src/gallium/drivers/svga/svga_pipe_sampler.c
Diffstat (limited to 'src/mesa/main/get_gen.py')
| -rw-r--r-- | src/mesa/main/get_gen.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py index 64aa2aca26..9d5a51d58c 100644 --- a/src/mesa/main/get_gen.py +++ b/src/mesa/main/get_gen.py @@ -155,7 +155,7 @@ StateVars = [ ( "GL_CURRENT_RASTER_DISTANCE", GLfloat, ["ctx->Current.RasterDistance"], "", None ), ( "GL_CURRENT_RASTER_INDEX", GLfloat, - ["ctx->Current.RasterIndex"], "", None ), + ["1.0"], "", None ), ( "GL_CURRENT_RASTER_POSITION", GLfloat, ["ctx->Current.RasterPos[0]", "ctx->Current.RasterPos[1]", @@ -231,7 +231,7 @@ StateVars = [ ( "GL_INDEX_BITS", GLint, ["ctx->DrawBuffer->Visual.indexBits"], "", None ), ( "GL_INDEX_CLEAR_VALUE", GLint, ["ctx->Color.ClearIndex"], "", None ), - ( "GL_INDEX_MODE", GLboolean, ["!ctx->DrawBuffer->Visual.rgbMode"], + ( "GL_INDEX_MODE", GLboolean, ["GL_FALSE"], "", None ), ( "GL_INDEX_OFFSET", GLint, ["ctx->Pixel.IndexOffset"], "", None ), ( "GL_INDEX_SHIFT", GLint, ["ctx->Pixel.IndexShift"], "", None ), @@ -410,7 +410,7 @@ StateVars = [ ( "GL_RENDER_MODE", GLenum, ["ctx->RenderMode"], "", None ), ( "GL_RESCALE_NORMAL", GLboolean, ["ctx->Transform.RescaleNormals"], "", None ), - ( "GL_RGBA_MODE", GLboolean, ["ctx->DrawBuffer->Visual.rgbMode"], + ( "GL_RGBA_MODE", GLboolean, ["GL_TRUE"], "", None ), ( "GL_SCISSOR_BOX", GLint, ["ctx->Scissor.X", |