diff options
| author | Ilia Mirkin <[email protected]> | 2016-06-25 18:15:57 -0400 |
|---|---|---|
| committer | Ilia Mirkin <[email protected]> | 2016-06-26 12:04:55 -0400 |
| commit | 1f5f64b91f23a311043a15f898db19ed0711f37c (patch) | |
| tree | 05e030734a66f0e433c2e1c42308cff9c0c6550e | |
| parent | 89a7496b9d3e705b7940e503b5cc01417da04495 (diff) | |
nvc0: update "derived" state function names
derived_1/2/etc aren't too informative. Instead name them based on the
state they're derived from.
Signed-off-by: Ilia Mirkin <[email protected]>
| -rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c index ea0bd23f002..558133fcc9f 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c @@ -614,7 +614,7 @@ nvc0_validate_driverconst(struct nvc0_context *nvc0) } static void -nvc0_validate_derived_1(struct nvc0_context *nvc0) +nvc0_validate_fp_zsa_rast(struct nvc0_context *nvc0) { struct nouveau_pushbuf *push = nvc0->base.pushbuf; bool rasterizer_discard; @@ -639,7 +639,7 @@ nvc0_validate_derived_1(struct nvc0_context *nvc0) * nvc0_validate_fb, otherwise that will override the RT count setting. */ static void -nvc0_validate_derived_2(struct nvc0_context *nvc0) +nvc0_validate_zsa_fb(struct nvc0_context *nvc0) { struct nouveau_pushbuf *push = nvc0->base.pushbuf; @@ -653,7 +653,7 @@ nvc0_validate_derived_2(struct nvc0_context *nvc0) } static void -nvc0_validate_derived_3(struct nvc0_context *nvc0) +nvc0_validate_blend_fb(struct nvc0_context *nvc0) { struct nouveau_pushbuf *push = nvc0->base.pushbuf; struct pipe_framebuffer_state *fb = &nvc0->framebuffer; @@ -672,7 +672,7 @@ nvc0_validate_derived_3(struct nvc0_context *nvc0) } static void -nvc0_validate_derived_4(struct nvc0_context *nvc0) +nvc0_validate_rast_fb(struct nvc0_context *nvc0) { struct nouveau_pushbuf *push = nvc0->base.pushbuf; struct pipe_framebuffer_state *fb = &nvc0->framebuffer; @@ -770,11 +770,11 @@ validate_list_3d[] = { NVC0_NEW_3D_FRAGPROG | NVC0_NEW_3D_FRAMEBUFFER }, { nvc0_fragprog_validate, NVC0_NEW_3D_FRAGPROG | NVC0_NEW_3D_RASTERIZER }, - { nvc0_validate_derived_1, NVC0_NEW_3D_FRAGPROG | NVC0_NEW_3D_ZSA | + { nvc0_validate_fp_zsa_rast, NVC0_NEW_3D_FRAGPROG | NVC0_NEW_3D_ZSA | NVC0_NEW_3D_RASTERIZER }, - { nvc0_validate_derived_2, NVC0_NEW_3D_ZSA | NVC0_NEW_3D_FRAMEBUFFER }, - { nvc0_validate_derived_3, NVC0_NEW_3D_BLEND | NVC0_NEW_3D_FRAMEBUFFER }, - { nvc0_validate_derived_4, NVC0_NEW_3D_RASTERIZER | NVC0_NEW_3D_FRAMEBUFFER }, + { 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 | NVC0_NEW_3D_TEVLPROG | |