diff options
| author | Brian Paul <[email protected]> | 2010-03-22 09:07:46 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2010-03-22 09:07:46 -0600 |
| commit | 182c42c8da6edfa66819eef02f4dea310c1f68d7 (patch) | |
| tree | f49df694eae81c9db3c8fe2123bb30ef5a556891 /src/mesa/drivers/dri/intel/intel_reg.h | |
| parent | 5cb4a3524b54480418b4c4717c4a0f0a8669939c (diff) | |
| parent | ca97f8b9bab80844be613a9253643b7da8e738c7 (diff) | |
Merge branch '7.8'
Conflicts:
src/gallium/drivers/cell/ppu/cell_screen.c
src/mesa/state_tracker/st_cb_drawpixels.c
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_reg.h')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_reg.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_reg.h b/src/mesa/drivers/dri/intel/intel_reg.h index d19f1bae34c..36d8180598e 100644 --- a/src/mesa/drivers/dri/intel/intel_reg.h +++ b/src/mesa/drivers/dri/intel/intel_reg.h @@ -70,8 +70,10 @@ /** @{ * 915 definitions + * + * 915 documents say that bits 31:28 and 1 are "undefined, must be zero." */ -#define S0_VB_OFFSET_MASK 0xffffffc0 +#define S0_VB_OFFSET_MASK 0x0ffffffc #define S0_AUTO_CACHE_INV_DISABLE (1<<0) /** @} */ |