diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2016-10-19 22:36:03 -0400 |
|---|---|---|
| committer | Ilia Mirkin <imirkin@alum.mit.edu> | 2016-10-21 02:28:26 -0400 |
| commit | 8cf0f057130ffb322344dbda8d18c93836ef6fed (patch) | |
| tree | 1c705c20b0786727a24ae1137254352ad5f4b5f6 /src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c | |
| parent | 811eb7f178b8b85ac299121ac09a3180b9b55da2 (diff) | |
nv50,nvc0: don't keep track of whether fb rt0 is integer-only
This reverts commits 1af0641db345209c076e9b1ba4dca7524541671a and
a6ad49cbbd599aec054d0a3163fff5ad724f2b18.
st/mesa adjusts the rasterizer state for us now.
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Diffstat (limited to 'src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c')
| -rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c index 1d8ebe642bb..88766f42590 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c @@ -1,5 +1,4 @@ -#include "util/u_format.h" #include "util/u_framebuffer.h" #include "util/u_math.h" #include "util/u_viewport.h" @@ -672,25 +671,6 @@ nvc0_validate_zsa_fb(struct nvc0_context *nvc0) } static void -nvc0_validate_blend_fb(struct nvc0_context *nvc0) -{ - struct nouveau_pushbuf *push = nvc0->base.pushbuf; - struct pipe_framebuffer_state *fb = &nvc0->framebuffer; - uint32_t ms = 0; - - if ((!fb->nr_cbufs || !fb->cbufs[0] || - !util_format_is_pure_integer(fb->cbufs[0]->format)) && nvc0->blend) { - if (nvc0->blend->pipe.alpha_to_coverage) - ms |= NVC0_3D_MULTISAMPLE_CTRL_ALPHA_TO_COVERAGE; - if (nvc0->blend->pipe.alpha_to_one) - ms |= NVC0_3D_MULTISAMPLE_CTRL_ALPHA_TO_ONE; - } - - BEGIN_NVC0(push, NVC0_3D(MULTISAMPLE_CTRL), 1); - PUSH_DATA (push, ms); -} - -static void nvc0_validate_rast_fb(struct nvc0_context *nvc0) { struct nouveau_pushbuf *push = nvc0->base.pushbuf; @@ -792,7 +772,6 @@ validate_list_3d[] = { { nvc0_validate_fp_zsa_rast, NVC0_NEW_3D_FRAGPROG | NVC0_NEW_3D_ZSA | NVC0_NEW_3D_RASTERIZER }, { nvc0_validate_zsa_fb, NVC0_NEW_3D_ZSA | NVC0_NEW_3D_FRAMEBUFFER }, - { nvc0_validate_blend_fb, NVC0_NEW_3D_BLEND | NVC0_NEW_3D_FRAMEBUFFER }, { nvc0_validate_rast_fb, NVC0_NEW_3D_RASTERIZER | NVC0_NEW_3D_FRAMEBUFFER }, { nvc0_validate_clip, NVC0_NEW_3D_CLIP | NVC0_NEW_3D_RASTERIZER | NVC0_NEW_3D_VERTPROG | |