diff options
author | Marek Olšák <[email protected]> | 2010-04-11 05:06:27 +0200 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2010-04-11 06:40:46 +0200 |
commit | 2e7785be22181d6c6a10d2fd665bc41f8912b027 (patch) | |
tree | cc0e0865150feb6780095fdec8d0940830b913d9 /src/gallium/winsys | |
parent | e1208bbeaeefd12a445cef84cbd12b7dc346531f (diff) |
r300g: fix mipmapped 3D textures
This is a bug in the CS checker causing CS being rejected.
Diffstat (limited to 'src/gallium/winsys')
-rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_drm.c | 3 | ||||
-rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_r300.c | 2 | ||||
-rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_winsys.h | 3 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm.c b/src/gallium/winsys/radeon/drm/radeon_drm.c index 3dfcc5aef07..2809b578626 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm.c @@ -100,6 +100,9 @@ static void do_ioctls(int fd, struct radeon_libdrm_winsys* winsys) version->version_minor >= 1; #endif + /* XXX */ + winsys->tex3d_mip_bug = TRUE; + info.request = RADEON_INFO_DEVICE_ID; retval = drmCommandWriteRead(fd, DRM_RADEON_INFO, &info, sizeof(info)); if (retval) { diff --git a/src/gallium/winsys/radeon/drm/radeon_r300.c b/src/gallium/winsys/radeon/drm/radeon_r300.c index 735b93bc779..d1e65f87c36 100644 --- a/src/gallium/winsys/radeon/drm/radeon_r300.c +++ b/src/gallium/winsys/radeon/drm/radeon_r300.c @@ -264,6 +264,8 @@ static uint32_t radeon_get_value(struct r300_winsys_screen *rws, return ws->z_pipes; case R300_VID_SQUARE_TILING_SUPPORT: return ws->squaretiling; + case R300_VID_TEX3D_MIP_BUG: + return ws->tex3d_mip_bug; } return 0; } diff --git a/src/gallium/winsys/radeon/drm/radeon_winsys.h b/src/gallium/winsys/radeon/drm/radeon_winsys.h index 4260dbaad72..396f258c312 100644 --- a/src/gallium/winsys/radeon/drm/radeon_winsys.h +++ b/src/gallium/winsys/radeon/drm/radeon_winsys.h @@ -60,6 +60,9 @@ struct radeon_libdrm_winsys { /* Square tiling support. */ boolean squaretiling; + /* Square tiling support. */ + boolean tex3d_mip_bug; + /* DRM FD */ int fd; |