diff options
author | Ian Romanick <ian.d.romanick@intel.com> | 2009-09-25 16:57:38 -0700 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2009-09-25 16:57:38 -0700 |
commit | 8130375e775bd5ba6a47412b0ea8ec9f23dc5972 (patch) | |
tree | 34925730997476c0e8046045551ffc4f0c317116 /src/mesa/main/mtypes.h | |
parent | c19482b16f164ce1b6625d18950a4644e5834373 (diff) | |
parent | 09af58d7ed7dfa8f2ce2b881bb849064e136c830 (diff) |
Merge branch 'asm-shader-rework-2'
Conflicts:
src/mesa/shader/program_parse.tab.c
Diffstat (limited to 'src/mesa/main/mtypes.h')
-rw-r--r-- | src/mesa/main/mtypes.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 4757c3efa5..d7bf7689f3 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2583,6 +2583,7 @@ struct gl_extensions GLboolean MESA_texture_signed_rgba; GLboolean NV_blend_square; GLboolean NV_fragment_program; + GLboolean NV_fragment_program_option; GLboolean NV_light_max_exponent; GLboolean NV_point_sprite; GLboolean NV_texgen_reflection; |