aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/context.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-02-09 08:04:41 +0000
committermarha <marha@users.sourceforge.net>2011-02-09 08:04:41 +0000
commit744bc6a5e71f207a33b0826598c1f93302f7fe01 (patch)
tree63dcb1464076af2a0eba4f5655bfb2ebb47fe486 /mesalib/src/mesa/main/context.h
parent67ff1435e31fee46b1bc8d1c65da27f8ad1c39f9 (diff)
parent51a59b7f7f9b134791d3b09673063e4c45ea9eee (diff)
downloadvcxsrv-744bc6a5e71f207a33b0826598c1f93302f7fe01.tar.gz
vcxsrv-744bc6a5e71f207a33b0826598c1f93302f7fe01.tar.bz2
vcxsrv-744bc6a5e71f207a33b0826598c1f93302f7fe01.zip
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main/context.h')
-rw-r--r--mesalib/src/mesa/main/context.h25
1 files changed, 6 insertions, 19 deletions
diff --git a/mesalib/src/mesa/main/context.h b/mesalib/src/mesa/main/context.h
index bcadaea4f..160e795f7 100644
--- a/mesalib/src/mesa/main/context.h
+++ b/mesalib/src/mesa/main/context.h
@@ -99,33 +99,20 @@ _mesa_destroy_visual( struct gl_config *vis );
/** \name Context-related functions */
/*@{*/
-extern struct gl_context *
-_mesa_create_context( const struct gl_config *visual,
- struct gl_context *share_list,
- const struct dd_function_table *driverFunctions,
- void *driverContext );
-
extern GLboolean
_mesa_initialize_context( struct gl_context *ctx,
+ gl_api api,
const struct gl_config *visual,
struct gl_context *share_list,
const struct dd_function_table *driverFunctions,
void *driverContext );
extern struct gl_context *
-_mesa_create_context_for_api(gl_api api,
- const struct gl_config *visual,
- struct gl_context *share_list,
- const struct dd_function_table *driverFunctions,
- void *driverContext);
-
-extern GLboolean
-_mesa_initialize_context_for_api(struct gl_context *ctx,
- gl_api api,
- const struct gl_config *visual,
- struct gl_context *share_list,
- const struct dd_function_table *driverFunctions,
- void *driverContext);
+_mesa_create_context(gl_api api,
+ const struct gl_config *visual,
+ struct gl_context *share_list,
+ const struct dd_function_table *driverFunctions,
+ void *driverContext);
extern void
_mesa_free_context_data( struct gl_context *ctx );