xserver: Branch 'master' - 2 commits

[Adam Jackson]

 dix/protocol.txt |   45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

New commits:
commit 3cd56dd2cfbfcce6ba68c22450d51139208993ab
Author: Robert Hooker <sarvatt at ubuntu.com>
Date:   Fri Dec 3 23:42:27 2010 -0500

    Add new GLX events errors and requests to protocol.txt
    
    Based off of glproto 1.4.11.
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Robert Hooker <robert.hooker at canonical.com>

diff --git a/dix/protocol.txt b/dix/protocol.txt
index fa2fcb1..f78ed58 100644
--- a/dix/protocol.txt
+++ b/dix/protocol.txt
@@ -159,6 +159,20 @@ R017 GLX:VendorPrivateWithReply
 R018 GLX:QueryExtensionsString
 R019 GLX:QueryServerString
 R020 GLX:ClientInfo
+R021 GLX:GetFBConfigs
+R022 GLX:CreatePixmap
+R023 GLX:DestroyPixmap
+R024 GLX:CreateNewContext
+R025 GLX:QueryContext
+R026 GLX:MakeContextCurrent
+R027 GLX:CreatePbuffer
+R028 GLX:DestroyPbuffer
+R029 GLX:GetDrawableAttributes
+R030 GLX:ChangeDrawableAttributes
+R031 GLX:CreateWindow
+R032 GLX:DeleteWindow
+R033 GLX:SetClientInfoARB
+R034 GLX:CreateContextAttribsARB
 R101 GLX:NewList
 R102 GLX:EndList
 R103 GLX:DeleteLists
@@ -201,6 +215,26 @@ R139 GLX:GetTexLevelParameteriv
 R140 GLX:IsEnabled
 R141 GLX:IsList
 R142 GLX:Flush
+R143 GLX:AreTexturesResident
+R144 GLX:DeleteTextures
+R145 GLX:GenTextures
+R146 GLX:IsTexture
+R147 GLX:GetColorTable
+R148 GLX:GetColorTableParameterfv
+R149 GLX:GetColorTableParameterfv
+R150 GLX:GetConvolutionFilter
+R151 GLX:GetConvolutionParameterfv
+R152 GLX:GetConvolutionParameteriv
+R153 GLX:GetSeparableFilter
+R154 GLX:GetHistogram
+R155 GLX:GetHistogramParameterfv
+R156 GLX:GetHistogramParameteriv
+R157 GLX:GetMinmax
+R158 GLX:GetMinmaxParameterfv
+R159 GLX:GetMinmaxParameteriv
+R160 GLX:GetCompressedTexImage
+V000 GLX:PbufferClobber
+V001 GLX:BufferSwapComplete
 E000 GLX:BadContext
 E001 GLX:BadContextState
 E002 GLX:BadDrawable
@@ -210,6 +244,10 @@ E005 GLX:BadCurrentWindow
 E006 GLX:BadRenderRequest
 E007 GLX:BadLargeRequest
 E008 GLX:UnsupportedPrivateRequest
+E009 GLX:BadFBConfig
+E010 GLX:BadPbuffer
+E011 GLX:BadCurrentDrawable
+E012 GLX:BadWindow
 R000 LBX:QueryVersion
 R001 LBX:StartProxy
 R002 LBX:StopProxy
commit 272ba9f021c6d08ebd6a2d96da3737f5630bcbd5
Author: Robert Hooker <sarvatt at ubuntu.com>
Date:   Fri Dec 3 23:39:51 2010 -0500

    Add DRI2 2.2/2.3 events and requests to protocol.txt
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Robert Hooker <robert.hooker at canonical.com>

diff --git a/dix/protocol.txt b/dix/protocol.txt
index c223795..fa2fcb1 100644
--- a/dix/protocol.txt
+++ b/dix/protocol.txt
@@ -124,6 +124,13 @@ R004 DRI2:DestroyDrawable
 R005 DRI2:GetBuffers
 R006 DRI2:CopyRegion
 R007 DRI2:GetBuffersWithFormat
+R008 DRI2:SwapBuffers
+R009 DRI2:GetMSC
+R010 DRI2:WaitMSC
+R011 DRI2:WaitSBC
+R012 DRI2:SwapInterval
+V000 DRI2:BufferSwapComplete
+V001 DRI2:InvalidateBuffers
 R000 Extended-Visual-Information:QueryVersion
 R001 Extended-Visual-Information:GetVisualInfo
 R000 FontCache:QueryVersion