From 880cefa9ff7411a61cac05a394e9b6f975bf9d31 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Sat, 13 Dec 2014 19:13:00 -0800
Subject: [PATCH] The filter struct is no longer a bitfield

---
 src/azure-c.h   | 8 ++------
 src/azure.rs    | 3 ++-
 src/azure_hl.rs | 3 ++-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/azure-c.h b/src/azure-c.h
index 6e52646..38207d9 100644
--- a/src/azure-c.h
+++ b/src/azure-c.h
@@ -316,13 +316,9 @@ typedef struct _AzStrokeOptions {
    */
 } AzStrokeOptions;
 
-// FIXME: Guess what? Bitfields
 typedef struct _AzDrawSurfaceOptions {
-  uint32_t fields;
-  /*
-  enum Filter mFilter : 3;
-  enum Filter mSamplingBounds : 1;
-  */
+  int8_t filter;
+  int8_t samplingBounds;
 } AzDrawSurfaceOptions;
 
 typedef struct _AzGlyph {
diff --git a/src/azure.rs b/src/azure.rs
index 3afc1c7..7a979bc 100644
--- a/src/azure.rs
+++ b/src/azure.rs
@@ -309,7 +309,8 @@ pub type AzStrokeOptions = struct__AzStrokeOptions;
 
 #[repr(C)]
 pub struct struct__AzDrawSurfaceOptions {
-    pub fields: uint32_t,
+    pub filter: i8,
+    pub sampling_bounds: i8,
 }
 
 #[repr(C)]
diff --git a/src/azure_hl.rs b/src/azure_hl.rs
index fd4d2aa..9e26647 100644
--- a/src/azure_hl.rs
+++ b/src/azure_hl.rs
@@ -300,7 +300,8 @@ impl DrawSurfaceOptions {
 
     fn as_azure_draw_surface_options(&self) -> AzDrawSurfaceOptions {
         struct__AzDrawSurfaceOptions {
-            fields: ((self.filter as int) | (if self.sampling_bounds { 8 } else { 0 })) as u32
+            filter: self.filter as i8,
+            sampling_bounds: self.sampling_bounds as i8,
         }
     }
 }