make resource ids their own individual types. last commit before overhaul to sub-packages

1 files changed, 94 insertions, 72 deletions

diff --git a/nexgb/auto_sync.go b/nexgb/auto_sync.go
index b043b9f..2fc2982 100644
--- a/nexgb/auto_sync.go
+++ b/nexgb/auto_sync.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by sync.xml on May 8 2012 11:03:24pm EDT.
+	This file was generated by sync.xml on May 10 2012 12:39:34pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -37,18 +37,6 @@ func init() {
 	newExtErrorFuncs["SYNC"] = make(map[int]newErrorFun)
 }
 
-// Skipping definition for base type 'Card8'
-
-// Skipping definition for base type 'Int16'
-
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
-// Skipping definition for base type 'Int8'
-
 // Skipping definition for base type 'Card16'
 
 // Skipping definition for base type 'Char'
@@ -61,7 +49,17 @@ 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'
+
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
+// Skipping definition for base type 'Int8'
 
 const (
 	SyncAlarmstateActive    = 0
@@ -90,11 +88,35 @@ const (
 	SyncCaEvents    = 32
 )
 
-// Skipping resource definition of 'Alarm'
+type SyncAlarm uint32
+
+func (c *Conn) NewSyncAlarmId() (SyncAlarm, error) {
+	id, err := c.NewId()
+	if err != nil {
+		return 0, err
+	}
+	return SyncAlarm(id), nil
+}
 
-// Skipping resource definition of 'Counter'
+type SyncCounter uint32
 
-// Skipping resource definition of 'Fence'
+func (c *Conn) NewSyncCounterId() (SyncCounter, error) {
+	id, err := c.NewId()
+	if err != nil {
+		return 0, err
+	}
+	return SyncCounter(id), nil
+}
+
+type SyncFence uint32
+
+func (c *Conn) NewSyncFenceId() (SyncFence, error) {
+	id, err := c.NewId()
+	if err != nil {
+		return 0, err
+	}
+	return SyncFence(id), nil
+}
 
 // 'SyncInt64' struct definition
 // Size: 8
@@ -155,7 +177,7 @@ func SyncInt64ListBytes(buf []byte, list []SyncInt64) int {
 // 'SyncSystemcounter' struct definition
 // Size: (14 + pad((int(NameLen) * 1)))
 type SyncSystemcounter struct {
-	Counter    Id
+	Counter    SyncCounter
 	Resolution SyncInt64
 	NameLen    uint16
 	Name       string // size: pad((int(NameLen) * 1))
@@ -165,7 +187,7 @@ type SyncSystemcounter struct {
 func ReadSyncSystemcounter(buf []byte, v *SyncSystemcounter) int {
 	b := 0
 
-	v.Counter = Id(Get32(buf[b:]))
+	v.Counter = SyncCounter(Get32(buf[b:]))
 	b += 4
 
 	v.Resolution = SyncInt64{}
@@ -241,7 +263,7 @@ func SyncSystemcounterListSize(list []SyncSystemcounter) int {
 // 'SyncTrigger' struct definition
 // Size: 20
 type SyncTrigger struct {
-	Counter   Id
+	Counter   SyncCounter
 	WaitType  uint32
 	WaitValue SyncInt64
 	TestType  uint32
@@ -251,7 +273,7 @@ type SyncTrigger struct {
 func ReadSyncTrigger(buf []byte, v *SyncTrigger) int {
 	b := 0
 
-	v.Counter = Id(Get32(buf[b:]))
+	v.Counter = SyncCounter(Get32(buf[b:]))
 	b += 4
 
 	v.WaitType = Get32(buf[b:])
@@ -381,7 +403,7 @@ const SyncCounterNotify = 0
 type SyncCounterNotifyEvent struct {
 	Sequence     uint16
 	Kind         byte
-	Counter      Id
+	Counter      SyncCounter
 	WaitValue    SyncInt64
 	CounterValue SyncInt64
 	Timestamp    Timestamp
@@ -401,7 +423,7 @@ func NewSyncCounterNotifyEvent(buf []byte) Event {
 	v.Sequence = Get16(buf[b:])
 	b += 2
 
-	v.Counter = Id(Get32(buf[b:]))
+	v.Counter = SyncCounter(Get32(buf[b:]))
 	b += 4
 
 	v.WaitValue = SyncInt64{}
@@ -504,7 +526,7 @@ const SyncAlarmNotify = 1
 type SyncAlarmNotifyEvent struct {
 	Sequence     uint16
 	Kind         byte
-	Alarm        Id
+	Alarm        SyncAlarm
 	CounterValue SyncInt64
 	AlarmValue   SyncInt64
 	Timestamp    Timestamp
@@ -523,7 +545,7 @@ func NewSyncAlarmNotifyEvent(buf []byte) Event {
 	v.Sequence = Get16(buf[b:])
 	b += 2
 
-	v.Alarm = Id(Get32(buf[b:]))
+	v.Alarm = SyncAlarm(Get32(buf[b:]))
 	b += 4
 
 	v.CounterValue = SyncInt64{}
@@ -645,7 +667,7 @@ func (err SyncCounterError) SequenceId() uint16 {
 	return err.Sequence
 }
 
-func (err SyncCounterError) BadId() Id {
+func (err SyncCounterError) BadId() uint32 {
 	return 0
 }
 
@@ -705,7 +727,7 @@ func (err SyncAlarmError) SequenceId() uint16 {
 	return err.Sequence
 }
 
-func (err SyncAlarmError) BadId() Id {
+func (err SyncAlarmError) BadId() uint32 {
 	return 0
 }
 
@@ -910,13 +932,13 @@ type SyncCreateCounterCookie struct {
 }
 
 // Write request to wire for SyncCreateCounter
-func (c *Conn) SyncCreateCounter(Id Id, InitialValue SyncInt64) SyncCreateCounterCookie {
+func (c *Conn) SyncCreateCounter(Id SyncCounter, InitialValue SyncInt64) SyncCreateCounterCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.syncCreateCounterRequest(Id, InitialValue), cookie)
 	return SyncCreateCounterCookie{cookie}
 }
 
-func (c *Conn) SyncCreateCounterChecked(Id Id, InitialValue SyncInt64) SyncCreateCounterCookie {
+func (c *Conn) SyncCreateCounterChecked(Id SyncCounter, InitialValue SyncInt64) SyncCreateCounterCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.syncCreateCounterRequest(Id, InitialValue), cookie)
 	return SyncCreateCounterCookie{cookie}
@@ -927,7 +949,7 @@ func (cook SyncCreateCounterCookie) Check() error {
 }
 
 // Write request to wire for SyncCreateCounter
-func (c *Conn) syncCreateCounterRequest(Id Id, InitialValue SyncInt64) []byte {
+func (c *Conn) syncCreateCounterRequest(Id SyncCounter, InitialValue SyncInt64) []byte {
 	size := 16
 	b := 0
 	buf := make([]byte, size)
@@ -960,13 +982,13 @@ type SyncDestroyCounterCookie struct {
 }
 
 // Write request to wire for SyncDestroyCounter
-func (c *Conn) SyncDestroyCounter(Counter Id) SyncDestroyCounterCookie {
+func (c *Conn) SyncDestroyCounter(Counter SyncCounter) SyncDestroyCounterCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.syncDestroyCounterRequest(Counter), cookie)
 	return SyncDestroyCounterCookie{cookie}
 }
 
-func (c *Conn) SyncDestroyCounterChecked(Counter Id) SyncDestroyCounterCookie {
+func (c *Conn) SyncDestroyCounterChecked(Counter SyncCounter) SyncDestroyCounterCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.syncDestroyCounterRequest(Counter), cookie)
 	return SyncDestroyCounterCookie{cookie}
@@ -977,7 +999,7 @@ func (cook SyncDestroyCounterCookie) Check() error {
 }
 
 // Write request to wire for SyncDestroyCounter
-func (c *Conn) syncDestroyCounterRequest(Counter Id) []byte {
+func (c *Conn) syncDestroyCounterRequest(Counter SyncCounter) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -1003,13 +1025,13 @@ type SyncQueryCounterCookie struct {
 	*cookie
 }
 
-func (c *Conn) SyncQueryCounter(Counter Id) SyncQueryCounterCookie {
+func (c *Conn) SyncQueryCounter(Counter SyncCounter) SyncQueryCounterCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.syncQueryCounterRequest(Counter), cookie)
 	return SyncQueryCounterCookie{cookie}
 }
 
-func (c *Conn) SyncQueryCounterUnchecked(Counter Id) SyncQueryCounterCookie {
+func (c *Conn) SyncQueryCounterUnchecked(Counter SyncCounter) SyncQueryCounterCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.syncQueryCounterRequest(Counter), cookie)
 	return SyncQueryCounterCookie{cookie}
@@ -1060,7 +1082,7 @@ func (cook SyncQueryCounterCookie) Check() error {
 }
 
 // Write request to wire for SyncQueryCounter
-func (c *Conn) syncQueryCounterRequest(Counter Id) []byte {
+func (c *Conn) syncQueryCounterRequest(Counter SyncCounter) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -1130,13 +1152,13 @@ type SyncChangeCounterCookie struct {
 }
 
 // Write request to wire for SyncChangeCounter
-func (c *Conn) SyncChangeCounter(Counter Id, Amount SyncInt64) SyncChangeCounterCookie {
+func (c *Conn) SyncChangeCounter(Counter SyncCounter, Amount SyncInt64) SyncChangeCounterCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.syncChangeCounterRequest(Counter, Amount), cookie)
 	return SyncChangeCounterCookie{cookie}
 }
 
-func (c *Conn) SyncChangeCounterChecked(Counter Id, Amount SyncInt64) SyncChangeCounterCookie {
+func (c *Conn) SyncChangeCounterChecked(Counter SyncCounter, Amount SyncInt64) SyncChangeCounterCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.syncChangeCounterRequest(Counter, Amount), cookie)
 	return SyncChangeCounterCookie{cookie}
@@ -1147,7 +1169,7 @@ func (cook SyncChangeCounterCookie) Check() error {
 }
 
 // Write request to wire for SyncChangeCounter
-func (c *Conn) syncChangeCounterRequest(Counter Id, Amount SyncInt64) []byte {
+func (c *Conn) syncChangeCounterRequest(Counter SyncCounter, Amount SyncInt64) []byte {
 	size := 16
 	b := 0
 	buf := make([]byte, size)
@@ -1180,13 +1202,13 @@ type SyncSetCounterCookie struct {
 }
 
 // Write request to wire for SyncSetCounter
-func (c *Conn) SyncSetCounter(Counter Id, Value SyncInt64) SyncSetCounterCookie {
+func (c *Conn) SyncSetCounter(Counter SyncCounter, Value SyncInt64) SyncSetCounterCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.syncSetCounterRequest(Counter, Value), cookie)
 	return SyncSetCounterCookie{cookie}
 }
 
-func (c *Conn) SyncSetCounterChecked(Counter Id, Value SyncInt64) SyncSetCounterCookie {
+func (c *Conn) SyncSetCounterChecked(Counter SyncCounter, Value SyncInt64) SyncSetCounterCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.syncSetCounterRequest(Counter, Value), cookie)
 	return SyncSetCounterCookie{cookie}
@@ -1197,7 +1219,7 @@ func (cook SyncSetCounterCookie) Check() error {
 }
 
 // Write request to wire for SyncSetCounter
-func (c *Conn) syncSetCounterRequest(Counter Id, Value SyncInt64) []byte {
+func (c *Conn) syncSetCounterRequest(Counter SyncCounter, Value SyncInt64) []byte {
 	size := 16
 	b := 0
 	buf := make([]byte, size)
@@ -1230,13 +1252,13 @@ type SyncCreateAlarmCookie struct {
 }
 
 // Write request to wire for SyncCreateAlarm
-func (c *Conn) SyncCreateAlarm(Id Id, ValueMask uint32, ValueList []uint32) SyncCreateAlarmCookie {
+func (c *Conn) SyncCreateAlarm(Id SyncAlarm, ValueMask uint32, ValueList []uint32) SyncCreateAlarmCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.syncCreateAlarmRequest(Id, ValueMask, ValueList), cookie)
 	return SyncCreateAlarmCookie{cookie}
 }
 
-func (c *Conn) SyncCreateAlarmChecked(Id Id, ValueMask uint32, ValueList []uint32) SyncCreateAlarmCookie {
+func (c *Conn) SyncCreateAlarmChecked(Id SyncAlarm, ValueMask uint32, ValueList []uint32) SyncCreateAlarmCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.syncCreateAlarmRequest(Id, ValueMask, ValueList), cookie)
 	return SyncCreateAlarmCookie{cookie}
@@ -1247,7 +1269,7 @@ func (cook SyncCreateAlarmCookie) Check() error {
 }
 
 // Write request to wire for SyncCreateAlarm
-func (c *Conn) syncCreateAlarmRequest(Id Id, ValueMask uint32, ValueList []uint32) []byte {
+func (c *Conn) syncCreateAlarmRequest(Id SyncAlarm, ValueMask uint32, ValueList []uint32) []byte {
 	size := pad((8 + (4 + pad((4 * popCount(int(ValueMask)))))))
 	b := 0
 	buf := make([]byte, size)
@@ -1282,13 +1304,13 @@ type SyncChangeAlarmCookie struct {
 }
 
 // Write request to wire for SyncChangeAlarm
-func (c *Conn) SyncChangeAlarm(Id Id, ValueMask uint32, ValueList []uint32) SyncChangeAlarmCookie {
+func (c *Conn) SyncChangeAlarm(Id SyncAlarm, ValueMask uint32, ValueList []uint32) SyncChangeAlarmCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.syncChangeAlarmRequest(Id, ValueMask, ValueList), cookie)
 	return SyncChangeAlarmCookie{cookie}
 }
 
-func (c *Conn) SyncChangeAlarmChecked(Id Id, ValueMask uint32, ValueList []uint32) SyncChangeAlarmCookie {
+func (c *Conn) SyncChangeAlarmChecked(Id SyncAlarm, ValueMask uint32, ValueList []uint32) SyncChangeAlarmCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.syncChangeAlarmRequest(Id, ValueMask, ValueList), cookie)
 	return SyncChangeAlarmCookie{cookie}
@@ -1299,7 +1321,7 @@ func (cook SyncChangeAlarmCookie) Check() error {
 }
 
 // Write request to wire for SyncChangeAlarm
-func (c *Conn) syncChangeAlarmRequest(Id Id, ValueMask uint32, ValueList []uint32) []byte {
+func (c *Conn) syncChangeAlarmRequest(Id SyncAlarm, ValueMask uint32, ValueList []uint32) []byte {
 	size := pad((8 + (4 + pad((4 * popCount(int(ValueMask)))))))
 	b := 0
 	buf := make([]byte, size)
@@ -1334,13 +1356,13 @@ type SyncDestroyAlarmCookie struct {
 }
 
 // Write request to wire for SyncDestroyAlarm
-func (c *Conn) SyncDestroyAlarm(Alarm Id) SyncDestroyAlarmCookie {
+func (c *Conn) SyncDestroyAlarm(Alarm SyncAlarm) SyncDestroyAlarmCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.syncDestroyAlarmRequest(Alarm), cookie)
 	return SyncDestroyAlarmCookie{cookie}
 }
 
-func (c *Conn) SyncDestroyAlarmChecked(Alarm Id) SyncDestroyAlarmCookie {
+func (c *Conn) SyncDestroyAlarmChecked(Alarm SyncAlarm) SyncDestroyAlarmCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.syncDestroyAlarmRequest(Alarm), cookie)
 	return SyncDestroyAlarmCookie{cookie}
@@ -1351,7 +1373,7 @@ func (cook SyncDestroyAlarmCookie) Check() error {
 }
 
 // Write request to wire for SyncDestroyAlarm
-func (c *Conn) syncDestroyAlarmRequest(Alarm Id) []byte {
+func (c *Conn) syncDestroyAlarmRequest(Alarm SyncAlarm) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -1377,13 +1399,13 @@ type SyncQueryAlarmCookie struct {
 	*cookie
 }
 
-func (c *Conn) SyncQueryAlarm(Alarm Id) SyncQueryAlarmCookie {
+func (c *Conn) SyncQueryAlarm(Alarm SyncAlarm) SyncQueryAlarmCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.syncQueryAlarmRequest(Alarm), cookie)
 	return SyncQueryAlarmCookie{cookie}
 }
 
-func (c *Conn) SyncQueryAlarmUnchecked(Alarm Id) SyncQueryAlarmCookie {
+func (c *Conn) SyncQueryAlarmUnchecked(Alarm SyncAlarm) SyncQueryAlarmCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.syncQueryAlarmRequest(Alarm), cookie)
 	return SyncQueryAlarmCookie{cookie}
@@ -1453,7 +1475,7 @@ func (cook SyncQueryAlarmCookie) Check() error {
 }
 
 // Write request to wire for SyncQueryAlarm
-func (c *Conn) syncQueryAlarmRequest(Alarm Id) []byte {
+func (c *Conn) syncQueryAlarmRequest(Alarm SyncAlarm) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -1610,13 +1632,13 @@ type SyncCreateFenceCookie struct {
 }
 
 // Write request to wire for SyncCreateFence
-func (c *Conn) SyncCreateFence(Drawable Id, Fence Id, InitiallyTriggered bool) SyncCreateFenceCookie {
+func (c *Conn) SyncCreateFence(Drawable Drawable, Fence SyncFence, InitiallyTriggered bool) SyncCreateFenceCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.syncCreateFenceRequest(Drawable, Fence, InitiallyTriggered), cookie)
 	return SyncCreateFenceCookie{cookie}
 }
 
-func (c *Conn) SyncCreateFenceChecked(Drawable Id, Fence Id, InitiallyTriggered bool) SyncCreateFenceCookie {
+func (c *Conn) SyncCreateFenceChecked(Drawable Drawable, Fence SyncFence, InitiallyTriggered bool) SyncCreateFenceCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.syncCreateFenceRequest(Drawable, Fence, InitiallyTriggered), cookie)
 	return SyncCreateFenceCookie{cookie}
@@ -1627,7 +1649,7 @@ func (cook SyncCreateFenceCookie) Check() error {
 }
 
 // Write request to wire for SyncCreateFence
-func (c *Conn) syncCreateFenceRequest(Drawable Id, Fence Id, InitiallyTriggered bool) []byte {
+func (c *Conn) syncCreateFenceRequest(Drawable Drawable, Fence SyncFence, InitiallyTriggered bool) []byte {
 	size := 16
 	b := 0
 	buf := make([]byte, size)
@@ -1664,13 +1686,13 @@ type SyncTriggerFenceCookie struct {
 }
 
 // Write request to wire for SyncTriggerFence
-func (c *Conn) SyncTriggerFence(Fence Id) SyncTriggerFenceCookie {
+func (c *Conn) SyncTriggerFence(Fence SyncFence) SyncTriggerFenceCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.syncTriggerFenceRequest(Fence), cookie)
 	return SyncTriggerFenceCookie{cookie}
 }
 
-func (c *Conn) SyncTriggerFenceChecked(Fence Id) SyncTriggerFenceCookie {
+func (c *Conn) SyncTriggerFenceChecked(Fence SyncFence) SyncTriggerFenceCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.syncTriggerFenceRequest(Fence), cookie)
 	return SyncTriggerFenceCookie{cookie}
@@ -1681,7 +1703,7 @@ func (cook SyncTriggerFenceCookie) Check() error {
 }
 
 // Write request to wire for SyncTriggerFence
-func (c *Conn) syncTriggerFenceRequest(Fence Id) []byte {
+func (c *Conn) syncTriggerFenceRequest(Fence SyncFence) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -1708,13 +1730,13 @@ type SyncResetFenceCookie struct {
 }
 
 // Write request to wire for SyncResetFence
-func (c *Conn) SyncResetFence(Fence Id) SyncResetFenceCookie {
+func (c *Conn) SyncResetFence(Fence SyncFence) SyncResetFenceCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.syncResetFenceRequest(Fence), cookie)
 	return SyncResetFenceCookie{cookie}
 }
 
-func (c *Conn) SyncResetFenceChecked(Fence Id) SyncResetFenceCookie {
+func (c *Conn) SyncResetFenceChecked(Fence SyncFence) SyncResetFenceCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.syncResetFenceRequest(Fence), cookie)
 	return SyncResetFenceCookie{cookie}
@@ -1725,7 +1747,7 @@ func (cook SyncResetFenceCookie) Check() error {
 }
 
 // Write request to wire for SyncResetFence
-func (c *Conn) syncResetFenceRequest(Fence Id) []byte {
+func (c *Conn) syncResetFenceRequest(Fence SyncFence) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -1752,13 +1774,13 @@ type SyncDestroyFenceCookie struct {
 }
 
 // Write request to wire for SyncDestroyFence
-func (c *Conn) SyncDestroyFence(Fence Id) SyncDestroyFenceCookie {
+func (c *Conn) SyncDestroyFence(Fence SyncFence) SyncDestroyFenceCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.syncDestroyFenceRequest(Fence), cookie)
 	return SyncDestroyFenceCookie{cookie}
 }
 
-func (c *Conn) SyncDestroyFenceChecked(Fence Id) SyncDestroyFenceCookie {
+func (c *Conn) SyncDestroyFenceChecked(Fence SyncFence) SyncDestroyFenceCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.syncDestroyFenceRequest(Fence), cookie)
 	return SyncDestroyFenceCookie{cookie}
@@ -1769,7 +1791,7 @@ func (cook SyncDestroyFenceCookie) Check() error {
 }
 
 // Write request to wire for SyncDestroyFence
-func (c *Conn) syncDestroyFenceRequest(Fence Id) []byte {
+func (c *Conn) syncDestroyFenceRequest(Fence SyncFence) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -1795,13 +1817,13 @@ type SyncQueryFenceCookie struct {
 	*cookie
 }
 
-func (c *Conn) SyncQueryFence(Fence Id) SyncQueryFenceCookie {
+func (c *Conn) SyncQueryFence(Fence SyncFence) SyncQueryFenceCookie {
 	cookie := c.newCookie(true, true)
 	c.newRequest(c.syncQueryFenceRequest(Fence), cookie)
 	return SyncQueryFenceCookie{cookie}
 }
 
-func (c *Conn) SyncQueryFenceUnchecked(Fence Id) SyncQueryFenceCookie {
+func (c *Conn) SyncQueryFenceUnchecked(Fence SyncFence) SyncQueryFenceCookie {
 	cookie := c.newCookie(false, true)
 	c.newRequest(c.syncQueryFenceRequest(Fence), cookie)
 	return SyncQueryFenceCookie{cookie}
@@ -1859,7 +1881,7 @@ func (cook SyncQueryFenceCookie) Check() error {
 }
 
 // Write request to wire for SyncQueryFence
-func (c *Conn) syncQueryFenceRequest(Fence Id) []byte {
+func (c *Conn) syncQueryFenceRequest(Fence SyncFence) []byte {
 	size := 8
 	b := 0
 	buf := make([]byte, size)
@@ -1886,13 +1908,13 @@ type SyncAwaitFenceCookie struct {
 }
 
 // Write request to wire for SyncAwaitFence
-func (c *Conn) SyncAwaitFence(FenceList []Id) SyncAwaitFenceCookie {
+func (c *Conn) SyncAwaitFence(FenceList []SyncFence) SyncAwaitFenceCookie {
 	cookie := c.newCookie(false, false)
 	c.newRequest(c.syncAwaitFenceRequest(FenceList), cookie)
 	return SyncAwaitFenceCookie{cookie}
 }
 
-func (c *Conn) SyncAwaitFenceChecked(FenceList []Id) SyncAwaitFenceCookie {
+func (c *Conn) SyncAwaitFenceChecked(FenceList []SyncFence) SyncAwaitFenceCookie {
 	cookie := c.newCookie(true, false)
 	c.newRequest(c.syncAwaitFenceRequest(FenceList), cookie)
 	return SyncAwaitFenceCookie{cookie}
@@ -1903,7 +1925,7 @@ func (cook SyncAwaitFenceCookie) Check() error {
 }
 
 // Write request to wire for SyncAwaitFence
-func (c *Conn) syncAwaitFenceRequest(FenceList []Id) []byte {
+func (c *Conn) syncAwaitFenceRequest(FenceList []SyncFence) []byte {
 	size := pad((4 + pad((len(FenceList) * 4))))
 	b := 0
 	buf := make([]byte, size)