From 6d1cdec3ba151168bfc3aef222fba6265dfb41fb Mon Sep 17 00:00:00 2001 From: Christoph Bumiller Date: Fri, 6 Apr 2012 15:41:55 +0200 Subject: nouveau: switch to libdrm_nouveau-2.0 --- src/gallium/drivers/nv50/nv50_resource.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/gallium/drivers/nv50/nv50_resource.h') diff --git a/src/gallium/drivers/nv50/nv50_resource.h b/src/gallium/drivers/nv50/nv50_resource.h index 50cc2afdbe1..5d5596ea6e3 100644 --- a/src/gallium/drivers/nv50/nv50_resource.h +++ b/src/gallium/drivers/nv50/nv50_resource.h @@ -4,10 +4,9 @@ #include "util/u_transfer.h" #include "util/u_double_list.h" -#define NOUVEAU_NVC0 + #include "nouveau/nouveau_winsys.h" #include "nouveau/nouveau_buffer.h" -#undef NOUVEAU_NVC0 #ifndef __NVC0_RESOURCE_H__ /* make sure we don't use these in nvc0: */ @@ -19,12 +18,12 @@ nv50_screen_init_resource_functions(struct pipe_screen *pscreen); #define NV50_TILE_SHIFT_X(m) 6 -#define NV50_TILE_SHIFT_Y(m) ((((m) >> 0) & 0xf) + 2) -#define NV50_TILE_SHIFT_Z(m) ((((m) >> 4) & 0xf) + 0) +#define NV50_TILE_SHIFT_Y(m) ((((m) >> 4) & 0xf) + 2) +#define NV50_TILE_SHIFT_Z(m) ((((m) >> 8) & 0xf) + 0) #define NV50_TILE_SIZE_X(m) 64 -#define NV50_TILE_SIZE_Y(m) ( 4 << (((m) >> 0) & 0xf)) -#define NV50_TILE_SIZE_Z(m) ( 1 << (((m) >> 4) & 0xf)) +#define NV50_TILE_SIZE_Y(m) ( 4 << (((m) >> 4) & 0xf)) +#define NV50_TILE_SIZE_Z(m) ( 1 << (((m) >> 8) & 0xf)) #define NV50_TILE_SIZE_2D(m) (NV50_TILE_SIZE_X(m) << NV50_TILE_SHIFT_Y(m)) -- cgit v1.2.3