evergreeng: avoid overlapping border color btw VS & PS
authorJerome Glisse <jglisse@redhat.com>
Thu, 30 Sep 2010 21:06:29 +0000 (17:06 -0400)
committerJerome Glisse <jglisse@redhat.com>
Thu, 30 Sep 2010 21:07:28 +0000 (17:07 -0400)
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
src/gallium/winsys/r600/drm/evergreen_hw_context.c

index 7ba778e9f42db353cd15177cd08a94fbf7c0dfb6..7d6bd504a6fbe9d1e7ce090adba48db43c0cfa53 100644 (file)
@@ -467,7 +467,7 @@ static int evergreen_state_sampler_border_init(struct r600_context *ctx, u32 off
                {PKT3_SET_CONFIG_REG, 0, R_00A410_TD_PS_SAMPLER0_BORDER_ALPHA, 0, 0},
        };
        unsigned nreg = sizeof(r600_shader_sampler_border)/sizeof(struct r600_reg);
-       unsigned fake_offset = (offset - R_00A400_TD_PS_SAMPLER0_BORDER_INDEX) * 0x10 + 0x40000 + id * 0x1C;
+       unsigned fake_offset = (offset - R_00A400_TD_PS_SAMPLER0_BORDER_INDEX) * 0x100 + 0x40000 + id * 0x1C;
        struct r600_range *range;
        struct r600_block *block;
        int r;
@@ -665,7 +665,7 @@ static inline void evergreen_context_pipe_state_set_sampler(struct r600_context
 
 static inline void evergreen_context_pipe_state_set_sampler_border(struct r600_context *ctx, struct r600_pipe_state *state, unsigned offset, unsigned id)
 {
-       unsigned fake_offset = (offset - R_00A400_TD_PS_SAMPLER0_BORDER_INDEX) * 0x10 + 0x40000 + id * 0x1C;
+       unsigned fake_offset = (offset - R_00A400_TD_PS_SAMPLER0_BORDER_INDEX) * 0x100 + 0x40000 + id * 0x1C;
        struct r600_range *range;
        struct r600_block *block;