Bug 14084 - Improve type safety and remove polymorphism
diff --git a/icd/intel/cmd.h b/icd/intel/cmd.h
index 9d9a70b..75c28d1 100644
--- a/icd/intel/cmd.h
+++ b/icd/intel/cmd.h
@@ -163,10 +163,10 @@
     } pipeline;
 
     struct {
-        const struct intel_dynamic_vp *viewport;
-        const struct intel_dynamic_rs *raster;
-        const struct intel_dynamic_cb *blend;
-        const struct intel_dynamic_ds *ds;
+        const struct intel_dynamic_viewport *viewport;
+        const struct intel_dynamic_raster *raster;
+        const struct intel_dynamic_color_blend *blend;
+        const struct intel_dynamic_depth_stencil *depth;
     } state;
 
     struct {