codegen: No SPICE_ADDRESS types left, drop @c_ptr

1 files changed, 12 insertions, 12 deletions

diff --git a/spice1.proto b/spice1.proto
index 23ce9f1..d1efb55 100644
--- a/spice1.proto
+++ b/spice1.proto
@@ -382,7 +382,7 @@ struct Clip {
     clip_type type;
     switch (type) {
     case RECTS:
-        ClipRects *rects @outvar(cliprects) @c_ptr;
+        ClipRects *rects @outvar(cliprects);
     default:
         uint64 data @zero;
     } u @anon;
@@ -421,7 +421,7 @@ struct BitmapData {
     case PAL_FROM_CACHE:
 	uint64 palette_id;
     default:
-	Palette *palette @outvar(bitmap) @c_ptr;
+	Palette *palette @outvar(bitmap);
     } pal @anon;
     uint8 *data[image_size(8, stride, y)] @chunk; /* pointer to array, not array of pointers as in C */
 } @ctype(SpiceBitmap);
@@ -438,7 +438,7 @@ struct LZPLTData {
     case PAL_FROM_CACHE:
 	uint64 palette_id;
     default:
-	Palette *palette @nonnull @outvar(lzplt) @c_ptr;
+	Palette *palette @nonnull @outvar(lzplt);
     } pal @anon;
     uint8 data[data_size] @nomarshal @chunk;
 };
@@ -466,7 +466,7 @@ struct Image {
 };
 
 struct Pattern {
-    Image *pat @nonnull @c_ptr;
+    Image *pat @nonnull;
     Point pos;
 };
 
@@ -483,7 +483,7 @@ struct Brush {
 struct QMask {
     mask_flags flags;
     Point pos;
-    Image *bitmap @c_ptr;
+    Image *bitmap;
 };
 
 struct LineAttr {
@@ -493,7 +493,7 @@ struct LineAttr {
     uint8 style_nseg;
     fixed28_4 width @zero;
     fixed28_4 miter_limit @zero;
-    fixed28_4 *style[style_nseg] @c_ptr;
+    fixed28_4 *style[style_nseg];
 };
 
 struct RasterGlyphA1 {
@@ -611,7 +611,7 @@ channel DisplayChannel : BaseChannel {
     message {
 	DisplayBase base;
 	struct Opaque {
-	    Image *src_bitmap @c_ptr;
+	    Image *src_bitmap;
 	    Rect src_area;
 	    Brush brush;
 	    ropd rop_descriptor;
@@ -623,7 +623,7 @@ channel DisplayChannel : BaseChannel {
     message {
 	DisplayBase base;
 	struct Copy {
-	    Image *src_bitmap @c_ptr;
+	    Image *src_bitmap;
 	    Rect src_area;
 	    ropd rop_descriptor;
 	    image_scale_mode scale_mode;
@@ -634,7 +634,7 @@ channel DisplayChannel : BaseChannel {
     message {
 	DisplayBase base;
 	struct Blend {
-	    Image *src_bitmap @c_ptr;
+	    Image *src_bitmap;
 	    Rect src_area;
 	    ropd rop_descriptor;
 	    image_scale_mode scale_mode;
@@ -666,7 +666,7 @@ channel DisplayChannel : BaseChannel {
     message {
 	DisplayBase base;
 	struct Rop3 {
-	    Image *src_bitmap @c_ptr;
+	    Image *src_bitmap;
 	    Rect src_area;
 	    Brush brush;
 	    uint8 rop3;
@@ -701,7 +701,7 @@ channel DisplayChannel : BaseChannel {
     message {
 	DisplayBase base;
 	struct Transparent {
-	    Image *src_bitmap @c_ptr;
+	    Image *src_bitmap;
 	    Rect src_area;
 	    uint32 src_color;
 	    uint32 true_color;
@@ -713,7 +713,7 @@ channel DisplayChannel : BaseChannel {
 	struct AlphaBlnd {
 	    int8 alpha_flags @virtual(0);
 	    uint8 alpha;
-	    Image *src_bitmap @c_ptr;
+	    Image *src_bitmap;
 	    Rect src_area;
 	} data;
     } draw_alpha_blend;