commit fa6cac730ca48f6202a8f35d79db34cb3f3b9df8
author Tony Barbour <tony@LunarG.com> Fri Jan 16 14:27:35 2015 -0700
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Feb 04 17:58:08 2015 -0700
tree acc97b58dbc55b81da493567adb2a35b20e06abe
parent 5f5a618fd212f104d7fc1e0907612b4c9196f6db

driver:implement changes for Dynamic State

icd/intel/obj.c

diff --git a/icd/intel/obj.c b/icd/intel/obj.c
index d589992..ac2c437 100644
--- a/icd/intel/obj.c
+++ b/icd/intel/obj.c
@@ -135,24 +135,20 @@
         shallow_copy = sizeof(XGL_DESCRIPTOR_SET_CREATE_INFO);
         break;
     case XGL_DBG_OBJECT_VIEWPORT_STATE:
-        /* no struct header! */
-        shallow_copy = sizeof(XGL_VIEWPORT_STATE_CREATE_INFO);
+        assert(info.header->struct_type == XGL_STRUCTURE_TYPE_DYNAMIC_VP_STATE_CREATE_INFO);
+        shallow_copy = sizeof(XGL_DYNAMIC_VP_STATE_CREATE_INFO);
         break;
     case XGL_DBG_OBJECT_RASTER_STATE:
-        assert(info.header->struct_type == XGL_STRUCTURE_TYPE_RASTER_STATE_CREATE_INFO);
-        shallow_copy = sizeof(XGL_RASTER_STATE_CREATE_INFO);
-        break;
-    case XGL_DBG_OBJECT_MSAA_STATE:
-        assert(info.header->struct_type == XGL_STRUCTURE_TYPE_MSAA_STATE_CREATE_INFO);
-        shallow_copy = sizeof(XGL_MSAA_STATE_CREATE_INFO);
+        assert(info.header->struct_type == XGL_STRUCTURE_TYPE_DYNAMIC_RS_STATE_CREATE_INFO);
+        shallow_copy = sizeof(XGL_DYNAMIC_RS_STATE_CREATE_INFO);
         break;
     case XGL_DBG_OBJECT_COLOR_BLEND_STATE:
-        assert(info.header->struct_type == XGL_STRUCTURE_TYPE_COLOR_BLEND_STATE_CREATE_INFO);
-        shallow_copy = sizeof(XGL_COLOR_BLEND_STATE_CREATE_INFO);
+        assert(info.header->struct_type == XGL_STRUCTURE_TYPE_DYNAMIC_CB_STATE_CREATE_INFO);
+        shallow_copy = sizeof(XGL_DYNAMIC_CB_STATE_CREATE_INFO);
         break;
     case XGL_DBG_OBJECT_DEPTH_STENCIL_STATE:
-        assert(info.header->struct_type == XGL_STRUCTURE_TYPE_DEPTH_STENCIL_STATE_CREATE_INFO);
-        shallow_copy = sizeof(XGL_DEPTH_STENCIL_STATE_CREATE_INFO);
+        assert(info.header->struct_type == XGL_STRUCTURE_TYPE_DYNAMIC_DS_STATE_CREATE_INFO);
+        shallow_copy = sizeof(XGL_DYNAMIC_DS_STATE_CREATE_INFO);
         break;
     case XGL_DBG_OBJECT_CMD_BUFFER:
         assert(info.header->struct_type == XGL_STRUCTURE_TYPE_CMD_BUFFER_CREATE_INFO);
@@ -183,10 +179,6 @@
     }
 
     if (shallow_copy) {
-        /* XGL_VIEWPORT_STATE_CREATE_INFO has no header */
-        if (dbg->type != XGL_DBG_OBJECT_VIEWPORT_STATE)
-            assert(!info.header->next);
-
         dbg->create_info = icd_alloc(shallow_copy, 0, XGL_SYSTEM_ALLOC_DEBUG);
         if (!dbg->create_info)
             return false;