From patchwork Mon Nov 1 08:33:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 294012 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oA18a4fm008592 for ; Mon, 1 Nov 2010 08:36:24 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 592FBA08DB for ; Mon, 1 Nov 2010 01:36:04 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 24CC59E79F for ; Mon, 1 Nov 2010 01:35:31 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 01 Nov 2010 01:35:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.58,272,1286175600"; d="scan'208";a="672904395" Received: from xhh-ilk32.sh.intel.com (HELO localhost.localdomain) ([10.239.36.76]) by orsmga001.jf.intel.com with ESMTP; 01 Nov 2010 01:35:30 -0700 From: "Xiang, Haihao" To: intel-gfx@lists.freedesktop.org Date: Mon, 1 Nov 2010 16:33:37 +0800 Message-Id: <1288600420-1021-2-git-send-email-haihao.xiang@intel.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1288600420-1021-1-git-send-email-haihao.xiang@intel.com> References: <1288600420-1021-1-git-send-email-haihao.xiang@intel.com> Subject: [Intel-gfx] [PATCH 2/5] render: fix send instruction used in sampling fragments X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 01 Nov 2010 08:36:24 +0000 (UTC) diff --git a/src/render_program/exa_wm_mask_sample_a.g4a b/src/render_program/exa_wm_mask_sample_a.g4a index bbb19d7..b1c75af 100644 --- a/src/render_program/exa_wm_mask_sample_a.g4a +++ b/src/render_program/exa_wm_mask_sample_a.g4a @@ -36,12 +36,13 @@ include(`exa_wm.g4i') /* load only alpha */ mov (1) g0.8<1>UD 0x00007000UD { align1 mask_disable }; +mov (8) mask_msg<1>UD g0<8,8,1>UD { align1 }; /* copy to msg start reg*/ /* mask_msg will be copied with g0, as it contains send desc */ /* emit sampler 'send' cmd */ send (16) mask_msg_ind /* msg reg index */ mask_sample_a_01<1>UW /* readback */ - g0<8,8,1>UW /* copy to msg start reg*/ + null sampler (2,1,F) /* sampler message description, (binding_table,sampler_index,datatype) /* here(src->dst) we should use src_sampler and src_surface */ mlen 5 rlen 2 { align1 }; /* required message len 5, readback len 8 */ diff --git a/src/render_program/exa_wm_mask_sample_a.g4b b/src/render_program/exa_wm_mask_sample_a.g4b index 018bd36..7db47ca 100644 --- a/src/render_program/exa_wm_mask_sample_a.g4b +++ b/src/render_program/exa_wm_mask_sample_a.g4b @@ -1,2 +1,3 @@ { 0x00000201, 0x20080061, 0x00000000, 0x00007000 }, - { 0x07800031, 0x23801d29, 0x008d0000, 0x02520102 }, + { 0x00600001, 0x20e00022, 0x008d0000, 0x00000000 }, + { 0x07800031, 0x23801c09, 0x00000000, 0x02520102 }, diff --git a/src/render_program/exa_wm_mask_sample_a.g4b.gen5 b/src/render_program/exa_wm_mask_sample_a.g4b.gen5 index d9740ac..472c2bb 100644 --- a/src/render_program/exa_wm_mask_sample_a.g4b.gen5 +++ b/src/render_program/exa_wm_mask_sample_a.g4b.gen5 @@ -1,2 +1,3 @@ { 0x00000201, 0x20080061, 0x00000000, 0x00007000 }, - { 0x07800031, 0x23801d29, 0x208d0000, 0x0a2a0102 }, + { 0x00600001, 0x20e00022, 0x008d0000, 0x00000000 }, + { 0x07800031, 0x23801c09, 0x20000000, 0x0a2a0102 }, diff --git a/src/render_program/exa_wm_mask_sample_argb.g4a b/src/render_program/exa_wm_mask_sample_argb.g4a index def4cfe..78bfc92 100644 --- a/src/render_program/exa_wm_mask_sample_argb.g4a +++ b/src/render_program/exa_wm_mask_sample_argb.g4a @@ -36,12 +36,13 @@ include(`exa_wm.g4i') /* load argb */ mov (1) g0.8<1>UD 0x00000000UD { align1 mask_disable }; +mov (8) mask_msg<1>UD g0<8,8,1>UD { align1 }; /* copy to msg start reg*/ /* mask_msg will be copied with g0, as it contains send desc */ /* emit sampler 'send' cmd */ send (16) mask_msg_ind /* msg reg index */ mask_sample_base<1>UW /* readback */ - g0<8,8,1>UW /* copy to msg start reg*/ + null sampler (2,1,F) /* sampler message description, (binding_table,sampler_index,datatype) /* here(src->dst) we should use src_sampler and src_surface */ mlen 5 rlen 8 { align1 }; /* required message len 5, readback len 8 */ diff --git a/src/render_program/exa_wm_mask_sample_argb.g4b b/src/render_program/exa_wm_mask_sample_argb.g4b index b159cba..9026ee2 100644 --- a/src/render_program/exa_wm_mask_sample_argb.g4b +++ b/src/render_program/exa_wm_mask_sample_argb.g4b @@ -1,2 +1,3 @@ { 0x00000201, 0x20080061, 0x00000000, 0x00000000 }, - { 0x07800031, 0x22c01d29, 0x008d0000, 0x02580102 }, + { 0x00600001, 0x20e00022, 0x008d0000, 0x00000000 }, + { 0x07800031, 0x22c01c09, 0x00000000, 0x02580102 }, diff --git a/src/render_program/exa_wm_mask_sample_argb.g4b.gen5 b/src/render_program/exa_wm_mask_sample_argb.g4b.gen5 index f0a6ddd..cb112d5 100644 --- a/src/render_program/exa_wm_mask_sample_argb.g4b.gen5 +++ b/src/render_program/exa_wm_mask_sample_argb.g4b.gen5 @@ -1,2 +1,3 @@ { 0x00000201, 0x20080061, 0x00000000, 0x00000000 }, - { 0x07800031, 0x22c01d29, 0x208d0000, 0x0a8a0102 }, + { 0x00600001, 0x20e00022, 0x008d0000, 0x00000000 }, + { 0x07800031, 0x22c01c09, 0x20000000, 0x0a8a0102 }, diff --git a/src/render_program/exa_wm_src_sample_a.g4a b/src/render_program/exa_wm_src_sample_a.g4a index 552aaee..667bfb3 100644 --- a/src/render_program/exa_wm_src_sample_a.g4a +++ b/src/render_program/exa_wm_src_sample_a.g4a @@ -36,12 +36,13 @@ include(`exa_wm.g4i') /* load alpha */ mov (1) g0.8<1>UD 0x00007000UD { align1 mask_disable }; +mov (8) src_msg<1>UD g0<8,8,1>UD { align1 }; /* copy to msg start reg*/ /* src_msg will be copied with g0, as it contains send desc */ /* emit sampler 'send' cmd */ send (16) src_msg_ind /* msg reg index */ src_sample_a_01<1>UW /* readback */ - g0<8,8,1>UW /* copy to msg start reg*/ + null sampler (1,0,F) /* sampler message description, (binding_table,sampler_index,datatype) /* here(src->dst) we should use src_sampler and src_surface */ mlen 5 rlen 2 { align1 }; /* required message len 5, readback len 8 */ diff --git a/src/render_program/exa_wm_src_sample_a.g4b b/src/render_program/exa_wm_src_sample_a.g4b index ce8650a..5e5a11f 100644 --- a/src/render_program/exa_wm_src_sample_a.g4b +++ b/src/render_program/exa_wm_src_sample_a.g4b @@ -1,2 +1,3 @@ { 0x00000201, 0x20080061, 0x00000000, 0x00007000 }, - { 0x01800031, 0x22801d29, 0x008d0000, 0x02520001 }, + { 0x00600001, 0x20200022, 0x008d0000, 0x00000000 }, + { 0x01800031, 0x22801c09, 0x00000000, 0x02520001 }, diff --git a/src/render_program/exa_wm_src_sample_a.g4b.gen5 b/src/render_program/exa_wm_src_sample_a.g4b.gen5 index 8cd411c..0e4eebe 100644 --- a/src/render_program/exa_wm_src_sample_a.g4b.gen5 +++ b/src/render_program/exa_wm_src_sample_a.g4b.gen5 @@ -1,2 +1,3 @@ { 0x00000201, 0x20080061, 0x00000000, 0x00007000 }, - { 0x01800031, 0x22801d29, 0x208d0000, 0x0a2a0001 }, + { 0x00600001, 0x20200022, 0x008d0000, 0x00000000 }, + { 0x01800031, 0x22801c09, 0x20000000, 0x0a2a0001 },