summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2010-05-02 10:17:07 -0400
committerKristian Høgsberg <krh@bitplanet.net>2010-05-02 10:17:07 -0400
commit0870e4a2022cff79805613ae7cd4b9237a2f564c (patch)
tree694d0c07918661996255cff226602045e0d9c707 /include
parent9d3360567346036f1c2b0b5e9de9bd123d883762 (diff)
parent9fd5fa05122aa0cac0051fa92d1634bde43209db (diff)
Merge branch 'gles2-2'
Conflicts: src/mesa/drivers/dri/common/dri_util.h
Diffstat (limited to 'include')
-rw-r--r--include/GL/internal/dri_interface.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
index a952a1db9b3..172669e3955 100644
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -736,7 +736,11 @@ struct __DRIdri2LoaderExtensionRec {
* constructors for DRI2.
*/
#define __DRI_DRI2 "DRI_DRI2"
-#define __DRI_DRI2_VERSION 1
+#define __DRI_DRI2_VERSION 2
+
+#define __DRI_API_OPENGL 0
+#define __DRI_API_GLES 1
+#define __DRI_API_GLES2 2
struct __DRIdri2ExtensionRec {
__DRIextension base;
@@ -755,6 +759,14 @@ struct __DRIdri2ExtensionRec {
__DRIcontext *shared,
void *loaderPrivate);
+ /* Since version 2 */
+ unsigned int (*getAPIMask)(__DRIscreen *screen);
+
+ __DRIcontext *(*createNewContextForAPI)(__DRIscreen *screen,
+ int api,
+ const __DRIconfig *config,
+ __DRIcontext *shared,
+ void *data);
};