summaryrefslogtreecommitdiff
path: root/src/gallium/winsys
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@tungstengraphics.com>2008-06-11 15:50:07 +0100
committerAlan Hourihane <alanh@tungstengraphics.com>2008-06-11 15:50:07 +0100
commitd45e99060d531d3a3889bb59fb55875bde05811f (patch)
tree10a9a68117332631378b428c8824eddbdaaa0e3d /src/gallium/winsys
parentf851ba705ae878f62149afa377c755286cf53c85 (diff)
fix card_extensions
Diffstat (limited to 'src/gallium/winsys')
-rw-r--r--src/gallium/winsys/dri/intel/intel_context.c17
-rw-r--r--src/gallium/winsys/dri/intel/intel_screen.h2
2 files changed, 6 insertions, 13 deletions
diff --git a/src/gallium/winsys/dri/intel/intel_context.c b/src/gallium/winsys/dri/intel/intel_context.c
index af44018053..9d78e9ebf8 100644
--- a/src/gallium/winsys/dri/intel/intel_context.c
+++ b/src/gallium/winsys/dri/intel/intel_context.c
@@ -141,6 +141,8 @@ static const struct dri_extension brw_extensions[] = {
{ "GL_SGIX_depth_texture", NULL },
{ "GL_ARB_texture_env_crossbar", NULL },
{ "GL_EXT_texture_sRGB", NULL},
+ { "GL_EXT_framebuffer_object", GL_EXT_framebuffer_object_functions},
+ { "GL_ARB_pixel_buffer_object", NULL},
{ NULL, NULL }
};
@@ -148,21 +150,15 @@ static const struct dri_extension arb_oc_extensions[] = {
{"GL_ARB_occlusion_query", GL_ARB_occlusion_query_functions},
{NULL, NULL}
};
-
-static const struct dri_extension ttm_extensions[] = {
- {"GL_EXT_framebuffer_object", GL_EXT_framebuffer_object_functions},
- {"GL_ARB_pixel_buffer_object", NULL},
- {NULL, NULL}
-};
#endif
/**
* Initializes potential list of extensions if ctx == NULL, or actually enables
* extensions for a context.
*/
-void intelInitExtensions(struct st_context *st, GLboolean enable_imaging)
+void intelInitExtensions(struct intel_context *intel, GLboolean enable_imaging)
{
- GLcontext *ctx = st ? st->ctx : NULL;
+ GLcontext *ctx = intel ? intel->st->ctx : NULL;
/* Disable imaging extension until convolution is working in teximage paths.
*/
enable_imaging = GL_FALSE;
@@ -170,9 +166,6 @@ void intelInitExtensions(struct st_context *st, GLboolean enable_imaging)
driInitExtensions(ctx, card_extensions, enable_imaging);
#if 0
- if (intel == NULL || intel->ttm)
- driInitExtensions(ctx, ttm_extensions, GL_FALSE);
-
if (intel == NULL ||
(IS_965(intel->intelScreen->deviceID) &&
intel->intelScreen->drmMinor >= 8))
@@ -327,7 +320,7 @@ intelCreateContext(const __GLcontextModes * visual,
intel->st = st_create_context(pipe, visual, st_share);
- intelInitExtensions( intel->st, GL_TRUE );
+ intelInitExtensions( intel, GL_TRUE );
return GL_TRUE;
}
diff --git a/src/gallium/winsys/dri/intel/intel_screen.h b/src/gallium/winsys/dri/intel/intel_screen.h
index d1389a31fb..5a3ae1dc0f 100644
--- a/src/gallium/winsys/dri/intel/intel_screen.h
+++ b/src/gallium/winsys/dri/intel/intel_screen.h
@@ -117,6 +117,6 @@ intelCreateContext(const __GLcontextModes * visual,
void *sharedContextPrivate);
extern void
-intelInitExtensions(struct st_context *st, GLboolean enable_imaging);
+intelInitExtensions(struct intel_context *intel, GLboolean enable_imaging);
#endif