diff options
| author | Eric Anholt <eric@anholt.net> | 2009-01-20 17:13:52 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-01-21 14:50:58 -0800 |
| commit | 64b08ed5ad46ccd76964972e39bfed8721a920aa (patch) | |
| tree | acc052690f519ef3d5f49c60744c1bf9c0154aa4 /src/i965_render.c | |
| parent | f126aabdf8952177bb15f392041da7a7094eb31b (diff) | |
Remove 965 render wm scratch space, which was just unused.
Diffstat (limited to 'src/i965_render.c')
| -rw-r--r-- | src/i965_render.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/i965_render.c b/src/i965_render.c index 0d7d8f3c..ef9b09fc 100644 --- a/src/i965_render.c +++ b/src/i965_render.c @@ -315,8 +315,6 @@ static const uint32_t sf_kernel_mask_static[][4] = { /* ps kernels */ #define PS_KERNEL_NUM_GRF 32 #define PS_MAX_THREADS 48 -#define PS_SCRATCH_SPACE 1024 -#define PS_SCRATCH_SPACE_LOG 0 /* log2 (PS_SCRATCH_SPACE) - 10 (1024 is 0, 2048 is 1) */ static const uint32_t ps_kernel_nomask_affine_static [][4] = { #include "exa_wm_xy.g4b" @@ -442,8 +440,6 @@ typedef struct brw_surface_state_padded { * state that we use for Render acceleration. */ typedef struct _gen4_static_state { - uint8_t wm_scratch[128 * PS_MAX_THREADS]; - KERNEL_DECL (sip_kernel); KERNEL_DECL (sf_kernel); KERNEL_DECL (sf_kernel_mask); @@ -662,7 +658,6 @@ cc_state_init (struct brw_cc_unit_state *cc_state, static void wm_state_init (struct brw_wm_unit_state *wm_state, Bool has_mask, - int scratch_offset, int kernel_offset, int sampler_state_offset) { @@ -670,10 +665,10 @@ wm_state_init (struct brw_wm_unit_state *wm_state, wm_state->thread0.grf_reg_count = BRW_GRF_BLOCKS(PS_KERNEL_NUM_GRF); wm_state->thread1.single_program_flow = 0; - assert((scratch_offset & 1023) == 0); - wm_state->thread2.scratch_space_base_pointer = scratch_offset >> 10; + /* scratch space is not used in our kernel */ + wm_state->thread2.scratch_space_base_pointer = 0; + wm_state->thread2.per_thread_scratch_space = 0; - wm_state->thread2.per_thread_scratch_space = PS_SCRATCH_SPACE_LOG; wm_state->thread3.const_urb_entry_read_length = 0; wm_state->thread3.const_urb_entry_read_offset = 0; @@ -791,8 +786,6 @@ gen4_static_state_init (gen4_static_state_t *static_state, wm_state_init(&static_state->wm_state_ ## kernel [i][j][k][l], \ has_mask, \ static_state_offset + offsetof(gen4_static_state_t, \ - wm_scratch), \ - static_state_offset + offsetof(gen4_static_state_t, \ ps_kernel_ ## kernel), \ static_state_offset + offsetof(gen4_static_state_t, \ sampler_state[i][j][k][l])); |