diff options
author | Jakob Bornecrantz <[email protected]> | 2009-12-02 14:52:51 +0100 |
---|---|---|
committer | Jakob Bornecrantz <[email protected]> | 2009-12-02 14:52:51 +0100 |
commit | 0c75854cc1650dc870e042aa66a053e70b3d4556 (patch) | |
tree | 72eb2c040bd10b6210bdc7f2b25df5e8c405095f /src/mesa/drivers/dri/intel/intel_extensions.c | |
parent | 4598942b1b88a2a7d5af7febae7e79eedf00e385 (diff) | |
parent | 2b5618fc5bdcbee3434f8b5aa3a31eb06fb479c0 (diff) |
Merge commit 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
src/mesa/main/version.h
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_extensions.c')
-rw-r--r-- | src/mesa/drivers/dri/intel/intel_extensions.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c index 1682e115cc1..48cdae509e3 100644 --- a/src/mesa/drivers/dri/intel/intel_extensions.c +++ b/src/mesa/drivers/dri/intel/intel_extensions.c @@ -121,7 +121,6 @@ static const struct dri_extension card_extensions[] = { { "GL_MESA_pack_invert", NULL }, { "GL_MESA_ycbcr_texture", NULL }, { "GL_NV_blend_square", NULL }, - { "GL_NV_point_sprite", GL_NV_point_sprite_functions }, { "GL_NV_vertex_program", GL_NV_vertex_program_functions }, { "GL_NV_vertex_program1_1", NULL }, { "GL_SGIS_generate_mipmap", NULL }, |