commit 5e75e538bebefeca17d445164ab74527442375d9
author Jon Ashburn <jon@lunarg.com> Thu Jan 08 18:54:34 2015 -0700
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Feb 04 17:58:08 2015 -0700
tree 88f72b3bd44334bcf1fd322aaa9cb030312b108c
parent 8c48282808f9707b619fad345bc9b6bfe45ce7e8

intel: Remove CmdBindAttachments for tiler GPUs

Conflicts:
	icd/intel/cmd.c
	icd/intel/cmd_pipeline.c

icd/intel/cmd.c

diff --git a/icd/intel/cmd.c b/icd/intel/cmd.c
index ef11bc6..0f8fb5d 100644
--- a/icd/intel/cmd.c
+++ b/icd/intel/cmd.c
@@ -233,8 +233,6 @@
     if (cmd->bind.shader_cache.entries)
         icd_free(cmd->bind.shader_cache.entries);
 
-    icd_free(cmd->bind.render_pass);  // TODO remove once CmdBindAttachment is removed
-
     memset(&cmd->bind, 0, sizeof(cmd->bind));
 
     cmd->reloc_used = 0;
@@ -334,10 +332,6 @@
         next = (XGL_CMD_BUFFER_BEGIN_INFO*) next->pNext;
     }
 
-    if (cmd->bind.render_pass == NULL)  //  TODO remove once CmmdBindAttachment is removed
-        cmd->bind.render_pass = icd_alloc(sizeof(struct intel_render_pass), 0,
-                                  XGL_SYSTEM_ALLOC_INTERNAL);
-
     if (cmd->flags != flags) {
         cmd->flags = flags;
         cmd->writers[INTEL_CMD_WRITER_BATCH].size = 0;

icd/intel/cmd_pipeline.c

diff --git a/icd/intel/cmd_pipeline.c b/icd/intel/cmd_pipeline.c
index 4d36a4d..e262f14 100644
--- a/icd/intel/cmd_pipeline.c
+++ b/icd/intel/cmd_pipeline.c
@@ -2964,52 +2964,6 @@
     cmd->bind.index.type = type;
 }
 
-static void cmd_bind_attachments(struct intel_cmd *cmd,
-                                 XGL_UINT rt_count,
-                                 const XGL_COLOR_ATTACHMENT_BIND_INFO *rt_info,
-                                 const XGL_DEPTH_STENCIL_BIND_INFO *ds_info)
-{
-    XGL_UINT width = 0, height = 0;
-    XGL_UINT i;
-
-    for (i = 0; i < rt_count; i++) {
-        const XGL_COLOR_ATTACHMENT_BIND_INFO *att = &rt_info[i];
-        const struct intel_rt_view *rt = intel_rt_view(att->view);
-        const struct intel_layout *layout = &rt->img->layout;
-
-        if (i == 0) {
-            width = layout->width0;
-            height = layout->height0;
-        } else {
-            if (width > layout->width0)
-                width = layout->width0;
-            if (height > layout->height0)
-                height = layout->height0;
-        }
-
-        cmd->bind.render_pass->fb->rt[i] = rt;
-    }
-
-    cmd->bind.render_pass->fb->rt_count = rt_count;
-
-    if (ds_info) {
-        const struct intel_layout *layout;
-
-        cmd->bind.render_pass->fb->ds = intel_ds_view(ds_info->view);
-        layout = &cmd->bind.render_pass->fb->ds->img->layout;
-
-        if (width > layout->width0)
-            width = layout->width0;
-        if (height > layout->height0)
-            height = layout->height0;
-    } else {
-        cmd->bind.render_pass->fb->ds = NULL;
-    }
-
-    cmd->bind.render_pass->fb->width = width;
-    cmd->bind.render_pass->fb->height = height;
-}
-
 static void cmd_bind_viewport_state(struct intel_cmd *cmd,
                                     const struct intel_viewport_state *state)
 {