diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-11-19 00:02:17 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-11-19 08:34:59 +0000 |
| commit | fe944d61d53c275a168da2e9515d1e42be81630b (patch) | |
| tree | 144f62f24c30d281631ce40f5b2800c3474071be /src/sna/gen7_render.h | |
| parent | 70042400fd95f613b9547d0a72d6288abcc2357d (diff) | |
sna/gen7: Correct shifts for surface state
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/gen7_render.h')
| -rw-r--r-- | src/sna/gen7_render.h | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/src/sna/gen7_render.h b/src/sna/gen7_render.h index db784029..06ab0eeb 100644 --- a/src/sna/gen7_render.h +++ b/src/sna/gen7_render.h @@ -1311,29 +1311,20 @@ struct gen7_sampler_state { } ss3; }; - /* Surface state DW0 */ -#define GEN7_SURFACE_CUBEFACE_ENABLES 0x3f -#define GEN7_SURFACE_RC_READ_WRITE (1 << 7) -#define GEN7_SURFACE_TILED (1<< 12) -#define GEN7_SURFACE_TILED_Y (1<< 13) +#define GEN7_SURFACE_RC_READ_WRITE (1 << 8) +#define GEN7_SURFACE_TILED (1 << 14) +#define GEN7_SURFACE_TILED_Y (1 << 13) #define GEN7_SURFACE_FORMAT_SHIFT 18 -#define GEN7_SURFACE_FORMAT_MASK INTEL_MASK(26, 18) -#define GEN7_SURFACE_TYPE_SHIFT 28 +#define GEN7_SURFACE_TYPE_SHIFT 29 /* Surface state DW2 */ -#define GEN7_SURFACE_HEIGHT_SHIFT 19 -#define GEN7_SURFACE_HEIGHT_MASK INTEL_MASK(31, 19) -#define GEN7_SURFACE_WIDTH_SHIFT 6 -#define GEN7_SURFACE_WIDTH_MASK INTEL_MASK(18, 6) -#define GEN7_SURFACE_LOD_SHIFT 2 -#define GEN7_SURFACE_LOD_MASK INTEL_MASK(5, 2) +#define GEN7_SURFACE_HEIGHT_SHIFT 16 +#define GEN7_SURFACE_WIDTH_SHIFT 0 /* Surface state DW3 */ #define GEN7_SURFACE_DEPTH_SHIFT 21 -#define GEN7_SURFACE_DEPTH_MASK INTEL_MASK(31, GEN7_SURFACE_DEPTH_SHIFT) #define GEN7_SURFACE_PITCH_SHIFT 0 -#define GEN7_SURFACE_PITCH_MASK INTEL_MASK(18, GEN7_SURFACE_PITCH_SHIFT) /* _3DSTATE_VERTEX_BUFFERS on GEN7*/ /* DW1 */ |