diff options
| author | Brian Paul <brianp@vmware.com> | 2009-01-23 17:39:44 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-01-23 17:39:44 -0700 |
| commit | cba5ce166523a8bb6888a0ea28a26e30204f30a4 (patch) | |
| tree | 32ff5dfd46743eefa812d654a4673cc87fea359e /src/mesa/drivers/dri | |
| parent | 628b52241b13132e2d4065b653befdf81236e651 (diff) | |
| parent | 96ee3db6f76f25f8dcf36b365f6be93341d90472 (diff) | |
Merge branch 'tex_combine4'
Diffstat (limited to 'src/mesa/drivers/dri')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index 6cfe57cb49..87b0417baa 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -388,6 +388,7 @@ static const struct dri_extension card_extensions[] = { { "GL_MESA_ycbcr_texture", NULL }, { "GL_NV_blend_square", NULL }, { "GL_NV_point_sprite", GL_NV_point_sprite_functions }, + { "GL_NV_texture_env_combine4", NULL }, { "GL_NV_vertex_program", GL_NV_vertex_program_functions }, { "GL_NV_vertex_program1_1", NULL }, { "GL_SGIS_generate_mipmap", NULL }, |