Jason McKesson avatar Jason McKesson committed 2e4c519 Merge

Merge with spec-mods

Comments (0)

Files changed (4)

 # This document is licensed under the SGI Free Software B License Version
 # 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
 #
-# $Revision: 19329 $ on $Date: 2012-09-28 12:26:05 -0700 (Fri, 28 Sep 2012) $
+# $Revision: 19760 $ on $Date: 2012-11-26 14:01:10 -0800 (Mon, 26 Nov 2012) $
 
 required-props:
 # Description of a parameter
 # (none)
 newcategory: NV_shader_atomic_float
 
-[###############################################################################
+###############################################################################
 #
 # Extension #420
 # AMD_query_buffer_object commands

glspecs/glxenum.spec

 GLXContextProfileMask enum:
 	CONTEXT_CORE_PROFILE_BIT_ARB			= 0x00000001	# ARB_create_context_profile
 	CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB		= 0x00000002	# ARB_create_context_profile
+	CONTEXT_ES_PROFILE_BIT_EXT			= 0x00000004	# EXT_create_context_es_profile
 	CONTEXT_ES2_PROFILE_BIT_EXT			= 0x00000004	# EXT_create_context_es2_profile
 
 GLXAttribute enum:

glspecs/glxenumext.spec

 
 passthru:
 passthru: /* Header file version number, required by OpenGL ABI for Linux */
-passthru: /* glxext.h last updated 2012/02/29 */
+passthru: /* glxext.h last updated 2013/01/02 */
 passthru: /* Current version at http://www.opengl.org/registry/ */
-passthru: #define GLX_GLXEXT_VERSION 33
+passthru: #define GLX_GLXEXT_VERSION 34
 
 ###############################################################################
 #
 EXT_create_context_es2_profile enum:
 	CONTEXT_ES2_PROFILE_BIT_EXT			= 0x00000004
 
+# Also extension #399
+EXT_create_context_es_profile enum:
+	CONTEXT_ES_PROFILE_BIT_EXT			= 0x00000004
+
 ###############################################################################
 
 # Extension #414

glspecs/glxext.spec

 
 ###############################################################################
 #
-# Extension #399
+# Extension #398
 # AMD_gpu_association commands
 #
 ###############################################################################
 
 ###############################################################################
 #
+# Extension #399
+# EXT_create_context_es2_profile commands
+# EXT_create_context_es_profile commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_create_context_es2_profile
+
+newcategory: EXT_create_context_es_profile
+
+###############################################################################
+#
 # Extension #414
 # EXT_swap_control_tear commands
 #
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.