forked from pool/xorg-x11-server
85 lines
3.1 KiB
Diff
85 lines
3.1 KiB
Diff
|
From e453ac810a2020d0b8a21f67bd0e4712558fd57b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ian Romanick <ian.d.romanick@intel.com>
|
||
|
|
Date: Mon, 5 Dec 2011 13:48:19 -0800
|
||
|
|
Subject: [PATCH 04/11] glx: Add tracking for GLX_ARB_create_context and GLX_ARB_create_context_profile
|
||
|
|
|
||
|
|
The formatting of the extension data table was mangled by indent.
|
||
|
|
This patch also undoes that and adds approripate control comments so
|
||
|
|
that indent won't do it again.
|
||
|
|
|
||
|
|
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
|
||
|
|
Reviewed-by: Dave Airlie <airlied@redhat.com>
|
||
|
|
Reviewed-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
|
||
|
|
---
|
||
|
|
glx/extension_string.c | 34 +++++++++++++++++++---------------
|
||
|
|
glx/extension_string.h | 4 +++-
|
||
|
|
2 files changed, 22 insertions(+), 16 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/glx/extension_string.c b/glx/extension_string.c
|
||
|
|
index 866f8bf..6a1a6c6 100644
|
||
|
|
--- a/glx/extension_string.c
|
||
|
|
+++ b/glx/extension_string.c
|
||
|
|
@@ -67,23 +67,27 @@ struct extension_info {
|
||
|
|
|
||
|
|
static const struct extension_info known_glx_extensions[] = {
|
||
|
|
/* GLX_ARB_get_proc_address is implemented on the client. */
|
||
|
|
- {GLX(ARB_multisample), VER(1, 4), Y,},
|
||
|
|
-
|
||
|
|
- {GLX(EXT_import_context), VER(0, 0), Y,},
|
||
|
|
- {GLX(EXT_texture_from_pixmap), VER(0, 0), Y,},
|
||
|
|
- {GLX(EXT_visual_info), VER(0, 0), Y,},
|
||
|
|
- {GLX(EXT_visual_rating), VER(0, 0), Y,},
|
||
|
|
-
|
||
|
|
- {GLX(MESA_copy_sub_buffer), VER(0, 0), N,},
|
||
|
|
- {GLX(OML_swap_method), VER(0, 0), Y,},
|
||
|
|
- {GLX(SGI_make_current_read), VER(1, 3), N,},
|
||
|
|
- {GLX(SGI_swap_control), VER(0, 0), N,},
|
||
|
|
- {GLX(SGIS_multisample), VER(0, 0), Y,},
|
||
|
|
- {GLX(SGIX_fbconfig), VER(1, 3), Y,},
|
||
|
|
- {GLX(SGIX_pbuffer), VER(1, 3), Y,},
|
||
|
|
- {GLX(SGIX_visual_select_group), VER(0, 0), Y,},
|
||
|
|
- {GLX(INTEL_swap_event), VER(1, 4), N,},
|
||
|
|
- {NULL}
|
||
|
|
+ /* *INDENT-OFF* */
|
||
|
|
+ { GLX(ARB_create_context), VER(0,0), N, },
|
||
|
|
+ { GLX(ARB_create_context_profile), VER(0,0), N, },
|
||
|
|
+ { GLX(ARB_multisample), VER(1,4), Y, },
|
||
|
|
+
|
||
|
|
+ { GLX(EXT_import_context), VER(0,0), Y, },
|
||
|
|
+ { GLX(EXT_texture_from_pixmap), VER(0,0), Y, },
|
||
|
|
+ { GLX(EXT_visual_info), VER(0,0), Y, },
|
||
|
|
+ { GLX(EXT_visual_rating), VER(0,0), Y, },
|
||
|
|
+
|
||
|
|
+ { GLX(MESA_copy_sub_buffer), VER(0,0), N, },
|
||
|
|
+ { GLX(OML_swap_method), VER(0,0), Y, },
|
||
|
|
+ { GLX(SGI_make_current_read), VER(1,3), N, },
|
||
|
|
+ { GLX(SGI_swap_control), VER(0,0), N, },
|
||
|
|
+ { GLX(SGIS_multisample), VER(0,0), Y, },
|
||
|
|
+ { GLX(SGIX_fbconfig), VER(1,3), Y, },
|
||
|
|
+ { GLX(SGIX_pbuffer), VER(1,3), Y, },
|
||
|
|
+ { GLX(SGIX_visual_select_group), VER(0,0), Y, },
|
||
|
|
+ { GLX(INTEL_swap_event), VER(1,4), N, },
|
||
|
|
+ { NULL }
|
||
|
|
+ /* *INDENT-ON* */
|
||
|
|
};
|
||
|
|
|
||
|
|
/**
|
||
|
|
diff --git a/glx/extension_string.h b/glx/extension_string.h
|
||
|
|
index e02213f..947bf89 100644
|
||
|
|
--- a/glx/extension_string.h
|
||
|
|
+++ b/glx/extension_string.h
|
||
|
|
@@ -36,7 +36,9 @@
|
||
|
|
|
||
|
|
enum {
|
||
|
|
/* GLX_ARB_get_proc_address is implemented on the client. */
|
||
|
|
- ARB_multisample_bit = 0,
|
||
|
|
+ ARB_create_context_bit = 0,
|
||
|
|
+ ARB_create_context_profile_bit,
|
||
|
|
+ ARB_multisample_bit,
|
||
|
|
EXT_import_context_bit,
|
||
|
|
EXT_texture_from_pixmap_bit,
|
||
|
|
EXT_visual_info_bit,
|
||
|
|
--
|
||
|
|
1.7.3.4
|
||
|
|
|