api: Remove api_object::{platform_id,object_id}

The object_id was never used.

The platform_id field was used to validate that the user did not provide
old objects (those invalidated by waffle_finish()) as inputs. But,
waffle_finish() is no longer part of Waffle's API.

Signed-off-by: Chad Versace <chad.versace@linux.intel.com>

6 files changed, 2 insertions, 18 deletions

diff --git a/src/waffle/api/api_priv.c b/src/waffle/api/api_priv.c
index b156c30..afaa7fa 100644
--- a/src/waffle/api/api_priv.c
+++ b/src/waffle/api/api_priv.c
@@ -56,11 +56,6 @@ api_check_entry(const struct api_object *obj_list[], int length)
             return false;
         }
 
-        if (obj_list[i]->platform_id != api_current_platform->id) {
-            wcore_error(WAFFLE_OLD_OBJECT);
-            return false;
-        }
-
         if (obj_list[i]->display_id != obj_list[0]->display_id) {
             wcore_error(WAFFLE_BAD_DISPLAY_MATCH);
         }
diff --git a/src/waffle/api/api_priv.h b/src/waffle/api/api_priv.h
index 862cb58..b728d94 100644
--- a/src/waffle/api/api_priv.h
+++ b/src/waffle/api/api_priv.h
@@ -63,9 +63,6 @@ size_t
 api_new_object_id(void);
 
 struct api_object {
-    size_t platform_id;
-    size_t object_id;
-
     /// @brief Display to which object belongs.
     ///
     /// This is identical to object_id for waffle_display.
diff --git a/src/waffle/api/waffle_config.c b/src/waffle/api/waffle_config.c
index 6b83f9a..09dbf21 100644
--- a/src/waffle/api/waffle_config.c
+++ b/src/waffle/api/waffle_config.c
@@ -65,9 +65,7 @@ waffle_config_choose(
     if (!ok)
         goto error;
 
-    self->api.platform_id = api_current_platform->id;
-    self->api.object_id = api_new_object_id();
-    self->api.display_id = dpy->api.object_id;
+    self->api.display_id = dpy->api.display_id;
 
     self->native = api_current_platform->dispatch->
                         config_choose(dpy->native, &attrs);
diff --git a/src/waffle/api/waffle_context.c b/src/waffle/api/waffle_context.c
index f284252..a9dc5df 100644
--- a/src/waffle/api/waffle_context.c
+++ b/src/waffle/api/waffle_context.c
@@ -65,8 +65,6 @@ waffle_context_create(
         return NULL;
     }
 
-    self->api.platform_id = api_current_platform->id;
-    self->api.object_id = api_new_object_id();
     self->api.display_id = config->api.display_id;
 
     self->native = api_current_platform->dispatch->
diff --git a/src/waffle/api/waffle_display.c b/src/waffle/api/waffle_display.c
index e31fc57..a530b5a 100644
--- a/src/waffle/api/waffle_display.c
+++ b/src/waffle/api/waffle_display.c
@@ -53,9 +53,7 @@ waffle_display_connect(const char *name)
         return NULL;
     }
 
-    self->api.platform_id = api_current_platform->id;
-    self->api.object_id = api_new_object_id();
-    self->api.display_id = self->api.object_id;
+    self->api.display_id = api_new_object_id();
 
     self->native = api_current_platform->dispatch->
                     display_connect(api_current_platform->native, name);
diff --git a/src/waffle/api/waffle_window.c b/src/waffle/api/waffle_window.c
index 1194849..6c0df64 100644
--- a/src/waffle/api/waffle_window.c
+++ b/src/waffle/api/waffle_window.c
@@ -58,8 +58,6 @@ waffle_window_create(
         return NULL;
     }
 
-    self->api.platform_id = api_current_platform->id;
-    self->api.object_id = api_new_object_id();
     self->api.display_id = config->api.display_id;
 
     self->native = api_current_platform->dispatch->