diff options
author | Ian Romanick <ian.d.romanick@intel.com> | 2008-12-14 18:58:33 -0800 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2008-12-14 18:58:33 -0800 |
commit | f1c9b5ab230cbb4124d8d476ae4886d05022adcb (patch) | |
tree | 493a8bde90db2bb33b15cb4867e764ef49cd0ace /glx/glapi.h | |
parent | 6383bc93b2ae76361a58653bc7e291df0d6ddfec (diff) |
GLX: Changes resulting from changes to Mesa generator scripts / data
Several recent Mesa commits (listed below) make modifications to the
protocol generator data and scripts. This commit represents the
changes to the generated files resulting from the previous changes.
- 0f73302d24f4201813da2939742c5bcb6964b3b1
GLX: Fix protocol for glTexSubImage#D
- 1709ab01ef24279c782e420568e9257b4b92b224
Return 0 as the request size when the pixels parameter is NULL
- 63cca2ba10ce7dcc8481cfa4be3872dfc269dded
GLX: Include glapi.h before glapitable.h
This is the server-side part of the fix for bugzilla #11003.
Diffstat (limited to 'glx/glapi.h')
-rw-r--r-- | glx/glapi.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/glx/glapi.h b/glx/glapi.h index ddfb1cffb..8f2cf6621 100644 --- a/glx/glapi.h +++ b/glx/glapi.h @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 6.5 + * Version: 7.1 * - * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -44,12 +44,17 @@ #ifndef _GLAPI_H #define _GLAPI_H +#define GL_GLEXT_PROTOTYPES #include "GL/gl.h" -#include "glapitable.h" +#include "GL/glext.h" #include "glthread.h" +struct _glapi_table; + +typedef void (*_glapi_proc)(void); /* generic function pointer */ + typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...); @@ -63,6 +68,12 @@ typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...); #endif +/* + * Number of extension functions which we can dynamically add at runtime. + */ +#define MAX_EXTENSION_FUNCS 300 + + /** ** Define the GET_CURRENT_CONTEXT() macro. ** \param C local variable which will hold the current context. |