aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/hw/xwin')
-rw-r--r--xorg-server/hw/xwin/glx/gl.spec29
-rw-r--r--xorg-server/hw/xwin/glx/gl.tm3
-rw-r--r--xorg-server/hw/xwin/swrastwgl_dri/gl.spec29
-rw-r--r--xorg-server/hw/xwin/swrastwgl_dri/gl.tm3
4 files changed, 44 insertions, 20 deletions
diff --git a/xorg-server/hw/xwin/glx/gl.spec b/xorg-server/hw/xwin/glx/gl.spec
index d7ad0c827..fee74f689 100644
--- a/xorg-server/hw/xwin/glx/gl.spec
+++ b/xorg-server/hw/xwin/glx/gl.spec
@@ -7,7 +7,7 @@
# This document is licensed under the SGI Free Software B License Version
# 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
#
-# $Revision: 17237 $ on $Date: 2012-03-28 22:30:00 -0700 (Wed, 28 Mar 2012) $
+# $Revision: 18230 $ on $Date: 2012-06-18 11:27:28 -0700 (Mon, 18 Jun 2012) $
required-props:
# Description of a parameter
@@ -1232,7 +1232,7 @@ EdgeFlag(flag)
EdgeFlagv(flag)
return void
- param flag Boolean in array [1]
+ param flag Boolean in reference
category VERSION_1_0_DEPRECATED # old: drawing
version 1.0
deprecated 3.1
@@ -3565,7 +3565,7 @@ DrawElements(mode, count, type, indices)
GetPointerv(pname, params)
return void
param pname GetPointervPName in value
- param params VoidPointer out array [1]
+ param params VoidPointer out reference
category VERSION_1_1
dlflags notlistable
glxflags client-handcode client-intercept server-handcode
@@ -5081,7 +5081,7 @@ MultiDrawElements(mode, count, type, indices, primcount)
param mode BeginMode in value
param count SizeI in array [COMPSIZE(primcount)]
param type DrawElementsType in value
- param indices VoidPointer in array [COMPSIZE(primcount)]
+ param indices ConstVoidPointer in array [COMPSIZE(primcount)]
param primcount SizeI in value
category VERSION_1_4
version 1.4
@@ -6186,7 +6186,7 @@ ShaderSource(shader, count, string, length)
return void
param shader UInt32 in value
param count SizeI in value
- param string CharPointer in array [count]
+ param string ConstCharPointer in array [count]
param length Int32 in array [1]
category VERSION_2_0
version 2.0
@@ -7113,7 +7113,7 @@ TransformFeedbackVaryings(program, count, varyings, bufferMode)
return void
param program UInt32 in value
param count SizeI in value
- param varyings CharPointer in array [count]
+ param varyings ConstCharPointer in array [count]
param bufferMode GLenum in value
category VERSION_3_0
version 3.0
@@ -11178,7 +11178,7 @@ GetUniformIndices(program, uniformCount, uniformNames, uniformIndices)
return void
param program UInt32 in value
param uniformCount SizeI in value
- param uniformNames CharPointer in array [COMPSIZE(uniformCount)]
+ param uniformNames ConstCharPointer in array [COMPSIZE(uniformCount)]
param uniformIndices UInt32 out array [COMPSIZE(uniformCount)]
category ARB_uniform_buffer_object
dlflags notlistable
@@ -11380,7 +11380,7 @@ MultiDrawElementsBaseVertex(mode, count, type, indices, primcount, basevertex)
param mode GLenum in value
param count SizeI in array [COMPSIZE(primcount)]
param type DrawElementsType in value
- param indices VoidPointer in array [COMPSIZE(primcount)]
+ param indices ConstVoidPointer in array [COMPSIZE(primcount)]
param primcount SizeI in value
param basevertex Int32 in array [COMPSIZE(primcount)]
category ARB_draw_elements_base_vertex
@@ -13260,7 +13260,7 @@ CreateShaderProgramv(type, count, strings)
return UInt32
param type GLenum in value
param count SizeI in value
- param strings CharPointer in array [count]
+ param strings ConstCharPointer in array [count]
category ARB_separate_shader_objects
version 4.1
extension
@@ -14385,7 +14385,7 @@ GetDebugMessageLogARB(count, bufsize, sources, types, ids, severities, lengths,
glxflags ignore
offset ?
-#@ GetPointerv is redeclared in this extension
+# GetPointerv is redeclared in this extension
###############################################################################
#
@@ -32761,3 +32761,12 @@ IsImageHandleResidentNV(handle)
# (none)
newcategory: NV_shader_atomic_float
+###############################################################################
+#
+# Extension #420
+# AMD_query_buffer_object commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_query_buffer_object
diff --git a/xorg-server/hw/xwin/glx/gl.tm b/xorg-server/hw/xwin/glx/gl.tm
index 3d2c43b08..355a1c8f6 100644
--- a/xorg-server/hw/xwin/glx/gl.tm
+++ b/xorg-server/hw/xwin/glx/gl.tm
@@ -12,6 +12,7 @@ Boolean,*,*, GLboolean,*,*
BooleanPointer,*,*, GLboolean*,*,*
Char,*,*, GLchar,*,*
CharPointer,*,*, GLchar*,*,*
+ConstCharPointer,*,*, GLchar* const,*,*
CheckedFloat32,*,*, GLfloat,*,*
CheckedInt32,*,*, GLint,*,*
ClampColorTargetARB,*,*, GLenum,*,*
@@ -318,6 +319,8 @@ BufferAccessMask,*,*, GLbitfield,*,*
GetMultisamplePNameNV,*,*, GLenum,*,*
SampleMaskNV,*,*, GLbitfield,*,*
# ARB_debug_output
+GLDEBUGPROC,*,*, GLDEBUGPROC,*,*
+# ARB_debug_output
GLDEBUGPROCARB,*,*, GLDEBUGPROCARB,*,*
# AMD_debug_output
GLDEBUGPROCAMD,*,*, GLDEBUGPROCAMD,*,*
diff --git a/xorg-server/hw/xwin/swrastwgl_dri/gl.spec b/xorg-server/hw/xwin/swrastwgl_dri/gl.spec
index d7ad0c827..fee74f689 100644
--- a/xorg-server/hw/xwin/swrastwgl_dri/gl.spec
+++ b/xorg-server/hw/xwin/swrastwgl_dri/gl.spec
@@ -7,7 +7,7 @@
# This document is licensed under the SGI Free Software B License Version
# 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
#
-# $Revision: 17237 $ on $Date: 2012-03-28 22:30:00 -0700 (Wed, 28 Mar 2012) $
+# $Revision: 18230 $ on $Date: 2012-06-18 11:27:28 -0700 (Mon, 18 Jun 2012) $
required-props:
# Description of a parameter
@@ -1232,7 +1232,7 @@ EdgeFlag(flag)
EdgeFlagv(flag)
return void
- param flag Boolean in array [1]
+ param flag Boolean in reference
category VERSION_1_0_DEPRECATED # old: drawing
version 1.0
deprecated 3.1
@@ -3565,7 +3565,7 @@ DrawElements(mode, count, type, indices)
GetPointerv(pname, params)
return void
param pname GetPointervPName in value
- param params VoidPointer out array [1]
+ param params VoidPointer out reference
category VERSION_1_1
dlflags notlistable
glxflags client-handcode client-intercept server-handcode
@@ -5081,7 +5081,7 @@ MultiDrawElements(mode, count, type, indices, primcount)
param mode BeginMode in value
param count SizeI in array [COMPSIZE(primcount)]
param type DrawElementsType in value
- param indices VoidPointer in array [COMPSIZE(primcount)]
+ param indices ConstVoidPointer in array [COMPSIZE(primcount)]
param primcount SizeI in value
category VERSION_1_4
version 1.4
@@ -6186,7 +6186,7 @@ ShaderSource(shader, count, string, length)
return void
param shader UInt32 in value
param count SizeI in value
- param string CharPointer in array [count]
+ param string ConstCharPointer in array [count]
param length Int32 in array [1]
category VERSION_2_0
version 2.0
@@ -7113,7 +7113,7 @@ TransformFeedbackVaryings(program, count, varyings, bufferMode)
return void
param program UInt32 in value
param count SizeI in value
- param varyings CharPointer in array [count]
+ param varyings ConstCharPointer in array [count]
param bufferMode GLenum in value
category VERSION_3_0
version 3.0
@@ -11178,7 +11178,7 @@ GetUniformIndices(program, uniformCount, uniformNames, uniformIndices)
return void
param program UInt32 in value
param uniformCount SizeI in value
- param uniformNames CharPointer in array [COMPSIZE(uniformCount)]
+ param uniformNames ConstCharPointer in array [COMPSIZE(uniformCount)]
param uniformIndices UInt32 out array [COMPSIZE(uniformCount)]
category ARB_uniform_buffer_object
dlflags notlistable
@@ -11380,7 +11380,7 @@ MultiDrawElementsBaseVertex(mode, count, type, indices, primcount, basevertex)
param mode GLenum in value
param count SizeI in array [COMPSIZE(primcount)]
param type DrawElementsType in value
- param indices VoidPointer in array [COMPSIZE(primcount)]
+ param indices ConstVoidPointer in array [COMPSIZE(primcount)]
param primcount SizeI in value
param basevertex Int32 in array [COMPSIZE(primcount)]
category ARB_draw_elements_base_vertex
@@ -13260,7 +13260,7 @@ CreateShaderProgramv(type, count, strings)
return UInt32
param type GLenum in value
param count SizeI in value
- param strings CharPointer in array [count]
+ param strings ConstCharPointer in array [count]
category ARB_separate_shader_objects
version 4.1
extension
@@ -14385,7 +14385,7 @@ GetDebugMessageLogARB(count, bufsize, sources, types, ids, severities, lengths,
glxflags ignore
offset ?
-#@ GetPointerv is redeclared in this extension
+# GetPointerv is redeclared in this extension
###############################################################################
#
@@ -32761,3 +32761,12 @@ IsImageHandleResidentNV(handle)
# (none)
newcategory: NV_shader_atomic_float
+###############################################################################
+#
+# Extension #420
+# AMD_query_buffer_object commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_query_buffer_object
diff --git a/xorg-server/hw/xwin/swrastwgl_dri/gl.tm b/xorg-server/hw/xwin/swrastwgl_dri/gl.tm
index 3d2c43b08..355a1c8f6 100644
--- a/xorg-server/hw/xwin/swrastwgl_dri/gl.tm
+++ b/xorg-server/hw/xwin/swrastwgl_dri/gl.tm
@@ -12,6 +12,7 @@ Boolean,*,*, GLboolean,*,*
BooleanPointer,*,*, GLboolean*,*,*
Char,*,*, GLchar,*,*
CharPointer,*,*, GLchar*,*,*
+ConstCharPointer,*,*, GLchar* const,*,*
CheckedFloat32,*,*, GLfloat,*,*
CheckedInt32,*,*, GLint,*,*
ClampColorTargetARB,*,*, GLenum,*,*
@@ -318,6 +319,8 @@ BufferAccessMask,*,*, GLbitfield,*,*
GetMultisamplePNameNV,*,*, GLenum,*,*
SampleMaskNV,*,*, GLbitfield,*,*
# ARB_debug_output
+GLDEBUGPROC,*,*, GLDEBUGPROC,*,*
+# ARB_debug_output
GLDEBUGPROCARB,*,*, GLDEBUGPROCARB,*,*
# AMD_debug_output
GLDEBUGPROCAMD,*,*, GLDEBUGPROCAMD,*,*
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 22:38:45 +0000