From e239bb3c68a4981a3916534203c2fbd6b96f593c Mon Sep 17 00:00:00 2001 From: "Andrew Gallant (Ocelot)" Date: Thu, 10 May 2012 12:47:19 -0400 Subject: make resource ids their own individual types. last commit before overhaul to sub-packages --- nexgb/auto_dri2.go | 92 ++++++++++++++++++++++++++---------------------------- 1 file changed, 45 insertions(+), 47 deletions(-) (limited to 'nexgb/auto_dri2.go') diff --git a/nexgb/auto_dri2.go b/nexgb/auto_dri2.go index d48677b..09baef5 100644 --- a/nexgb/auto_dri2.go +++ b/nexgb/auto_dri2.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by dri2.xml on May 8 2012 11:03:23pm EDT. + This file was generated by dri2.xml on May 10 2012 12:39:33pm EDT. This file is automatically generated. Edit at your peril! */ @@ -37,6 +37,10 @@ func init() { newExtErrorFuncs["DRI2"] = make(map[int]newErrorFun) } +// Skipping definition for base type 'Int8' + +// Skipping definition for base type 'Card16' + // Skipping definition for base type 'Char' // Skipping definition for base type 'Card32' @@ -47,8 +51,6 @@ func init() { // Skipping definition for base type 'Float' -// Skipping definition for base type 'Id' - // Skipping definition for base type 'Card8' // Skipping definition for base type 'Int16' @@ -59,10 +61,6 @@ func init() { // Skipping definition for base type 'Byte' -// Skipping definition for base type 'Int8' - -// Skipping definition for base type 'Card16' - const ( Dri2AttachmentBufferFrontLeft = 0 Dri2AttachmentBufferBackLeft = 1 @@ -231,7 +229,7 @@ type Dri2BufferSwapCompleteEvent struct { // padding: 1 bytes EventType uint16 // padding: 2 bytes - Drawable Id + Drawable Drawable UstHi uint32 UstLo uint32 MscHi uint32 @@ -254,7 +252,7 @@ func NewDri2BufferSwapCompleteEvent(buf []byte) Event { b += 2 // padding - v.Drawable = Id(Get32(buf[b:])) + v.Drawable = Drawable(Get32(buf[b:])) b += 4 v.UstHi = Get32(buf[b:]) @@ -345,7 +343,7 @@ const Dri2InvalidateBuffers = 1 type Dri2InvalidateBuffersEvent struct { Sequence uint16 // padding: 1 bytes - Drawable Id + Drawable Drawable } // Event read Dri2InvalidateBuffers @@ -358,7 +356,7 @@ func NewDri2InvalidateBuffersEvent(buf []byte) Event { v.Sequence = Get16(buf[b:]) b += 2 - v.Drawable = Id(Get32(buf[b:])) + v.Drawable = Drawable(Get32(buf[b:])) b += 4 return v @@ -496,13 +494,13 @@ type Dri2ConnectCookie struct { *cookie } -func (c *Conn) Dri2Connect(Window Id, DriverType uint32) Dri2ConnectCookie { +func (c *Conn) Dri2Connect(Window Window, DriverType uint32) Dri2ConnectCookie { cookie := c.newCookie(true, true) c.newRequest(c.dri2ConnectRequest(Window, DriverType), cookie) return Dri2ConnectCookie{cookie} } -func (c *Conn) Dri2ConnectUnchecked(Window Id, DriverType uint32) Dri2ConnectCookie { +func (c *Conn) Dri2ConnectUnchecked(Window Window, DriverType uint32) Dri2ConnectCookie { cookie := c.newCookie(false, true) c.newRequest(c.dri2ConnectRequest(Window, DriverType), cookie) return Dri2ConnectCookie{cookie} @@ -581,7 +579,7 @@ func (cook Dri2ConnectCookie) Check() error { } // Write request to wire for Dri2Connect -func (c *Conn) dri2ConnectRequest(Window Id, DriverType uint32) []byte { +func (c *Conn) dri2ConnectRequest(Window Window, DriverType uint32) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -610,13 +608,13 @@ type Dri2AuthenticateCookie struct { *cookie } -func (c *Conn) Dri2Authenticate(Window Id, Magic uint32) Dri2AuthenticateCookie { +func (c *Conn) Dri2Authenticate(Window Window, Magic uint32) Dri2AuthenticateCookie { cookie := c.newCookie(true, true) c.newRequest(c.dri2AuthenticateRequest(Window, Magic), cookie) return Dri2AuthenticateCookie{cookie} } -func (c *Conn) Dri2AuthenticateUnchecked(Window Id, Magic uint32) Dri2AuthenticateCookie { +func (c *Conn) Dri2AuthenticateUnchecked(Window Window, Magic uint32) Dri2AuthenticateCookie { cookie := c.newCookie(false, true) c.newRequest(c.dri2AuthenticateRequest(Window, Magic), cookie) return Dri2AuthenticateCookie{cookie} @@ -667,7 +665,7 @@ func (cook Dri2AuthenticateCookie) Check() error { } // Write request to wire for Dri2Authenticate -func (c *Conn) dri2AuthenticateRequest(Window Id, Magic uint32) []byte { +func (c *Conn) dri2AuthenticateRequest(Window Window, Magic uint32) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -697,13 +695,13 @@ type Dri2CreateDrawableCookie struct { } // Write request to wire for Dri2CreateDrawable -func (c *Conn) Dri2CreateDrawable(Drawable Id) Dri2CreateDrawableCookie { +func (c *Conn) Dri2CreateDrawable(Drawable Drawable) Dri2CreateDrawableCookie { cookie := c.newCookie(false, false) c.newRequest(c.dri2CreateDrawableRequest(Drawable), cookie) return Dri2CreateDrawableCookie{cookie} } -func (c *Conn) Dri2CreateDrawableChecked(Drawable Id) Dri2CreateDrawableCookie { +func (c *Conn) Dri2CreateDrawableChecked(Drawable Drawable) Dri2CreateDrawableCookie { cookie := c.newCookie(true, false) c.newRequest(c.dri2CreateDrawableRequest(Drawable), cookie) return Dri2CreateDrawableCookie{cookie} @@ -714,7 +712,7 @@ func (cook Dri2CreateDrawableCookie) Check() error { } // Write request to wire for Dri2CreateDrawable -func (c *Conn) dri2CreateDrawableRequest(Drawable Id) []byte { +func (c *Conn) dri2CreateDrawableRequest(Drawable Drawable) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -741,13 +739,13 @@ type Dri2DestroyDrawableCookie struct { } // Write request to wire for Dri2DestroyDrawable -func (c *Conn) Dri2DestroyDrawable(Drawable Id) Dri2DestroyDrawableCookie { +func (c *Conn) Dri2DestroyDrawable(Drawable Drawable) Dri2DestroyDrawableCookie { cookie := c.newCookie(false, false) c.newRequest(c.dri2DestroyDrawableRequest(Drawable), cookie) return Dri2DestroyDrawableCookie{cookie} } -func (c *Conn) Dri2DestroyDrawableChecked(Drawable Id) Dri2DestroyDrawableCookie { +func (c *Conn) Dri2DestroyDrawableChecked(Drawable Drawable) Dri2DestroyDrawableCookie { cookie := c.newCookie(true, false) c.newRequest(c.dri2DestroyDrawableRequest(Drawable), cookie) return Dri2DestroyDrawableCookie{cookie} @@ -758,7 +756,7 @@ func (cook Dri2DestroyDrawableCookie) Check() error { } // Write request to wire for Dri2DestroyDrawable -func (c *Conn) dri2DestroyDrawableRequest(Drawable Id) []byte { +func (c *Conn) dri2DestroyDrawableRequest(Drawable Drawable) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -784,13 +782,13 @@ type Dri2GetBuffersCookie struct { *cookie } -func (c *Conn) Dri2GetBuffers(Drawable Id, Count uint32, Attachments []uint32) Dri2GetBuffersCookie { +func (c *Conn) Dri2GetBuffers(Drawable Drawable, Count uint32, Attachments []uint32) Dri2GetBuffersCookie { cookie := c.newCookie(true, true) c.newRequest(c.dri2GetBuffersRequest(Drawable, Count, Attachments), cookie) return Dri2GetBuffersCookie{cookie} } -func (c *Conn) Dri2GetBuffersUnchecked(Drawable Id, Count uint32, Attachments []uint32) Dri2GetBuffersCookie { +func (c *Conn) Dri2GetBuffersUnchecked(Drawable Drawable, Count uint32, Attachments []uint32) Dri2GetBuffersCookie { cookie := c.newCookie(false, true) c.newRequest(c.dri2GetBuffersRequest(Drawable, Count, Attachments), cookie) return Dri2GetBuffersCookie{cookie} @@ -856,7 +854,7 @@ func (cook Dri2GetBuffersCookie) Check() error { } // Write request to wire for Dri2GetBuffers -func (c *Conn) dri2GetBuffersRequest(Drawable Id, Count uint32, Attachments []uint32) []byte { +func (c *Conn) dri2GetBuffersRequest(Drawable Drawable, Count uint32, Attachments []uint32) []byte { size := pad((12 + pad((len(Attachments) * 4)))) b := 0 buf := make([]byte, size) @@ -891,13 +889,13 @@ type Dri2CopyRegionCookie struct { *cookie } -func (c *Conn) Dri2CopyRegion(Drawable Id, Region uint32, Dest uint32, Src uint32) Dri2CopyRegionCookie { +func (c *Conn) Dri2CopyRegion(Drawable Drawable, Region uint32, Dest uint32, Src uint32) Dri2CopyRegionCookie { cookie := c.newCookie(true, true) c.newRequest(c.dri2CopyRegionRequest(Drawable, Region, Dest, Src), cookie) return Dri2CopyRegionCookie{cookie} } -func (c *Conn) Dri2CopyRegionUnchecked(Drawable Id, Region uint32, Dest uint32, Src uint32) Dri2CopyRegionCookie { +func (c *Conn) Dri2CopyRegionUnchecked(Drawable Drawable, Region uint32, Dest uint32, Src uint32) Dri2CopyRegionCookie { cookie := c.newCookie(false, true) c.newRequest(c.dri2CopyRegionRequest(Drawable, Region, Dest, Src), cookie) return Dri2CopyRegionCookie{cookie} @@ -944,7 +942,7 @@ func (cook Dri2CopyRegionCookie) Check() error { } // Write request to wire for Dri2CopyRegion -func (c *Conn) dri2CopyRegionRequest(Drawable Id, Region uint32, Dest uint32, Src uint32) []byte { +func (c *Conn) dri2CopyRegionRequest(Drawable Drawable, Region uint32, Dest uint32, Src uint32) []byte { size := 20 b := 0 buf := make([]byte, size) @@ -979,13 +977,13 @@ type Dri2GetBuffersWithFormatCookie struct { *cookie } -func (c *Conn) Dri2GetBuffersWithFormat(Drawable Id, Count uint32, Attachments []Dri2AttachFormat) Dri2GetBuffersWithFormatCookie { +func (c *Conn) Dri2GetBuffersWithFormat(Drawable Drawable, Count uint32, Attachments []Dri2AttachFormat) Dri2GetBuffersWithFormatCookie { cookie := c.newCookie(true, true) c.newRequest(c.dri2GetBuffersWithFormatRequest(Drawable, Count, Attachments), cookie) return Dri2GetBuffersWithFormatCookie{cookie} } -func (c *Conn) Dri2GetBuffersWithFormatUnchecked(Drawable Id, Count uint32, Attachments []Dri2AttachFormat) Dri2GetBuffersWithFormatCookie { +func (c *Conn) Dri2GetBuffersWithFormatUnchecked(Drawable Drawable, Count uint32, Attachments []Dri2AttachFormat) Dri2GetBuffersWithFormatCookie { cookie := c.newCookie(false, true) c.newRequest(c.dri2GetBuffersWithFormatRequest(Drawable, Count, Attachments), cookie) return Dri2GetBuffersWithFormatCookie{cookie} @@ -1051,7 +1049,7 @@ func (cook Dri2GetBuffersWithFormatCookie) Check() error { } // Write request to wire for Dri2GetBuffersWithFormat -func (c *Conn) dri2GetBuffersWithFormatRequest(Drawable Id, Count uint32, Attachments []Dri2AttachFormat) []byte { +func (c *Conn) dri2GetBuffersWithFormatRequest(Drawable Drawable, Count uint32, Attachments []Dri2AttachFormat) []byte { size := pad((12 + pad((len(Attachments) * 8)))) b := 0 buf := make([]byte, size) @@ -1082,13 +1080,13 @@ type Dri2SwapBuffersCookie struct { *cookie } -func (c *Conn) Dri2SwapBuffers(Drawable Id, TargetMscHi uint32, TargetMscLo uint32, DivisorHi uint32, DivisorLo uint32, RemainderHi uint32, RemainderLo uint32) Dri2SwapBuffersCookie { +func (c *Conn) Dri2SwapBuffers(Drawable Drawable, TargetMscHi uint32, TargetMscLo uint32, DivisorHi uint32, DivisorLo uint32, RemainderHi uint32, RemainderLo uint32) Dri2SwapBuffersCookie { cookie := c.newCookie(true, true) c.newRequest(c.dri2SwapBuffersRequest(Drawable, TargetMscHi, TargetMscLo, DivisorHi, DivisorLo, RemainderHi, RemainderLo), cookie) return Dri2SwapBuffersCookie{cookie} } -func (c *Conn) Dri2SwapBuffersUnchecked(Drawable Id, TargetMscHi uint32, TargetMscLo uint32, DivisorHi uint32, DivisorLo uint32, RemainderHi uint32, RemainderLo uint32) Dri2SwapBuffersCookie { +func (c *Conn) Dri2SwapBuffersUnchecked(Drawable Drawable, TargetMscHi uint32, TargetMscLo uint32, DivisorHi uint32, DivisorLo uint32, RemainderHi uint32, RemainderLo uint32) Dri2SwapBuffersCookie { cookie := c.newCookie(false, true) c.newRequest(c.dri2SwapBuffersRequest(Drawable, TargetMscHi, TargetMscLo, DivisorHi, DivisorLo, RemainderHi, RemainderLo), cookie) return Dri2SwapBuffersCookie{cookie} @@ -1143,7 +1141,7 @@ func (cook Dri2SwapBuffersCookie) Check() error { } // Write request to wire for Dri2SwapBuffers -func (c *Conn) dri2SwapBuffersRequest(Drawable Id, TargetMscHi uint32, TargetMscLo uint32, DivisorHi uint32, DivisorLo uint32, RemainderHi uint32, RemainderLo uint32) []byte { +func (c *Conn) dri2SwapBuffersRequest(Drawable Drawable, TargetMscHi uint32, TargetMscLo uint32, DivisorHi uint32, DivisorLo uint32, RemainderHi uint32, RemainderLo uint32) []byte { size := 32 b := 0 buf := make([]byte, size) @@ -1187,13 +1185,13 @@ type Dri2GetMSCCookie struct { *cookie } -func (c *Conn) Dri2GetMSC(Drawable Id) Dri2GetMSCCookie { +func (c *Conn) Dri2GetMSC(Drawable Drawable) Dri2GetMSCCookie { cookie := c.newCookie(true, true) c.newRequest(c.dri2GetMSCRequest(Drawable), cookie) return Dri2GetMSCCookie{cookie} } -func (c *Conn) Dri2GetMSCUnchecked(Drawable Id) Dri2GetMSCCookie { +func (c *Conn) Dri2GetMSCUnchecked(Drawable Drawable) Dri2GetMSCCookie { cookie := c.newCookie(false, true) c.newRequest(c.dri2GetMSCRequest(Drawable), cookie) return Dri2GetMSCCookie{cookie} @@ -1264,7 +1262,7 @@ func (cook Dri2GetMSCCookie) Check() error { } // Write request to wire for Dri2GetMSC -func (c *Conn) dri2GetMSCRequest(Drawable Id) []byte { +func (c *Conn) dri2GetMSCRequest(Drawable Drawable) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1290,13 +1288,13 @@ type Dri2WaitMSCCookie struct { *cookie } -func (c *Conn) Dri2WaitMSC(Drawable Id, TargetMscHi uint32, TargetMscLo uint32, DivisorHi uint32, DivisorLo uint32, RemainderHi uint32, RemainderLo uint32) Dri2WaitMSCCookie { +func (c *Conn) Dri2WaitMSC(Drawable Drawable, TargetMscHi uint32, TargetMscLo uint32, DivisorHi uint32, DivisorLo uint32, RemainderHi uint32, RemainderLo uint32) Dri2WaitMSCCookie { cookie := c.newCookie(true, true) c.newRequest(c.dri2WaitMSCRequest(Drawable, TargetMscHi, TargetMscLo, DivisorHi, DivisorLo, RemainderHi, RemainderLo), cookie) return Dri2WaitMSCCookie{cookie} } -func (c *Conn) Dri2WaitMSCUnchecked(Drawable Id, TargetMscHi uint32, TargetMscLo uint32, DivisorHi uint32, DivisorLo uint32, RemainderHi uint32, RemainderLo uint32) Dri2WaitMSCCookie { +func (c *Conn) Dri2WaitMSCUnchecked(Drawable Drawable, TargetMscHi uint32, TargetMscLo uint32, DivisorHi uint32, DivisorLo uint32, RemainderHi uint32, RemainderLo uint32) Dri2WaitMSCCookie { cookie := c.newCookie(false, true) c.newRequest(c.dri2WaitMSCRequest(Drawable, TargetMscHi, TargetMscLo, DivisorHi, DivisorLo, RemainderHi, RemainderLo), cookie) return Dri2WaitMSCCookie{cookie} @@ -1367,7 +1365,7 @@ func (cook Dri2WaitMSCCookie) Check() error { } // Write request to wire for Dri2WaitMSC -func (c *Conn) dri2WaitMSCRequest(Drawable Id, TargetMscHi uint32, TargetMscLo uint32, DivisorHi uint32, DivisorLo uint32, RemainderHi uint32, RemainderLo uint32) []byte { +func (c *Conn) dri2WaitMSCRequest(Drawable Drawable, TargetMscHi uint32, TargetMscLo uint32, DivisorHi uint32, DivisorLo uint32, RemainderHi uint32, RemainderLo uint32) []byte { size := 32 b := 0 buf := make([]byte, size) @@ -1411,13 +1409,13 @@ type Dri2WaitSBCCookie struct { *cookie } -func (c *Conn) Dri2WaitSBC(Drawable Id, TargetSbcHi uint32, TargetSbcLo uint32) Dri2WaitSBCCookie { +func (c *Conn) Dri2WaitSBC(Drawable Drawable, TargetSbcHi uint32, TargetSbcLo uint32) Dri2WaitSBCCookie { cookie := c.newCookie(true, true) c.newRequest(c.dri2WaitSBCRequest(Drawable, TargetSbcHi, TargetSbcLo), cookie) return Dri2WaitSBCCookie{cookie} } -func (c *Conn) Dri2WaitSBCUnchecked(Drawable Id, TargetSbcHi uint32, TargetSbcLo uint32) Dri2WaitSBCCookie { +func (c *Conn) Dri2WaitSBCUnchecked(Drawable Drawable, TargetSbcHi uint32, TargetSbcLo uint32) Dri2WaitSBCCookie { cookie := c.newCookie(false, true) c.newRequest(c.dri2WaitSBCRequest(Drawable, TargetSbcHi, TargetSbcLo), cookie) return Dri2WaitSBCCookie{cookie} @@ -1488,7 +1486,7 @@ func (cook Dri2WaitSBCCookie) Check() error { } // Write request to wire for Dri2WaitSBC -func (c *Conn) dri2WaitSBCRequest(Drawable Id, TargetSbcHi uint32, TargetSbcLo uint32) []byte { +func (c *Conn) dri2WaitSBCRequest(Drawable Drawable, TargetSbcHi uint32, TargetSbcLo uint32) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -1521,13 +1519,13 @@ type Dri2SwapIntervalCookie struct { } // Write request to wire for Dri2SwapInterval -func (c *Conn) Dri2SwapInterval(Drawable Id, Interval uint32) Dri2SwapIntervalCookie { +func (c *Conn) Dri2SwapInterval(Drawable Drawable, Interval uint32) Dri2SwapIntervalCookie { cookie := c.newCookie(false, false) c.newRequest(c.dri2SwapIntervalRequest(Drawable, Interval), cookie) return Dri2SwapIntervalCookie{cookie} } -func (c *Conn) Dri2SwapIntervalChecked(Drawable Id, Interval uint32) Dri2SwapIntervalCookie { +func (c *Conn) Dri2SwapIntervalChecked(Drawable Drawable, Interval uint32) Dri2SwapIntervalCookie { cookie := c.newCookie(true, false) c.newRequest(c.dri2SwapIntervalRequest(Drawable, Interval), cookie) return Dri2SwapIntervalCookie{cookie} @@ -1538,7 +1536,7 @@ func (cook Dri2SwapIntervalCookie) Check() error { } // Write request to wire for Dri2SwapInterval -func (c *Conn) dri2SwapIntervalRequest(Drawable Id, Interval uint32) []byte { +func (c *Conn) dri2SwapIntervalRequest(Drawable Drawable, Interval uint32) []byte { size := 12 b := 0 buf := make([]byte, size) -- cgit v1.2.3-54-g00ecf