[Nouveau] [Mesa-stable] [PATCH] nv50: fix setting of texture ms info to be per-stage

[Carl Worth]

Ilia Mirkin <imirkin at alum.mit.edu> writes:
> Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
...
>  /* Sample position pairs for the current output MS level */
> -#define NV50_CB_AUX_SAMPLE_OFFSET 0x980
> +#define NV50_CB_AUX_SAMPLE_OFFSET 0x300
>  #define NV50_CB_AUX_SAMPLE_OFFSET_SIZE (4 * 8 * 2)
> -/* next spot: 0x9c0 */
> +/* next spot: 0x340 */
>  /* 4 32-bit floats for the vertex runout, put at the end */
>  #define NV50_CB_AUX_RUNOUT_OFFSET (NV50_CB_AUX_SIZE - 0x10)

This hunk of the patch isn't applying cleanly to 10.1.

I think the conflict resolution should be obvious to an author or
competent reviewer, but I didn't trust myself to get it right.

If one of you can follow up with a patch that applies cleanly to the
10.1 branch, I'll be happy to apply it.

-Carl

-- 
carl.d.worth at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/nouveau/attachments/20140513/5c1ccfe0/attachment.sig>