Attachment 12993 Details for Bug 13456 – i830 render fix

[patch] i830 render fix

0001-more-i830-3d-state-initialization.patch (text/plain), 5.31 KB, created by Wang Zhenyu on 2007-12-07 02:38:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wang Zhenyu

Created: 2007-12-07 02:38:41 UTC

Size: 5.31 KB

patch

obsolete

>From 7720ea3bd6e4998f8a72d48aec8b15785b03e3c4 Mon Sep 17 00:00:00 2001
>From: Zhenyu Wang <zhenyu.z.wang@intel.com>
>Date: Fri, 7 Dec 2007 18:38:56 +0800
>Subject: [PATCH] more i830 3d state initialization
>
>---
> src/i830_3d.c |  135 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
> 1 files changed, 126 insertions(+), 9 deletions(-)
>
>diff --git a/src/i830_3d.c b/src/i830_3d.c
>index 563dcef..45e02c4 100644
>--- a/src/i830_3d.c
>+++ b/src/i830_3d.c
>@@ -38,7 +38,7 @@ void I830EmitInvarientState( ScrnInfoPtr pScrn )
> {
>    I830Ptr pI830 = I830PTR(pScrn);
> 
>-   BEGIN_LP_RING(40);
>+   BEGIN_LP_RING(58);
> 
>    OUT_RING(_3DSTATE_MAP_CUBE | MAP_UNIT(0));
>    OUT_RING(_3DSTATE_MAP_CUBE | MAP_UNIT(1));
>@@ -62,7 +62,6 @@ void I830EmitInvarientState( ScrnInfoPtr pScrn )
>    OUT_RING(0);
>    OUT_RING(0);
> 
>-
>    OUT_RING(_3DSTATE_MAP_TEX_STREAM_CMD |
> 	     MAP_UNIT(0) |
> 	     DISABLE_TEX_STREAM_BUMP |
>@@ -97,12 +96,6 @@ void I830EmitInvarientState( ScrnInfoPtr pScrn )
>    OUT_RING(_3DSTATE_MAP_COORD_TRANSFORM);
>    OUT_RING(DISABLE_TEX_TRANSFORM | TEXTURE_SET(3));
> 
>-   OUT_RING(_3DSTATE_MAP_COORD_SETBIND_CMD);
>-   OUT_RING(TEXBIND_SET3(TEXCOORDSRC_VTXSET_3) |
>-   	TEXBIND_SET2(TEXCOORDSRC_VTXSET_2) |
>-   	TEXBIND_SET1(TEXCOORDSRC_VTXSET_1) |
>-   	TEXBIND_SET0(TEXCOORDSRC_VTXSET_0));
>-	
>    OUT_RING(_3DSTATE_RASTER_RULES_CMD |
> 	     ENABLE_POINT_RASTER_RULE |
> 	     OGL_POINT_RASTER_RULE |
>@@ -127,9 +120,133 @@ void I830EmitInvarientState( ScrnInfoPtr pScrn )
>    OUT_RING(MAGIC_W_STATE_DWORD1);
>    OUT_RING(0x3f800000 /* 1.0 in IEEE float */ );
> 
>-
>    OUT_RING(_3DSTATE_COLOR_FACTOR_CMD);
>    OUT_RING(0x80808080);	/* .5 required in alpha for GL_DOT3_RGBA_EXT */
> 
>+   OUT_RING(_3DSTATE_MAP_COORD_SETBIND_CMD);
>+   OUT_RING(TEXBIND_SET3(TEXCOORDSRC_VTXSET_3) |
>+   	TEXBIND_SET2(TEXCOORDSRC_VTXSET_2) |
>+   	TEXBIND_SET1(TEXCOORDSRC_VTXSET_1) |
>+   	TEXBIND_SET0(TEXCOORDSRC_VTXSET_0));
>+
>+   /* copy from mesa */
>+   OUT_RING(_3DSTATE_INDPT_ALPHA_BLEND_CMD |
>+	   DISABLE_INDPT_ALPHA_BLEND |
>+	   ENABLE_ALPHA_BLENDFUNC |
>+	   ABLENDFUNC_ADD);
>+
>+   OUT_RING(_3DSTATE_FOG_COLOR_CMD |
>+	   FOG_COLOR_RED(0) |
>+	   FOG_COLOR_GREEN(0) |
>+	   FOG_COLOR_BLUE(0));
>+
>+   OUT_RING(_3DSTATE_CONST_BLEND_COLOR_CMD);
>+   OUT_RING(0);
>+
>+   OUT_RING(_3DSTATE_MODES_1_CMD |
>+	   ENABLE_COLR_BLND_FUNC |
>+	   BLENDFUNC_ADD |
>+	   ENABLE_SRC_BLND_FACTOR |
>+	   SRC_BLND_FACT(BLENDFACTOR_ONE) |
>+	   ENABLE_DST_BLND_FACTOR |
>+	   DST_BLND_FACT(BLENDFACTOR_ZERO)); 
>+   OUT_RING(_3DSTATE_MODES_2_CMD |
>+	   ENABLE_GLOBAL_DEPTH_BIAS |
>+	   GLOBAL_DEPTH_BIAS(0) |
>+	   ENABLE_ALPHA_TEST_FUNC|
>+	   ALPHA_TEST_FUNC(0) | /* always */
>+	   ALPHA_REF_VALUE(0));
>+   OUT_RING(_3DSTATE_MODES_3_CMD |
>+	   ENABLE_DEPTH_TEST_FUNC |
>+	   DEPTH_TEST_FUNC(0x2) | /* COMPAREFUNC_LESS */
>+	   ENABLE_ALPHA_SHADE_MODE |
>+	   ALPHA_SHADE_MODE(SHADE_MODE_LINEAR)
>+	   | ENABLE_FOG_SHADE_MODE |
>+	   FOG_SHADE_MODE(SHADE_MODE_LINEAR) |
>+	   ENABLE_SPEC_SHADE_MODE |
>+	   SPEC_SHADE_MODE(SHADE_MODE_LINEAR) |
>+	   ENABLE_COLOR_SHADE_MODE |
>+	   COLOR_SHADE_MODE(SHADE_MODE_LINEAR)
>+	   | ENABLE_CULL_MODE | CULLMODE_NONE);
>+
>+   OUT_RING(_3DSTATE_MODES_4_CMD |
>+	   ENABLE_LOGIC_OP_FUNC |
>+	   LOGIC_OP_FUNC(LOGICOP_COPY) |
>+	   ENABLE_STENCIL_TEST_MASK |
>+	   STENCIL_TEST_MASK(0xff) |
>+	   ENABLE_STENCIL_WRITE_MASK |
>+	   STENCIL_WRITE_MASK(0xff));
>+
>+   OUT_RING(_3DSTATE_STENCIL_TEST_CMD |
>+	   ENABLE_STENCIL_PARMS |
>+	   STENCIL_FAIL_OP(0) | /* STENCILOP_KEEP */
>+	   STENCIL_PASS_DEPTH_FAIL_OP(0) | /* STENCILOP_KEEP */
>+	   STENCIL_PASS_DEPTH_PASS_OP(0) | /* STENCILOP_KEEP */
>+	   ENABLE_STENCIL_TEST_FUNC |
>+	   STENCIL_TEST_FUNC(0) | /* COMPAREFUNC_ALWAYS */
>+	   ENABLE_STENCIL_REF_VALUE |
>+	   STENCIL_REF_VALUE(0));
>+
>+   OUT_RING(_3DSTATE_MODES_5_CMD |
>+	   FLUSH_TEXTURE_CACHE |
>+	   ENABLE_SPRITE_POINT_TEX |
>+	   SPRITE_POINT_TEX_OFF |
>+	   ENABLE_FIXED_LINE_WIDTH |
>+	   FIXED_LINE_WIDTH(0x2) |       /* 1.0 */
>+	   ENABLE_FIXED_POINT_WIDTH |
>+	   FIXED_POINT_WIDTH(1));
>+
>+   OUT_RING(_3DSTATE_ENABLES_1_CMD |
>+	   DISABLE_LOGIC_OP |
>+	   DISABLE_STENCIL_TEST |
>+	   DISABLE_DEPTH_BIAS |
>+	   DISABLE_SPEC_ADD |
>+	   DISABLE_FOG |
>+	   DISABLE_ALPHA_TEST |
>+	   ENABLE_COLOR_BLEND |
>+	   DISABLE_DEPTH_TEST);
>+   OUT_RING(_3DSTATE_ENABLES_2_CMD |
>+	   DISABLE_STENCIL_WRITE |
>+	   ENABLE_TEX_CACHE |
>+	   DISABLE_DITHER |			
>+	   ENABLE_COLOR_MASK |
>+	   ENABLE_COLOR_WRITE |
>+	   DISABLE_DEPTH_WRITE);
>+
>+   OUT_RING(_3DSTATE_STIPPLE); 
>+
>+   /* Set default blend state */
>+   OUT_RING(_3DSTATE_MAP_BLEND_OP_CMD(0) |
>+	   TEXPIPE_COLOR |
>+	   ENABLE_TEXOUTPUT_WRT_SEL |
>+	   TEXOP_OUTPUT_CURRENT |
>+	   DISABLE_TEX_CNTRL_STAGE |
>+	   TEXOP_SCALE_1X |
>+	   TEXOP_MODIFY_PARMS |
>+	   TEXOP_LAST_STAGE | TEXBLENDOP_ARG1);
>+   OUT_RING(_3DSTATE_MAP_BLEND_OP_CMD(0) |
>+	   TEXPIPE_ALPHA |
>+	   ENABLE_TEXOUTPUT_WRT_SEL |
>+	   TEXOP_OUTPUT_CURRENT |
>+	   TEXOP_SCALE_1X |
>+	   TEXOP_MODIFY_PARMS | TEXBLENDOP_ARG1);
>+   OUT_RING(_3DSTATE_MAP_BLEND_ARG_CMD(0) |
>+	   TEXPIPE_COLOR |
>+	   TEXBLEND_ARG1 |
>+	   TEXBLENDARG_MODIFY_PARMS |
>+	   TEXBLENDARG_DIFFUSE);
>+   OUT_RING(_3DSTATE_MAP_BLEND_ARG_CMD(0) |
>+	   TEXPIPE_ALPHA |
>+	   TEXBLEND_ARG1 |
>+	   TEXBLENDARG_MODIFY_PARMS |
>+	   TEXBLENDARG_DIFFUSE);
>+
>+   OUT_RING(_3DSTATE_AA_CMD |
>+	   AA_LINE_ECAAR_WIDTH_ENABLE |
>+	   AA_LINE_ECAAR_WIDTH_1_0 |
>+	   AA_LINE_REGION_WIDTH_ENABLE |
>+	   AA_LINE_REGION_WIDTH_1_0 |
>+	   AA_LINE_DISABLE);
>+
>    ADVANCE_LP_RING();
> }
>-- 
>1.5.3.6
>

Actions: View | Splinter Review

Attachments on bug 13456: 12922 | 12993

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.