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_glx.go | 252 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 149 insertions(+), 103 deletions(-) (limited to 'nexgb/auto_glx.go') diff --git a/nexgb/auto_glx.go b/nexgb/auto_glx.go index d88b1c9..0fe0f61 100644 --- a/nexgb/auto_glx.go +++ b/nexgb/auto_glx.go @@ -1,7 +1,7 @@ package xgb /* - This file was generated by glx.xml on May 8 2012 11:03:23pm EDT. + This file was generated by glx.xml on May 10 2012 12:39:33pm EDT. This file is automatically generated. Edit at your peril! */ @@ -55,8 +55,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' @@ -103,17 +101,65 @@ const ( GlxRmGlSelect = 7170 ) -// Skipping resource definition of 'Pixmap' +type GlxPixmap uint32 + +func (c *Conn) NewGlxPixmapId() (GlxPixmap, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return GlxPixmap(id), nil +} + +type GlxContext uint32 + +func (c *Conn) NewGlxContextId() (GlxContext, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return GlxContext(id), nil +} + +type GlxPbuffer uint32 -// Skipping resource definition of 'Context' +func (c *Conn) NewGlxPbufferId() (GlxPbuffer, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return GlxPbuffer(id), nil +} -// Skipping resource definition of 'Pbuffer' +type GlxWindow uint32 -// Skipping resource definition of 'Window' +func (c *Conn) NewGlxWindowId() (GlxWindow, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return GlxWindow(id), nil +} -// Skipping resource definition of 'Fbconfig' +type GlxFbconfig uint32 -// Skipping resource definition of 'Drawable' +func (c *Conn) NewGlxFbconfigId() (GlxFbconfig, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return GlxFbconfig(id), nil +} + +type GlxDrawable uint32 + +func (c *Conn) NewGlxDrawableId() (GlxDrawable, error) { + id, err := c.NewId() + if err != nil { + return 0, err + } + return GlxDrawable(id), nil +} type GlxFloat32 float64 @@ -133,7 +179,7 @@ type GlxPbufferClobberEvent struct { // padding: 1 bytes EventType uint16 DrawType uint16 - Drawable Id + Drawable GlxDrawable BMask uint32 AuxBuffer uint16 X uint16 @@ -160,7 +206,7 @@ func NewGlxPbufferClobberEvent(buf []byte) Event { v.DrawType = Get16(buf[b:]) b += 2 - v.Drawable = Id(Get32(buf[b:])) + v.Drawable = GlxDrawable(Get32(buf[b:])) b += 4 v.BMask = Get32(buf[b:]) @@ -308,7 +354,7 @@ func (err GlxGenericError) SequenceId() uint16 { return err.Sequence } -func (err GlxGenericError) BadId() Id { +func (err GlxGenericError) BadId() uint32 { return 0 } @@ -344,8 +390,8 @@ func (err GlxBadContextError) SequenceId() uint16 { return err.Sequence } -func (err GlxBadContextError) BadId() Id { - return Id(err.BadValue) +func (err GlxBadContextError) BadId() uint32 { + return 0 } func (err GlxBadContextError) Error() string { @@ -380,8 +426,8 @@ func (err GlxBadContextStateError) SequenceId() uint16 { return err.Sequence } -func (err GlxBadContextStateError) BadId() Id { - return Id(err.BadValue) +func (err GlxBadContextStateError) BadId() uint32 { + return 0 } func (err GlxBadContextStateError) Error() string { @@ -416,8 +462,8 @@ func (err GlxBadDrawableError) SequenceId() uint16 { return err.Sequence } -func (err GlxBadDrawableError) BadId() Id { - return Id(err.BadValue) +func (err GlxBadDrawableError) BadId() uint32 { + return 0 } func (err GlxBadDrawableError) Error() string { @@ -452,8 +498,8 @@ func (err GlxBadPixmapError) SequenceId() uint16 { return err.Sequence } -func (err GlxBadPixmapError) BadId() Id { - return Id(err.BadValue) +func (err GlxBadPixmapError) BadId() uint32 { + return 0 } func (err GlxBadPixmapError) Error() string { @@ -488,8 +534,8 @@ func (err GlxBadContextTagError) SequenceId() uint16 { return err.Sequence } -func (err GlxBadContextTagError) BadId() Id { - return Id(err.BadValue) +func (err GlxBadContextTagError) BadId() uint32 { + return 0 } func (err GlxBadContextTagError) Error() string { @@ -524,8 +570,8 @@ func (err GlxBadCurrentWindowError) SequenceId() uint16 { return err.Sequence } -func (err GlxBadCurrentWindowError) BadId() Id { - return Id(err.BadValue) +func (err GlxBadCurrentWindowError) BadId() uint32 { + return 0 } func (err GlxBadCurrentWindowError) Error() string { @@ -560,8 +606,8 @@ func (err GlxBadRenderRequestError) SequenceId() uint16 { return err.Sequence } -func (err GlxBadRenderRequestError) BadId() Id { - return Id(err.BadValue) +func (err GlxBadRenderRequestError) BadId() uint32 { + return 0 } func (err GlxBadRenderRequestError) Error() string { @@ -596,8 +642,8 @@ func (err GlxBadLargeRequestError) SequenceId() uint16 { return err.Sequence } -func (err GlxBadLargeRequestError) BadId() Id { - return Id(err.BadValue) +func (err GlxBadLargeRequestError) BadId() uint32 { + return 0 } func (err GlxBadLargeRequestError) Error() string { @@ -632,8 +678,8 @@ func (err GlxUnsupportedPrivateRequestError) SequenceId() uint16 { return err.Sequence } -func (err GlxUnsupportedPrivateRequestError) BadId() Id { - return Id(err.BadValue) +func (err GlxUnsupportedPrivateRequestError) BadId() uint32 { + return 0 } func (err GlxUnsupportedPrivateRequestError) Error() string { @@ -668,8 +714,8 @@ func (err GlxBadFBConfigError) SequenceId() uint16 { return err.Sequence } -func (err GlxBadFBConfigError) BadId() Id { - return Id(err.BadValue) +func (err GlxBadFBConfigError) BadId() uint32 { + return 0 } func (err GlxBadFBConfigError) Error() string { @@ -704,8 +750,8 @@ func (err GlxBadPbufferError) SequenceId() uint16 { return err.Sequence } -func (err GlxBadPbufferError) BadId() Id { - return Id(err.BadValue) +func (err GlxBadPbufferError) BadId() uint32 { + return 0 } func (err GlxBadPbufferError) Error() string { @@ -740,8 +786,8 @@ func (err GlxBadCurrentDrawableError) SequenceId() uint16 { return err.Sequence } -func (err GlxBadCurrentDrawableError) BadId() Id { - return Id(err.BadValue) +func (err GlxBadCurrentDrawableError) BadId() uint32 { + return 0 } func (err GlxBadCurrentDrawableError) Error() string { @@ -776,8 +822,8 @@ func (err GlxBadWindowError) SequenceId() uint16 { return err.Sequence } -func (err GlxBadWindowError) BadId() Id { - return Id(err.BadValue) +func (err GlxBadWindowError) BadId() uint32 { + return 0 } func (err GlxBadWindowError) Error() string { @@ -812,8 +858,8 @@ func (err GlxGLXBadProfileARBError) SequenceId() uint16 { return err.Sequence } -func (err GlxGLXBadProfileARBError) BadId() Id { - return Id(err.BadValue) +func (err GlxGLXBadProfileARBError) BadId() uint32 { + return 0 } func (err GlxGLXBadProfileARBError) Error() string { @@ -940,13 +986,13 @@ type GlxCreateContextCookie struct { } // Write request to wire for GlxCreateContext -func (c *Conn) GlxCreateContext(Context Id, Visual Visualid, Screen uint32, ShareList Id, IsDirect bool) GlxCreateContextCookie { +func (c *Conn) GlxCreateContext(Context GlxContext, Visual Visualid, Screen uint32, ShareList GlxContext, IsDirect bool) GlxCreateContextCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxCreateContextRequest(Context, Visual, Screen, ShareList, IsDirect), cookie) return GlxCreateContextCookie{cookie} } -func (c *Conn) GlxCreateContextChecked(Context Id, Visual Visualid, Screen uint32, ShareList Id, IsDirect bool) GlxCreateContextCookie { +func (c *Conn) GlxCreateContextChecked(Context GlxContext, Visual Visualid, Screen uint32, ShareList GlxContext, IsDirect bool) GlxCreateContextCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxCreateContextRequest(Context, Visual, Screen, ShareList, IsDirect), cookie) return GlxCreateContextCookie{cookie} @@ -957,7 +1003,7 @@ func (cook GlxCreateContextCookie) Check() error { } // Write request to wire for GlxCreateContext -func (c *Conn) glxCreateContextRequest(Context Id, Visual Visualid, Screen uint32, ShareList Id, IsDirect bool) []byte { +func (c *Conn) glxCreateContextRequest(Context GlxContext, Visual Visualid, Screen uint32, ShareList GlxContext, IsDirect bool) []byte { size := 24 b := 0 buf := make([]byte, size) @@ -1002,13 +1048,13 @@ type GlxDestroyContextCookie struct { } // Write request to wire for GlxDestroyContext -func (c *Conn) GlxDestroyContext(Context Id) GlxDestroyContextCookie { +func (c *Conn) GlxDestroyContext(Context GlxContext) GlxDestroyContextCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxDestroyContextRequest(Context), cookie) return GlxDestroyContextCookie{cookie} } -func (c *Conn) GlxDestroyContextChecked(Context Id) GlxDestroyContextCookie { +func (c *Conn) GlxDestroyContextChecked(Context GlxContext) GlxDestroyContextCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxDestroyContextRequest(Context), cookie) return GlxDestroyContextCookie{cookie} @@ -1019,7 +1065,7 @@ func (cook GlxDestroyContextCookie) Check() error { } // Write request to wire for GlxDestroyContext -func (c *Conn) glxDestroyContextRequest(Context Id) []byte { +func (c *Conn) glxDestroyContextRequest(Context GlxContext) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1045,13 +1091,13 @@ type GlxMakeCurrentCookie struct { *cookie } -func (c *Conn) GlxMakeCurrent(Drawable Id, Context Id, OldContextTag GlxContextTag) GlxMakeCurrentCookie { +func (c *Conn) GlxMakeCurrent(Drawable GlxDrawable, Context GlxContext, OldContextTag GlxContextTag) GlxMakeCurrentCookie { cookie := c.newCookie(true, true) c.newRequest(c.glxMakeCurrentRequest(Drawable, Context, OldContextTag), cookie) return GlxMakeCurrentCookie{cookie} } -func (c *Conn) GlxMakeCurrentUnchecked(Drawable Id, Context Id, OldContextTag GlxContextTag) GlxMakeCurrentCookie { +func (c *Conn) GlxMakeCurrentUnchecked(Drawable GlxDrawable, Context GlxContext, OldContextTag GlxContextTag) GlxMakeCurrentCookie { cookie := c.newCookie(false, true) c.newRequest(c.glxMakeCurrentRequest(Drawable, Context, OldContextTag), cookie) return GlxMakeCurrentCookie{cookie} @@ -1105,7 +1151,7 @@ func (cook GlxMakeCurrentCookie) Check() error { } // Write request to wire for GlxMakeCurrent -func (c *Conn) glxMakeCurrentRequest(Drawable Id, Context Id, OldContextTag GlxContextTag) []byte { +func (c *Conn) glxMakeCurrentRequest(Drawable GlxDrawable, Context GlxContext, OldContextTag GlxContextTag) []byte { size := 16 b := 0 buf := make([]byte, size) @@ -1137,13 +1183,13 @@ type GlxIsDirectCookie struct { *cookie } -func (c *Conn) GlxIsDirect(Context Id) GlxIsDirectCookie { +func (c *Conn) GlxIsDirect(Context GlxContext) GlxIsDirectCookie { cookie := c.newCookie(true, true) c.newRequest(c.glxIsDirectRequest(Context), cookie) return GlxIsDirectCookie{cookie} } -func (c *Conn) GlxIsDirectUnchecked(Context Id) GlxIsDirectCookie { +func (c *Conn) GlxIsDirectUnchecked(Context GlxContext) GlxIsDirectCookie { cookie := c.newCookie(false, true) c.newRequest(c.glxIsDirectRequest(Context), cookie) return GlxIsDirectCookie{cookie} @@ -1201,7 +1247,7 @@ func (cook GlxIsDirectCookie) Check() error { } // Write request to wire for GlxIsDirect -func (c *Conn) glxIsDirectRequest(Context Id) []byte { +func (c *Conn) glxIsDirectRequest(Context GlxContext) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -1409,13 +1455,13 @@ type GlxCopyContextCookie struct { } // Write request to wire for GlxCopyContext -func (c *Conn) GlxCopyContext(Src Id, Dest Id, Mask uint32, SrcContextTag GlxContextTag) GlxCopyContextCookie { +func (c *Conn) GlxCopyContext(Src GlxContext, Dest GlxContext, Mask uint32, SrcContextTag GlxContextTag) GlxCopyContextCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxCopyContextRequest(Src, Dest, Mask, SrcContextTag), cookie) return GlxCopyContextCookie{cookie} } -func (c *Conn) GlxCopyContextChecked(Src Id, Dest Id, Mask uint32, SrcContextTag GlxContextTag) GlxCopyContextCookie { +func (c *Conn) GlxCopyContextChecked(Src GlxContext, Dest GlxContext, Mask uint32, SrcContextTag GlxContextTag) GlxCopyContextCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxCopyContextRequest(Src, Dest, Mask, SrcContextTag), cookie) return GlxCopyContextCookie{cookie} @@ -1426,7 +1472,7 @@ func (cook GlxCopyContextCookie) Check() error { } // Write request to wire for GlxCopyContext -func (c *Conn) glxCopyContextRequest(Src Id, Dest Id, Mask uint32, SrcContextTag GlxContextTag) []byte { +func (c *Conn) glxCopyContextRequest(Src GlxContext, Dest GlxContext, Mask uint32, SrcContextTag GlxContextTag) []byte { size := 20 b := 0 buf := make([]byte, size) @@ -1462,13 +1508,13 @@ type GlxSwapBuffersCookie struct { } // Write request to wire for GlxSwapBuffers -func (c *Conn) GlxSwapBuffers(ContextTag GlxContextTag, Drawable Id) GlxSwapBuffersCookie { +func (c *Conn) GlxSwapBuffers(ContextTag GlxContextTag, Drawable GlxDrawable) GlxSwapBuffersCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxSwapBuffersRequest(ContextTag, Drawable), cookie) return GlxSwapBuffersCookie{cookie} } -func (c *Conn) GlxSwapBuffersChecked(ContextTag GlxContextTag, Drawable Id) GlxSwapBuffersCookie { +func (c *Conn) GlxSwapBuffersChecked(ContextTag GlxContextTag, Drawable GlxDrawable) GlxSwapBuffersCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxSwapBuffersRequest(ContextTag, Drawable), cookie) return GlxSwapBuffersCookie{cookie} @@ -1479,7 +1525,7 @@ func (cook GlxSwapBuffersCookie) Check() error { } // Write request to wire for GlxSwapBuffers -func (c *Conn) glxSwapBuffersRequest(ContextTag GlxContextTag, Drawable Id) []byte { +func (c *Conn) glxSwapBuffersRequest(ContextTag GlxContextTag, Drawable GlxDrawable) []byte { size := 12 b := 0 buf := make([]byte, size) @@ -1509,13 +1555,13 @@ type GlxUseXFontCookie struct { } // Write request to wire for GlxUseXFont -func (c *Conn) GlxUseXFont(ContextTag GlxContextTag, Font Id, First uint32, Count uint32, ListBase uint32) GlxUseXFontCookie { +func (c *Conn) GlxUseXFont(ContextTag GlxContextTag, Font Font, First uint32, Count uint32, ListBase uint32) GlxUseXFontCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxUseXFontRequest(ContextTag, Font, First, Count, ListBase), cookie) return GlxUseXFontCookie{cookie} } -func (c *Conn) GlxUseXFontChecked(ContextTag GlxContextTag, Font Id, First uint32, Count uint32, ListBase uint32) GlxUseXFontCookie { +func (c *Conn) GlxUseXFontChecked(ContextTag GlxContextTag, Font Font, First uint32, Count uint32, ListBase uint32) GlxUseXFontCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxUseXFontRequest(ContextTag, Font, First, Count, ListBase), cookie) return GlxUseXFontCookie{cookie} @@ -1526,7 +1572,7 @@ func (cook GlxUseXFontCookie) Check() error { } // Write request to wire for GlxUseXFont -func (c *Conn) glxUseXFontRequest(ContextTag GlxContextTag, Font Id, First uint32, Count uint32, ListBase uint32) []byte { +func (c *Conn) glxUseXFontRequest(ContextTag GlxContextTag, Font Font, First uint32, Count uint32, ListBase uint32) []byte { size := 24 b := 0 buf := make([]byte, size) @@ -1565,13 +1611,13 @@ type GlxCreateGLXPixmapCookie struct { } // Write request to wire for GlxCreateGLXPixmap -func (c *Conn) GlxCreateGLXPixmap(Screen uint32, Visual Visualid, Pixmap Id, GlxPixmap Id) GlxCreateGLXPixmapCookie { +func (c *Conn) GlxCreateGLXPixmap(Screen uint32, Visual Visualid, Pixmap Pixmap, GlxPixmap GlxPixmap) GlxCreateGLXPixmapCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxCreateGLXPixmapRequest(Screen, Visual, Pixmap, GlxPixmap), cookie) return GlxCreateGLXPixmapCookie{cookie} } -func (c *Conn) GlxCreateGLXPixmapChecked(Screen uint32, Visual Visualid, Pixmap Id, GlxPixmap Id) GlxCreateGLXPixmapCookie { +func (c *Conn) GlxCreateGLXPixmapChecked(Screen uint32, Visual Visualid, Pixmap Pixmap, GlxPixmap GlxPixmap) GlxCreateGLXPixmapCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxCreateGLXPixmapRequest(Screen, Visual, Pixmap, GlxPixmap), cookie) return GlxCreateGLXPixmapCookie{cookie} @@ -1582,7 +1628,7 @@ func (cook GlxCreateGLXPixmapCookie) Check() error { } // Write request to wire for GlxCreateGLXPixmap -func (c *Conn) glxCreateGLXPixmapRequest(Screen uint32, Visual Visualid, Pixmap Id, GlxPixmap Id) []byte { +func (c *Conn) glxCreateGLXPixmapRequest(Screen uint32, Visual Visualid, Pixmap Pixmap, GlxPixmap GlxPixmap) []byte { size := 20 b := 0 buf := make([]byte, size) @@ -1716,13 +1762,13 @@ type GlxDestroyGLXPixmapCookie struct { } // Write request to wire for GlxDestroyGLXPixmap -func (c *Conn) GlxDestroyGLXPixmap(GlxPixmap Id) GlxDestroyGLXPixmapCookie { +func (c *Conn) GlxDestroyGLXPixmap(GlxPixmap GlxPixmap) GlxDestroyGLXPixmapCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxDestroyGLXPixmapRequest(GlxPixmap), cookie) return GlxDestroyGLXPixmapCookie{cookie} } -func (c *Conn) GlxDestroyGLXPixmapChecked(GlxPixmap Id) GlxDestroyGLXPixmapCookie { +func (c *Conn) GlxDestroyGLXPixmapChecked(GlxPixmap GlxPixmap) GlxDestroyGLXPixmapCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxDestroyGLXPixmapRequest(GlxPixmap), cookie) return GlxDestroyGLXPixmapCookie{cookie} @@ -1733,7 +1779,7 @@ func (cook GlxDestroyGLXPixmapCookie) Check() error { } // Write request to wire for GlxDestroyGLXPixmap -func (c *Conn) glxDestroyGLXPixmapRequest(GlxPixmap Id) []byte { +func (c *Conn) glxDestroyGLXPixmapRequest(GlxPixmap GlxPixmap) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -2249,13 +2295,13 @@ type GlxCreatePixmapCookie struct { } // Write request to wire for GlxCreatePixmap -func (c *Conn) GlxCreatePixmap(Screen uint32, Fbconfig Id, Pixmap Id, GlxPixmap Id, NumAttribs uint32, Attribs []uint32) GlxCreatePixmapCookie { +func (c *Conn) GlxCreatePixmap(Screen uint32, Fbconfig GlxFbconfig, Pixmap Pixmap, GlxPixmap GlxPixmap, NumAttribs uint32, Attribs []uint32) GlxCreatePixmapCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxCreatePixmapRequest(Screen, Fbconfig, Pixmap, GlxPixmap, NumAttribs, Attribs), cookie) return GlxCreatePixmapCookie{cookie} } -func (c *Conn) GlxCreatePixmapChecked(Screen uint32, Fbconfig Id, Pixmap Id, GlxPixmap Id, NumAttribs uint32, Attribs []uint32) GlxCreatePixmapCookie { +func (c *Conn) GlxCreatePixmapChecked(Screen uint32, Fbconfig GlxFbconfig, Pixmap Pixmap, GlxPixmap GlxPixmap, NumAttribs uint32, Attribs []uint32) GlxCreatePixmapCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxCreatePixmapRequest(Screen, Fbconfig, Pixmap, GlxPixmap, NumAttribs, Attribs), cookie) return GlxCreatePixmapCookie{cookie} @@ -2266,7 +2312,7 @@ func (cook GlxCreatePixmapCookie) Check() error { } // Write request to wire for GlxCreatePixmap -func (c *Conn) glxCreatePixmapRequest(Screen uint32, Fbconfig Id, Pixmap Id, GlxPixmap Id, NumAttribs uint32, Attribs []uint32) []byte { +func (c *Conn) glxCreatePixmapRequest(Screen uint32, Fbconfig GlxFbconfig, Pixmap Pixmap, GlxPixmap GlxPixmap, NumAttribs uint32, Attribs []uint32) []byte { size := pad((24 + pad(((int(NumAttribs) * 2) * 4)))) b := 0 buf := make([]byte, size) @@ -2311,13 +2357,13 @@ type GlxDestroyPixmapCookie struct { } // Write request to wire for GlxDestroyPixmap -func (c *Conn) GlxDestroyPixmap(GlxPixmap Id) GlxDestroyPixmapCookie { +func (c *Conn) GlxDestroyPixmap(GlxPixmap GlxPixmap) GlxDestroyPixmapCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxDestroyPixmapRequest(GlxPixmap), cookie) return GlxDestroyPixmapCookie{cookie} } -func (c *Conn) GlxDestroyPixmapChecked(GlxPixmap Id) GlxDestroyPixmapCookie { +func (c *Conn) GlxDestroyPixmapChecked(GlxPixmap GlxPixmap) GlxDestroyPixmapCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxDestroyPixmapRequest(GlxPixmap), cookie) return GlxDestroyPixmapCookie{cookie} @@ -2328,7 +2374,7 @@ func (cook GlxDestroyPixmapCookie) Check() error { } // Write request to wire for GlxDestroyPixmap -func (c *Conn) glxDestroyPixmapRequest(GlxPixmap Id) []byte { +func (c *Conn) glxDestroyPixmapRequest(GlxPixmap GlxPixmap) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -2355,13 +2401,13 @@ type GlxCreateNewContextCookie struct { } // Write request to wire for GlxCreateNewContext -func (c *Conn) GlxCreateNewContext(Context Id, Fbconfig Id, Screen uint32, RenderType uint32, ShareList Id, IsDirect bool) GlxCreateNewContextCookie { +func (c *Conn) GlxCreateNewContext(Context GlxContext, Fbconfig GlxFbconfig, Screen uint32, RenderType uint32, ShareList GlxContext, IsDirect bool) GlxCreateNewContextCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxCreateNewContextRequest(Context, Fbconfig, Screen, RenderType, ShareList, IsDirect), cookie) return GlxCreateNewContextCookie{cookie} } -func (c *Conn) GlxCreateNewContextChecked(Context Id, Fbconfig Id, Screen uint32, RenderType uint32, ShareList Id, IsDirect bool) GlxCreateNewContextCookie { +func (c *Conn) GlxCreateNewContextChecked(Context GlxContext, Fbconfig GlxFbconfig, Screen uint32, RenderType uint32, ShareList GlxContext, IsDirect bool) GlxCreateNewContextCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxCreateNewContextRequest(Context, Fbconfig, Screen, RenderType, ShareList, IsDirect), cookie) return GlxCreateNewContextCookie{cookie} @@ -2372,7 +2418,7 @@ func (cook GlxCreateNewContextCookie) Check() error { } // Write request to wire for GlxCreateNewContext -func (c *Conn) glxCreateNewContextRequest(Context Id, Fbconfig Id, Screen uint32, RenderType uint32, ShareList Id, IsDirect bool) []byte { +func (c *Conn) glxCreateNewContextRequest(Context GlxContext, Fbconfig GlxFbconfig, Screen uint32, RenderType uint32, ShareList GlxContext, IsDirect bool) []byte { size := 28 b := 0 buf := make([]byte, size) @@ -2419,13 +2465,13 @@ type GlxQueryContextCookie struct { *cookie } -func (c *Conn) GlxQueryContext(Context Id) GlxQueryContextCookie { +func (c *Conn) GlxQueryContext(Context GlxContext) GlxQueryContextCookie { cookie := c.newCookie(true, true) c.newRequest(c.glxQueryContextRequest(Context), cookie) return GlxQueryContextCookie{cookie} } -func (c *Conn) GlxQueryContextUnchecked(Context Id) GlxQueryContextCookie { +func (c *Conn) GlxQueryContextUnchecked(Context GlxContext) GlxQueryContextCookie { cookie := c.newCookie(false, true) c.newRequest(c.glxQueryContextRequest(Context), cookie) return GlxQueryContextCookie{cookie} @@ -2487,7 +2533,7 @@ func (cook GlxQueryContextCookie) Check() error { } // Write request to wire for GlxQueryContext -func (c *Conn) glxQueryContextRequest(Context Id) []byte { +func (c *Conn) glxQueryContextRequest(Context GlxContext) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -2513,13 +2559,13 @@ type GlxMakeContextCurrentCookie struct { *cookie } -func (c *Conn) GlxMakeContextCurrent(OldContextTag GlxContextTag, Drawable Id, ReadDrawable Id, Context Id) GlxMakeContextCurrentCookie { +func (c *Conn) GlxMakeContextCurrent(OldContextTag GlxContextTag, Drawable GlxDrawable, ReadDrawable GlxDrawable, Context GlxContext) GlxMakeContextCurrentCookie { cookie := c.newCookie(true, true) c.newRequest(c.glxMakeContextCurrentRequest(OldContextTag, Drawable, ReadDrawable, Context), cookie) return GlxMakeContextCurrentCookie{cookie} } -func (c *Conn) GlxMakeContextCurrentUnchecked(OldContextTag GlxContextTag, Drawable Id, ReadDrawable Id, Context Id) GlxMakeContextCurrentCookie { +func (c *Conn) GlxMakeContextCurrentUnchecked(OldContextTag GlxContextTag, Drawable GlxDrawable, ReadDrawable GlxDrawable, Context GlxContext) GlxMakeContextCurrentCookie { cookie := c.newCookie(false, true) c.newRequest(c.glxMakeContextCurrentRequest(OldContextTag, Drawable, ReadDrawable, Context), cookie) return GlxMakeContextCurrentCookie{cookie} @@ -2573,7 +2619,7 @@ func (cook GlxMakeContextCurrentCookie) Check() error { } // Write request to wire for GlxMakeContextCurrent -func (c *Conn) glxMakeContextCurrentRequest(OldContextTag GlxContextTag, Drawable Id, ReadDrawable Id, Context Id) []byte { +func (c *Conn) glxMakeContextCurrentRequest(OldContextTag GlxContextTag, Drawable GlxDrawable, ReadDrawable GlxDrawable, Context GlxContext) []byte { size := 20 b := 0 buf := make([]byte, size) @@ -2609,13 +2655,13 @@ type GlxCreatePbufferCookie struct { } // Write request to wire for GlxCreatePbuffer -func (c *Conn) GlxCreatePbuffer(Screen uint32, Fbconfig Id, Pbuffer Id, NumAttribs uint32, Attribs []uint32) GlxCreatePbufferCookie { +func (c *Conn) GlxCreatePbuffer(Screen uint32, Fbconfig GlxFbconfig, Pbuffer GlxPbuffer, NumAttribs uint32, Attribs []uint32) GlxCreatePbufferCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxCreatePbufferRequest(Screen, Fbconfig, Pbuffer, NumAttribs, Attribs), cookie) return GlxCreatePbufferCookie{cookie} } -func (c *Conn) GlxCreatePbufferChecked(Screen uint32, Fbconfig Id, Pbuffer Id, NumAttribs uint32, Attribs []uint32) GlxCreatePbufferCookie { +func (c *Conn) GlxCreatePbufferChecked(Screen uint32, Fbconfig GlxFbconfig, Pbuffer GlxPbuffer, NumAttribs uint32, Attribs []uint32) GlxCreatePbufferCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxCreatePbufferRequest(Screen, Fbconfig, Pbuffer, NumAttribs, Attribs), cookie) return GlxCreatePbufferCookie{cookie} @@ -2626,7 +2672,7 @@ func (cook GlxCreatePbufferCookie) Check() error { } // Write request to wire for GlxCreatePbuffer -func (c *Conn) glxCreatePbufferRequest(Screen uint32, Fbconfig Id, Pbuffer Id, NumAttribs uint32, Attribs []uint32) []byte { +func (c *Conn) glxCreatePbufferRequest(Screen uint32, Fbconfig GlxFbconfig, Pbuffer GlxPbuffer, NumAttribs uint32, Attribs []uint32) []byte { size := pad((20 + pad(((int(NumAttribs) * 2) * 4)))) b := 0 buf := make([]byte, size) @@ -2668,13 +2714,13 @@ type GlxDestroyPbufferCookie struct { } // Write request to wire for GlxDestroyPbuffer -func (c *Conn) GlxDestroyPbuffer(Pbuffer Id) GlxDestroyPbufferCookie { +func (c *Conn) GlxDestroyPbuffer(Pbuffer GlxPbuffer) GlxDestroyPbufferCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxDestroyPbufferRequest(Pbuffer), cookie) return GlxDestroyPbufferCookie{cookie} } -func (c *Conn) GlxDestroyPbufferChecked(Pbuffer Id) GlxDestroyPbufferCookie { +func (c *Conn) GlxDestroyPbufferChecked(Pbuffer GlxPbuffer) GlxDestroyPbufferCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxDestroyPbufferRequest(Pbuffer), cookie) return GlxDestroyPbufferCookie{cookie} @@ -2685,7 +2731,7 @@ func (cook GlxDestroyPbufferCookie) Check() error { } // Write request to wire for GlxDestroyPbuffer -func (c *Conn) glxDestroyPbufferRequest(Pbuffer Id) []byte { +func (c *Conn) glxDestroyPbufferRequest(Pbuffer GlxPbuffer) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -2711,13 +2757,13 @@ type GlxGetDrawableAttributesCookie struct { *cookie } -func (c *Conn) GlxGetDrawableAttributes(Drawable Id) GlxGetDrawableAttributesCookie { +func (c *Conn) GlxGetDrawableAttributes(Drawable GlxDrawable) GlxGetDrawableAttributesCookie { cookie := c.newCookie(true, true) c.newRequest(c.glxGetDrawableAttributesRequest(Drawable), cookie) return GlxGetDrawableAttributesCookie{cookie} } -func (c *Conn) GlxGetDrawableAttributesUnchecked(Drawable Id) GlxGetDrawableAttributesCookie { +func (c *Conn) GlxGetDrawableAttributesUnchecked(Drawable GlxDrawable) GlxGetDrawableAttributesCookie { cookie := c.newCookie(false, true) c.newRequest(c.glxGetDrawableAttributesRequest(Drawable), cookie) return GlxGetDrawableAttributesCookie{cookie} @@ -2779,7 +2825,7 @@ func (cook GlxGetDrawableAttributesCookie) Check() error { } // Write request to wire for GlxGetDrawableAttributes -func (c *Conn) glxGetDrawableAttributesRequest(Drawable Id) []byte { +func (c *Conn) glxGetDrawableAttributesRequest(Drawable GlxDrawable) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -2806,13 +2852,13 @@ type GlxChangeDrawableAttributesCookie struct { } // Write request to wire for GlxChangeDrawableAttributes -func (c *Conn) GlxChangeDrawableAttributes(Drawable Id, NumAttribs uint32, Attribs []uint32) GlxChangeDrawableAttributesCookie { +func (c *Conn) GlxChangeDrawableAttributes(Drawable GlxDrawable, NumAttribs uint32, Attribs []uint32) GlxChangeDrawableAttributesCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxChangeDrawableAttributesRequest(Drawable, NumAttribs, Attribs), cookie) return GlxChangeDrawableAttributesCookie{cookie} } -func (c *Conn) GlxChangeDrawableAttributesChecked(Drawable Id, NumAttribs uint32, Attribs []uint32) GlxChangeDrawableAttributesCookie { +func (c *Conn) GlxChangeDrawableAttributesChecked(Drawable GlxDrawable, NumAttribs uint32, Attribs []uint32) GlxChangeDrawableAttributesCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxChangeDrawableAttributesRequest(Drawable, NumAttribs, Attribs), cookie) return GlxChangeDrawableAttributesCookie{cookie} @@ -2823,7 +2869,7 @@ func (cook GlxChangeDrawableAttributesCookie) Check() error { } // Write request to wire for GlxChangeDrawableAttributes -func (c *Conn) glxChangeDrawableAttributesRequest(Drawable Id, NumAttribs uint32, Attribs []uint32) []byte { +func (c *Conn) glxChangeDrawableAttributesRequest(Drawable GlxDrawable, NumAttribs uint32, Attribs []uint32) []byte { size := pad((12 + pad(((int(NumAttribs) * 2) * 4)))) b := 0 buf := make([]byte, size) @@ -2859,13 +2905,13 @@ type GlxCreateWindowCookie struct { } // Write request to wire for GlxCreateWindow -func (c *Conn) GlxCreateWindow(Screen uint32, Fbconfig Id, Window Id, GlxWindow Id, NumAttribs uint32, Attribs []uint32) GlxCreateWindowCookie { +func (c *Conn) GlxCreateWindow(Screen uint32, Fbconfig GlxFbconfig, Window Window, GlxWindow GlxWindow, NumAttribs uint32, Attribs []uint32) GlxCreateWindowCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxCreateWindowRequest(Screen, Fbconfig, Window, GlxWindow, NumAttribs, Attribs), cookie) return GlxCreateWindowCookie{cookie} } -func (c *Conn) GlxCreateWindowChecked(Screen uint32, Fbconfig Id, Window Id, GlxWindow Id, NumAttribs uint32, Attribs []uint32) GlxCreateWindowCookie { +func (c *Conn) GlxCreateWindowChecked(Screen uint32, Fbconfig GlxFbconfig, Window Window, GlxWindow GlxWindow, NumAttribs uint32, Attribs []uint32) GlxCreateWindowCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxCreateWindowRequest(Screen, Fbconfig, Window, GlxWindow, NumAttribs, Attribs), cookie) return GlxCreateWindowCookie{cookie} @@ -2876,7 +2922,7 @@ func (cook GlxCreateWindowCookie) Check() error { } // Write request to wire for GlxCreateWindow -func (c *Conn) glxCreateWindowRequest(Screen uint32, Fbconfig Id, Window Id, GlxWindow Id, NumAttribs uint32, Attribs []uint32) []byte { +func (c *Conn) glxCreateWindowRequest(Screen uint32, Fbconfig GlxFbconfig, Window Window, GlxWindow GlxWindow, NumAttribs uint32, Attribs []uint32) []byte { size := pad((24 + pad(((int(NumAttribs) * 2) * 4)))) b := 0 buf := make([]byte, size) @@ -2921,13 +2967,13 @@ type GlxDeleteWindowCookie struct { } // Write request to wire for GlxDeleteWindow -func (c *Conn) GlxDeleteWindow(Glxwindow Id) GlxDeleteWindowCookie { +func (c *Conn) GlxDeleteWindow(Glxwindow GlxWindow) GlxDeleteWindowCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxDeleteWindowRequest(Glxwindow), cookie) return GlxDeleteWindowCookie{cookie} } -func (c *Conn) GlxDeleteWindowChecked(Glxwindow Id) GlxDeleteWindowCookie { +func (c *Conn) GlxDeleteWindowChecked(Glxwindow GlxWindow) GlxDeleteWindowCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxDeleteWindowRequest(Glxwindow), cookie) return GlxDeleteWindowCookie{cookie} @@ -2938,7 +2984,7 @@ func (cook GlxDeleteWindowCookie) Check() error { } // Write request to wire for GlxDeleteWindow -func (c *Conn) glxDeleteWindowRequest(Glxwindow Id) []byte { +func (c *Conn) glxDeleteWindowRequest(Glxwindow GlxWindow) []byte { size := 8 b := 0 buf := make([]byte, size) @@ -3033,13 +3079,13 @@ type GlxCreateContextAttribsARBCookie struct { } // Write request to wire for GlxCreateContextAttribsARB -func (c *Conn) GlxCreateContextAttribsARB(Context Id, Fbconfig Id, Screen uint32, ShareList Id, IsDirect bool, NumAttribs uint32, Attribs []uint32) GlxCreateContextAttribsARBCookie { +func (c *Conn) GlxCreateContextAttribsARB(Context GlxContext, Fbconfig GlxFbconfig, Screen uint32, ShareList GlxContext, IsDirect bool, NumAttribs uint32, Attribs []uint32) GlxCreateContextAttribsARBCookie { cookie := c.newCookie(false, false) c.newRequest(c.glxCreateContextAttribsARBRequest(Context, Fbconfig, Screen, ShareList, IsDirect, NumAttribs, Attribs), cookie) return GlxCreateContextAttribsARBCookie{cookie} } -func (c *Conn) GlxCreateContextAttribsARBChecked(Context Id, Fbconfig Id, Screen uint32, ShareList Id, IsDirect bool, NumAttribs uint32, Attribs []uint32) GlxCreateContextAttribsARBCookie { +func (c *Conn) GlxCreateContextAttribsARBChecked(Context GlxContext, Fbconfig GlxFbconfig, Screen uint32, ShareList GlxContext, IsDirect bool, NumAttribs uint32, Attribs []uint32) GlxCreateContextAttribsARBCookie { cookie := c.newCookie(true, false) c.newRequest(c.glxCreateContextAttribsARBRequest(Context, Fbconfig, Screen, ShareList, IsDirect, NumAttribs, Attribs), cookie) return GlxCreateContextAttribsARBCookie{cookie} @@ -3050,7 +3096,7 @@ func (cook GlxCreateContextAttribsARBCookie) Check() error { } // Write request to wire for GlxCreateContextAttribsARB -func (c *Conn) glxCreateContextAttribsARBRequest(Context Id, Fbconfig Id, Screen uint32, ShareList Id, IsDirect bool, NumAttribs uint32, Attribs []uint32) []byte { +func (c *Conn) glxCreateContextAttribsARBRequest(Context GlxContext, Fbconfig GlxFbconfig, Screen uint32, ShareList GlxContext, IsDirect bool, NumAttribs uint32, Attribs []uint32) []byte { size := pad((28 + pad(((int(NumAttribs) * 2) * 4)))) b := 0 buf := make([]byte, size) -- cgit v1.2.3