diff options
author | Ian Romanick <idr@us.ibm.com> | 2005-01-07 00:48:24 +0000 |
---|---|---|
committer | Ian Romanick <idr@us.ibm.com> | 2005-01-07 00:48:24 +0000 |
commit | 7e3379b1a0f1837e432323f60885e5c8e38c2699 (patch) | |
tree | 4c70edc0f036749665c4b0676a0ca1934802780c /src/mesa/drivers/dri/i915/i830_context.c | |
parent | 71fc6a3fc9177efa335e5c09867faf0bde6584a2 (diff) |
Revert some accidental cross-merge changes. Remove i915GetString. Migrate
a couple extensions that appeared in both device-specific card_extensions
strings to the shared one.
Diffstat (limited to 'src/mesa/drivers/dri/i915/i830_context.c')
-rw-r--r-- | src/mesa/drivers/dri/i915/i830_context.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i915/i830_context.c b/src/mesa/drivers/dri/i915/i830_context.c index 5c8e95aa4c..fa19e3104f 100644 --- a/src/mesa/drivers/dri/i915/i830_context.c +++ b/src/mesa/drivers/dri/i915/i830_context.c @@ -41,7 +41,6 @@ static const char * const card_extensions[] = { "GL_ARB_texture_env_crossbar", - "GL_NV_blend_square", NULL }; |