border_color causes lockups with vertex buffers. Disabling for now.

diff --git a/src/mesa/drivers/dri/r300/r300_cmdbuf.c b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
index 586abdec4fbb20f0c851dbc6efcad69844e98626..7505f7ba33d6a416b5488cd281868786d6ec49cf 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_cmdbuf.c
+++ b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
@@ -451,8 +451,8 @@ void r300InitCmdBuf(r300ContextPtr r300)
        ALLOC_STATE( tex.unknown5, variable, mtu+1, "tex_unknown5", 0 );
                r300->hw.tex.unknown5.cmd[R300_TEX_CMD_0] = cmducs(R300_TX_UNK5_0, 0);
                
-       ALLOC_STATE( tex.border_color, variable, mtu+1, "tex_border_color", 0 );
-               r300->hw.tex.border_color.cmd[R300_TEX_CMD_0] = cmducs(R300_TX_BORDER_COLOR_0, 0);
+       //ALLOC_STATE( tex.border_color, variable, mtu+1, "tex_border_color", 0 );
+       //      r300->hw.tex.border_color.cmd[R300_TEX_CMD_0] = cmducs(R300_TX_BORDER_COLOR_0, 0);
        
 
        /* Setup the atom linked list */
@@ -531,7 +531,7 @@ void r300InitCmdBuf(r300ContextPtr r300)
        insert_at_tail(&r300->hw.atomlist, &r300->hw.tex.offset);
        insert_at_tail(&r300->hw.atomlist, &r300->hw.tex.unknown4);
        insert_at_tail(&r300->hw.atomlist, &r300->hw.tex.unknown5);
-       insert_at_tail(&r300->hw.atomlist, &r300->hw.tex.border_color);
+       //insert_at_tail(&r300->hw.atomlist, &r300->hw.tex.border_color);
 
        r300->hw.is_dirty = GL_TRUE;
        r300->hw.all_dirty = GL_TRUE;

diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h
index b390db83d36f10ca85a3c08c210a74fbe2e3aa13..af9ef419d1cf41e8190c8be7f7838d98719c1ff4 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_context.h
+++ b/src/mesa/drivers/dri/r300/r300_context.h
@@ -433,7 +433,7 @@ struct r300_hw_state {
                struct r300_state_atom offset;
                struct r300_state_atom unknown4;
                struct r300_state_atom unknown5;
-               struct r300_state_atom border_color;
+               //struct r300_state_atom border_color;
                } tex;
        struct r300_state_atom txe;     /* tex enable (4104) */
 };

diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index aeeec96806f3b7ab62bbdbf38bce6b38356c329b..2e36437e20d306ed2e5408ec709450f22dbde22a 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -1020,7 +1020,7 @@ void r300_setup_textures(GLcontext *ctx)
        R300_STATECHANGE(r300, tex.offset);
        R300_STATECHANGE(r300, tex.unknown4);
        R300_STATECHANGE(r300, tex.unknown5);
-       R300_STATECHANGE(r300, tex.border_color);
+       //R300_STATECHANGE(r300, tex.border_color);
 
        r300->state.texture.tc_count=0;
 
@@ -1060,7 +1060,7 @@ void r300_setup_textures(GLcontext *ctx)
                        r300->hw.tex.offset.cmd[R300_TEX_VALUE_0+i]=r300->radeon.radeonScreen->fbLocation+t->offset;
                        r300->hw.tex.unknown4.cmd[R300_TEX_VALUE_0+i]=0x0;
                        r300->hw.tex.unknown5.cmd[R300_TEX_VALUE_0+i]=0x0;
-                       r300->hw.tex.border_color.cmd[R300_TEX_VALUE_0+i]=t->pp_border_color;
+                       //r300->hw.tex.border_color.cmd[R300_TEX_VALUE_0+i]=t->pp_border_color;
                        }
 
                }
@@ -1071,7 +1071,7 @@ void r300_setup_textures(GLcontext *ctx)
        ((drm_r300_cmd_header_t*)r300->hw.tex.offset.cmd)->unchecked_state.count = max_texture_unit+1;
        ((drm_r300_cmd_header_t*)r300->hw.tex.unknown4.cmd)->unchecked_state.count = max_texture_unit+1;
        ((drm_r300_cmd_header_t*)r300->hw.tex.unknown5.cmd)->unchecked_state.count = max_texture_unit+1;
-       ((drm_r300_cmd_header_t*)r300->hw.tex.border_color.cmd)->unchecked_state.count = max_texture_unit+1;
+       //((drm_r300_cmd_header_t*)r300->hw.tex.border_color.cmd)->unchecked_state.count = max_texture_unit+1;
 
        if (RADEON_DEBUG & DEBUG_STATE)
                fprintf(stderr, "TX_ENABLE: %08x  max_texture_unit=%d\n", r300->hw.txe.cmd[R300_TXE_ENABLE], max_texture_unit);