diff options
| author | Ilia Mirkin <[email protected]> | 2014-03-09 01:36:12 -0500 |
|---|---|---|
| committer | Ilia Mirkin <[email protected]> | 2014-03-09 01:38:10 -0500 |
| commit | 897f40f25d21af678b1b67c1a68c4a6722d19983 (patch) | |
| tree | 3607c81019071f518b843dc1c63e4493dadc4082 /src | |
| parent | 253314d4872ab4c4f01c0f1cd31ce4b71877ec30 (diff) | |
Revert nvc0 part of "nv50: adjust blit_3d handling of ms output textures"
The nvc0 bits don't appear to work, and I thought I had removed them
from the commit. Oops.
Signed-off-by: Ilia Mirkin <[email protected]>
Cc: "10.0 10.1" <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_surface.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c b/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c index d1bcfda3d16..32d234e3453 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c @@ -855,7 +855,6 @@ nvc0_blit_3d(struct nvc0_context *nvc0, const struct pipe_blit_info *info) float x0, x1, y0, y1, z; float dz; float x_range, y_range; - float tri_x, tri_y; blit->mode = nv50_blit_select_mode(info); blit->color_mask = nv50_blit_derive_color_mask(info); @@ -878,11 +877,8 @@ nvc0_blit_3d(struct nvc0_context *nvc0, const struct pipe_blit_info *info) x0 = (float)info->src.box.x - x_range * (float)info->dst.box.x; y0 = (float)info->src.box.y - y_range * (float)info->dst.box.y; - tri_x = 65536 << nv50_miptree(dst)->ms_x; - tri_y = 65536 << nv50_miptree(dst)->ms_y; - - x1 = x0 + tri_x * x_range; - y1 = y0 + tri_y * y_range; + x1 = x0 + 16384.0f * x_range; + y1 = y0 + 16384.0f * y_range; x0 *= (float)(1 << nv50_miptree(src)->ms_x); x1 *= (float)(1 << nv50_miptree(src)->ms_x); @@ -957,7 +953,7 @@ nvc0_blit_3d(struct nvc0_context *nvc0, const struct pipe_blit_info *info) PUSH_DATAf(push, z); BEGIN_NVC0(push, NVC0_3D(VTX_ATTR_DEFINE), 3); PUSH_DATA (push, 0x74200); - PUSH_DATAf(push, tri_x); + PUSH_DATAf(push, 16384 << nv50_miptree(dst)->ms_x); PUSH_DATAf(push, 0.0f); BEGIN_NVC0(push, NVC0_3D(VTX_ATTR_DEFINE), 4); PUSH_DATA (push, 0x74301); @@ -967,7 +963,7 @@ nvc0_blit_3d(struct nvc0_context *nvc0, const struct pipe_blit_info *info) BEGIN_NVC0(push, NVC0_3D(VTX_ATTR_DEFINE), 3); PUSH_DATA (push, 0x74200); PUSH_DATAf(push, 0.0f); - PUSH_DATAf(push, tri_y); + PUSH_DATAf(push, 16384 << nv50_miptree(dst)->ms_y); IMMED_NVC0(push, NVC0_3D(VERTEX_END_GL), 0); } |