diff options
| author | Brian Paul <[email protected]> | 2009-12-11 10:04:07 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-12-11 10:04:07 -0700 |
| commit | a087eb590d780cb82b49464e05ffc85123adce7e (patch) | |
| tree | a2ac3ec2cc0b9001b350664d6e7915aba5e087a9 /src/mesa/main/get_gen.py | |
| parent | cb640c8d40c4ee34160a14d646c244f44a5013f6 (diff) | |
| parent | e128cc205e30540597ecd57849060a6bf4714d9f (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
src/gallium/state_trackers/xorg/xorg_xv.c
src/mesa/drivers/dri/intel/intel_span.c
Diffstat (limited to 'src/mesa/main/get_gen.py')
| -rw-r--r-- | src/mesa/main/get_gen.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py index a29962d3348..01170a42a72 100644 --- a/src/mesa/main/get_gen.py +++ b/src/mesa/main/get_gen.py @@ -942,9 +942,9 @@ StateVars = [ # GL_OES_read_format ( "GL_IMPLEMENTATION_COLOR_READ_TYPE_OES", GLint, - ["ctx->Const.ColorReadType"], "", ["OES_read_format"] ), + ["_mesa_get_color_read_type(ctx)"], "", ["OES_read_format"] ), ( "GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES", GLint, - ["ctx->Const.ColorReadFormat"], "", ["OES_read_format"] ), + ["_mesa_get_color_read_format(ctx)"], "", ["OES_read_format"] ), # GL_ATI_fragment_shader ( "GL_NUM_FRAGMENT_REGISTERS_ATI", GLint, ["6"], "", ["ATI_fragment_shader"] ), @@ -1159,6 +1159,7 @@ def EmitHeader(): #include "mtypes.h" #include "state.h" #include "texcompress.h" +#include "framebuffer.h" #define FLOAT_TO_BOOLEAN(X) ( (X) ? GL_TRUE : GL_FALSE ) |