thr3ads.net - Nouveau - [Nouveau] [PATCH 2/2] nv30/draw: switch varying hookup logic to know about texcoords [May 2015]

If this information is useful, please help other people find it:
Share via:

Tobias Klausmann

2015-May-26 00:55 UTC

[Nouveau] [PATCH 2/2] nv30/draw: switch varying hookup logic to know about texcoords

On 26.05.2015 02:49, Ilia Mirkin wrote:> On Mon, May 25, 2015 at 8:37 PM, Tobias Klausmann
> <tobias.johannes.klausmann at mni.thm.de> wrote:
>>
>> On 25.05.2015 21:29, Ilia Mirkin wrote:
>>> Commit 8acaf862dfe switched things over to use TEXCOORD instead of
>>> GENERIC, but did not update the nv30 swtnl draw paths. This teaches
the
>>> draw logic about TEXCOORD.
>>>
>>> Among other things, this fixes a crash in demos/arbocclude when
using
>>> swtnl. Curiously enough, the point-sprite piglit works without
this.
>>>
>>> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
>>> Cc: "10.5 10.6" <mesa-stable at
lists.freedesktop.org>
>>> ---
>>>    src/gallium/drivers/nouveau/nv30/nv30_draw.c | 25
>>> ++++++++++++++++---------
>>>    1 file changed, 16 insertions(+), 9 deletions(-)
>>>
>>> diff --git a/src/gallium/drivers/nouveau/nv30/nv30_draw.c
>>> b/src/gallium/drivers/nouveau/nv30/nv30_draw.c
>>> index a681135..03c0c70 100644
>>> --- a/src/gallium/drivers/nouveau/nv30/nv30_draw.c
>>> +++ b/src/gallium/drivers/nouveau/nv30/nv30_draw.c
>>> @@ -230,22 +230,24 @@ static const struct {
>>>       [TGSI_SEMANTIC_BCOLOR  ] = { EMIT_4F, INTERP_LINEAR     , 1,
3,
>>> 0x00000004 },
>>>       [TGSI_SEMANTIC_FOG     ] = { EMIT_4F, INTERP_PERSPECTIVE, 5,
5,
>>> 0x00000010 },
>>>       [TGSI_SEMANTIC_PSIZE   ] = { EMIT_1F_PSIZE, INTERP_POS  , 6,
6,
>>> 0x00000020 },
>>> -   [TGSI_SEMANTIC_GENERIC ] = { EMIT_4F, INTERP_PERSPECTIVE, 8, 7,
>>> 0x00004000 }
>>> +   [TGSI_SEMANTIC_TEXCOORD] = { EMIT_4F, INTERP_PERSPECTIVE, 8, 7,
>>> 0x00004000 },
>>>    };
>>>      static boolean
>>>    vroute_add(struct nv30_render *r, uint attrib, uint sem, uint
*idx)
>>>    {
>>> -   struct pipe_screen *pscreen =
&r->nv30->screen->base.base;
>>> +   struct nv30_screen *screen = r->nv30->screen;
>>>       struct nv30_fragprog *fp = r->nv30->fragprog.program;
>>>       struct vertex_info *vinfo = &r->vertex_info;
>>>       enum pipe_format format;
>>>       uint emit = EMIT_OMIT;
>>>       uint result = *idx;
>>>    -   if (sem == TGSI_SEMANTIC_GENERIC && result >= 8)
{
>>> -      for (result = 0; result < 8; result++) {
>>> -         if (fp->texcoord[result] == *idx) {
>>> +   if (sem == TGSI_SEMANTIC_GENERIC) {
>>> +      uint num_texcoords = (screen->eng3d->oclass <
NV40_3D_CLASS) ? 8 :
>>> 10;
>>> +      for (result = 0; result < num_texcoords; result++) {
>>> +         if (fp->texcoord[result] == *idx + 8) {
>>
>> maybe i'm too tired, but why exactly *idx + 8 ?
> See nvfx_fragprog.c:
>
>                 fpc->fp->texcoord[hw] = fdec->Semantic.Index + 8;
>
> when the semantic is GENERIC. (and 0xfffe when it's PCOORD). This is
> because there can be up to 8 TEXCOORD's.
yet you run for 8 or 10 texcoords. Wont this cause problems on nv40+?
>
>>> +            sem = TGSI_SEMANTIC_TEXCOORD;
>>>                emit = vroute[sem].emit;
>>>                break;
>>>             }
>>> @@ -260,11 +262,11 @@ vroute_add(struct nv30_render *r, uint
attrib, uint
>>> sem, uint *idx)
>>>       draw_emit_vertex_attr(vinfo, emit, vroute[sem].interp,
attrib);
>>>       format = draw_translate_vinfo_format(emit);
>>>    -   r->vtxfmt[attrib] = nv30_vtxfmt(pscreen, format)->hw;
>>> +   r->vtxfmt[attrib] = nv30_vtxfmt(&screen->base.base,
format)->hw;
>>>       r->vtxptr[attrib] = vinfo->size | NV30_3D_VTXBUF_DMA1;
>>>       vinfo->size += draw_translate_vinfo_size(emit);
>>>    -   if (nv30_screen(pscreen)->eng3d->oclass <
NV40_3D_CLASS) {
>>> +   if (screen->eng3d->oclass < NV40_3D_CLASS) {
>>>          r->vtxprog[attrib][0] = 0x001f38d8;
>>>          r->vtxprog[attrib][1] = 0x0080001b | (attrib <<
9);
>>>          r->vtxprog[attrib][2] = 0x0836106c;
>>> @@ -276,7 +278,12 @@ vroute_add(struct nv30_render *r, uint attrib,
uint
>>> sem, uint *idx)
>>>          r->vtxprog[attrib][3] = 0x6041ff80 | (result +
vroute[sem].vp40)
>>> << 2;
>>>       }
>>>    -   *idx = vroute[sem].ow40 << result;
>>> +   if (result < 8)
>>> +      *idx = vroute[sem].ow40 << result;
>>> +   else {
>>> +      assert(sem == TGSI_SEMANTIC_TEXCOORD);
>>> +      *idx = 0x00001000 << (result - 8);
>>> +   }
>>>       return TRUE;
>>>    }
>>>    @@ -330,7 +337,7 @@ nv30_render_validate(struct nv30_context
*nv30)
>>>         while (pntc && attrib < 16) {
>>>          uint index = ffs(pntc) - 1; pntc &= ~(1 <<
index);
>>> -      if (vroute_add(r, attrib, TGSI_SEMANTIC_GENERIC,
&index)) {
>>> +      if (vroute_add(r, attrib, TGSI_SEMANTIC_TEXCOORD,
&index)) {
>>>             vp_attribs |= (1 << attrib++);
>>>             vp_results |= index;
>>>          }
>>

Ilia Mirkin

2015-May-26 00:59 UTC

head link

[Nouveau] [PATCH 2/2] nv30/draw: switch varying hookup logic to know about texcoords

On Mon, May 25, 2015 at 8:55 PM, Tobias Klausmann
<tobias.johannes.klausmann at mni.thm.de> wrote:>
>
> On 26.05.2015 02:49, Ilia Mirkin wrote:
>>
>> On Mon, May 25, 2015 at 8:37 PM, Tobias Klausmann
>> <tobias.johannes.klausmann at mni.thm.de> wrote:
>>>
>>>
>>> On 25.05.2015 21:29, Ilia Mirkin wrote:
>>>>
>>>> Commit 8acaf862dfe switched things over to use TEXCOORD instead
of
>>>> GENERIC, but did not update the nv30 swtnl draw paths. This
teaches the
>>>> draw logic about TEXCOORD.
>>>>
>>>> Among other things, this fixes a crash in demos/arbocclude when
using
>>>> swtnl. Curiously enough, the point-sprite piglit works without
this.
>>>>
>>>> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
>>>> Cc: "10.5 10.6" <mesa-stable at
lists.freedesktop.org>
>>>> ---
>>>>    src/gallium/drivers/nouveau/nv30/nv30_draw.c | 25
>>>> ++++++++++++++++---------
>>>>    1 file changed, 16 insertions(+), 9 deletions(-)
>>>>
>>>> diff --git a/src/gallium/drivers/nouveau/nv30/nv30_draw.c
>>>> b/src/gallium/drivers/nouveau/nv30/nv30_draw.c
>>>> index a681135..03c0c70 100644
>>>> --- a/src/gallium/drivers/nouveau/nv30/nv30_draw.c
>>>> +++ b/src/gallium/drivers/nouveau/nv30/nv30_draw.c
>>>> @@ -230,22 +230,24 @@ static const struct {
>>>>       [TGSI_SEMANTIC_BCOLOR  ] = { EMIT_4F, INTERP_LINEAR     ,
1, 3,
>>>> 0x00000004 },
>>>>       [TGSI_SEMANTIC_FOG     ] = { EMIT_4F, INTERP_PERSPECTIVE,
5, 5,
>>>> 0x00000010 },
>>>>       [TGSI_SEMANTIC_PSIZE   ] = { EMIT_1F_PSIZE, INTERP_POS  ,
6, 6,
>>>> 0x00000020 },
>>>> -   [TGSI_SEMANTIC_GENERIC ] = { EMIT_4F, INTERP_PERSPECTIVE,
8, 7,
>>>> 0x00004000 }
>>>> +   [TGSI_SEMANTIC_TEXCOORD] = { EMIT_4F, INTERP_PERSPECTIVE,
8, 7,
>>>> 0x00004000 },
>>>>    };
>>>>      static boolean
>>>>    vroute_add(struct nv30_render *r, uint attrib, uint sem,
uint *idx)
>>>>    {
>>>> -   struct pipe_screen *pscreen =
&r->nv30->screen->base.base;
>>>> +   struct nv30_screen *screen = r->nv30->screen;
>>>>       struct nv30_fragprog *fp =
r->nv30->fragprog.program;
>>>>       struct vertex_info *vinfo = &r->vertex_info;
>>>>       enum pipe_format format;
>>>>       uint emit = EMIT_OMIT;
>>>>       uint result = *idx;
>>>>    -   if (sem == TGSI_SEMANTIC_GENERIC && result >=
8) {
>>>> -      for (result = 0; result < 8; result++) {
>>>> -         if (fp->texcoord[result] == *idx) {
>>>> +   if (sem == TGSI_SEMANTIC_GENERIC) {
>>>> +      uint num_texcoords = (screen->eng3d->oclass <
NV40_3D_CLASS) ? 8
>>>> :
>>>> 10;
>>>> +      for (result = 0; result < num_texcoords; result++) {
>>>> +         if (fp->texcoord[result] == *idx + 8) {
>>>
>>>
>>> maybe i'm too tired, but why exactly *idx + 8 ?
>>
>> See nvfx_fragprog.c:
>>
>>                 fpc->fp->texcoord[hw] = fdec->Semantic.Index +
8;
>>
>> when the semantic is GENERIC. (and 0xfffe when it's PCOORD). This
is
>> because there can be up to 8 TEXCOORD's.
>
>
> yet you run for 8 or 10 texcoords. Wont this cause problems on nv40+?
this is just the handle... it could just as well be + 1000. As long as
it's > 8, since that's what gets stored for the TEXCOORD semantics.
>
>
>>
>>>> +            sem = TGSI_SEMANTIC_TEXCOORD;
>>>>                emit = vroute[sem].emit;
>>>>                break;
>>>>             }
>>>> @@ -260,11 +262,11 @@ vroute_add(struct nv30_render *r, uint
attrib,
>>>> uint
>>>> sem, uint *idx)
>>>>       draw_emit_vertex_attr(vinfo, emit, vroute[sem].interp,
attrib);
>>>>       format = draw_translate_vinfo_format(emit);
>>>>    -   r->vtxfmt[attrib] = nv30_vtxfmt(pscreen,
format)->hw;
>>>> +   r->vtxfmt[attrib] =
nv30_vtxfmt(&screen->base.base, format)->hw;
>>>>       r->vtxptr[attrib] = vinfo->size |
NV30_3D_VTXBUF_DMA1;
>>>>       vinfo->size += draw_translate_vinfo_size(emit);
>>>>    -   if (nv30_screen(pscreen)->eng3d->oclass <
NV40_3D_CLASS) {
>>>> +   if (screen->eng3d->oclass < NV40_3D_CLASS) {
>>>>          r->vtxprog[attrib][0] = 0x001f38d8;
>>>>          r->vtxprog[attrib][1] = 0x0080001b | (attrib
<< 9);
>>>>          r->vtxprog[attrib][2] = 0x0836106c;
>>>> @@ -276,7 +278,12 @@ vroute_add(struct nv30_render *r, uint
attrib, uint
>>>> sem, uint *idx)
>>>>          r->vtxprog[attrib][3] = 0x6041ff80 | (result +
>>>> vroute[sem].vp40)
>>>> << 2;
>>>>       }
>>>>    -   *idx = vroute[sem].ow40 << result;
>>>> +   if (result < 8)
>>>> +      *idx = vroute[sem].ow40 << result;
>>>> +   else {
>>>> +      assert(sem == TGSI_SEMANTIC_TEXCOORD);
>>>> +      *idx = 0x00001000 << (result - 8);
>>>> +   }
>>>>       return TRUE;
>>>>    }
>>>>    @@ -330,7 +337,7 @@ nv30_render_validate(struct nv30_context
*nv30)
>>>>         while (pntc && attrib < 16) {
>>>>          uint index = ffs(pntc) - 1; pntc &= ~(1 <<
index);
>>>> -      if (vroute_add(r, attrib, TGSI_SEMANTIC_GENERIC,
&index)) {
>>>> +      if (vroute_add(r, attrib, TGSI_SEMANTIC_TEXCOORD,
&index)) {
>>>>             vp_attribs |= (1 << attrib++);
>>>>             vp_results |= index;
>>>>          }
>>>
>>>
>

Tobias Klausmann

2015-May-26 11:12 UTC

head link

[Nouveau] [PATCH 2/2] nv30/draw: switch varying hookup logic to know about texcoords

On 26.05.2015 02:59, Ilia Mirkin wrote:> On Mon, May 25, 2015 at 8:55 PM, Tobias Klausmann
> <tobias.johannes.klausmann at mni.thm.de> wrote:
>>
>> On 26.05.2015 02:49, Ilia Mirkin wrote:
>>> On Mon, May 25, 2015 at 8:37 PM, Tobias Klausmann
>>> <tobias.johannes.klausmann at mni.thm.de> wrote:
>>>>
>>>> On 25.05.2015 21:29, Ilia Mirkin wrote:
>>>>> Commit 8acaf862dfe switched things over to use TEXCOORD
instead of
>>>>> GENERIC, but did not update the nv30 swtnl draw paths. This
teaches the
>>>>> draw logic about TEXCOORD.
>>>>>
>>>>> Among other things, this fixes a crash in demos/arbocclude
when using
>>>>> swtnl. Curiously enough, the point-sprite piglit works
without this.
>>>>>
>>>>> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
>>>>> Cc: "10.5 10.6" <mesa-stable at
lists.freedesktop.org>
>>>>> ---
>>>>>     src/gallium/drivers/nouveau/nv30/nv30_draw.c | 25
>>>>> ++++++++++++++++---------
>>>>>     1 file changed, 16 insertions(+), 9 deletions(-)
>>>>>
>>>>> diff --git a/src/gallium/drivers/nouveau/nv30/nv30_draw.c
>>>>> b/src/gallium/drivers/nouveau/nv30/nv30_draw.c
>>>>> index a681135..03c0c70 100644
>>>>> --- a/src/gallium/drivers/nouveau/nv30/nv30_draw.c
>>>>> +++ b/src/gallium/drivers/nouveau/nv30/nv30_draw.c
>>>>> @@ -230,22 +230,24 @@ static const struct {
>>>>>        [TGSI_SEMANTIC_BCOLOR  ] = { EMIT_4F, INTERP_LINEAR 
, 1, 3,
>>>>> 0x00000004 },
>>>>>        [TGSI_SEMANTIC_FOG     ] = { EMIT_4F,
INTERP_PERSPECTIVE, 5, 5,
>>>>> 0x00000010 },
>>>>>        [TGSI_SEMANTIC_PSIZE   ] = { EMIT_1F_PSIZE,
INTERP_POS  , 6, 6,
>>>>> 0x00000020 },
>>>>> -   [TGSI_SEMANTIC_GENERIC ] = { EMIT_4F,
INTERP_PERSPECTIVE, 8, 7,
>>>>> 0x00004000 }
>>>>> +   [TGSI_SEMANTIC_TEXCOORD] = { EMIT_4F,
INTERP_PERSPECTIVE, 8, 7,
>>>>> 0x00004000 },
>>>>>     };
>>>>>       static boolean
>>>>>     vroute_add(struct nv30_render *r, uint attrib, uint
sem, uint *idx)
>>>>>     {
>>>>> -   struct pipe_screen *pscreen =
&r->nv30->screen->base.base;
>>>>> +   struct nv30_screen *screen = r->nv30->screen;
>>>>>        struct nv30_fragprog *fp =
r->nv30->fragprog.program;
>>>>>        struct vertex_info *vinfo = &r->vertex_info;
>>>>>        enum pipe_format format;
>>>>>        uint emit = EMIT_OMIT;
>>>>>        uint result = *idx;
>>>>>     -   if (sem == TGSI_SEMANTIC_GENERIC && result
>= 8) {
>>>>> -      for (result = 0; result < 8; result++) {
>>>>> -         if (fp->texcoord[result] == *idx) {
>>>>> +   if (sem == TGSI_SEMANTIC_GENERIC) {
>>>>> +      uint num_texcoords = (screen->eng3d->oclass
< NV40_3D_CLASS) ? 8
>>>>> :
>>>>> 10;
>>>>> +      for (result = 0; result < num_texcoords;
result++) {
>>>>> +         if (fp->texcoord[result] == *idx + 8) {
>>>>
>>>> maybe i'm too tired, but why exactly *idx + 8 ?
>>> See nvfx_fragprog.c:
>>>
>>>                  fpc->fp->texcoord[hw] =
fdec->Semantic.Index + 8;
>>>
>>> when the semantic is GENERIC. (and 0xfffe when it's PCOORD).
This is
>>> because there can be up to 8 TEXCOORD's.
>>
>> yet you run for 8 or 10 texcoords. Wont this cause problems on nv40+?
> this is just the handle... it could just as well be + 1000. As long as
> it's > 8, since that's what gets stored for the TEXCOORD
semantics.
oh right :)
>>
>>>>> +            sem = TGSI_SEMANTIC_TEXCOORD;
>>>>>                 emit = vroute[sem].emit;
>>>>>                 break;
>>>>>              }
>>>>> @@ -260,11 +262,11 @@ vroute_add(struct nv30_render *r,
uint attrib,
>>>>> uint
>>>>> sem, uint *idx)
>>>>>        draw_emit_vertex_attr(vinfo, emit,
vroute[sem].interp, attrib);
>>>>>        format = draw_translate_vinfo_format(emit);
>>>>>     -   r->vtxfmt[attrib] = nv30_vtxfmt(pscreen,
format)->hw;
>>>>> +   r->vtxfmt[attrib] =
nv30_vtxfmt(&screen->base.base, format)->hw;
>>>>>        r->vtxptr[attrib] = vinfo->size |
NV30_3D_VTXBUF_DMA1;
>>>>>        vinfo->size += draw_translate_vinfo_size(emit);
>>>>>     -   if (nv30_screen(pscreen)->eng3d->oclass <
NV40_3D_CLASS) {
>>>>> +   if (screen->eng3d->oclass < NV40_3D_CLASS) {
>>>>>           r->vtxprog[attrib][0] = 0x001f38d8;
>>>>>           r->vtxprog[attrib][1] = 0x0080001b | (attrib
<< 9);
>>>>>           r->vtxprog[attrib][2] = 0x0836106c;
>>>>> @@ -276,7 +278,12 @@ vroute_add(struct nv30_render *r, uint
attrib, uint
>>>>> sem, uint *idx)
>>>>>           r->vtxprog[attrib][3] = 0x6041ff80 | (result +
>>>>> vroute[sem].vp40)
>>>>> << 2;
>>>>>        }
>>>>>     -   *idx = vroute[sem].ow40 << result;
>>>>> +   if (result < 8)
>>>>> +      *idx = vroute[sem].ow40 << result;
>>>>> +   else {
>>>>> +      assert(sem == TGSI_SEMANTIC_TEXCOORD);
>>>>> +      *idx = 0x00001000 << (result - 8);
>>>>> +   }
>>>>>        return TRUE;
>>>>>     }
>>>>>     @@ -330,7 +337,7 @@ nv30_render_validate(struct
nv30_context *nv30)
>>>>>          while (pntc && attrib < 16) {
>>>>>           uint index = ffs(pntc) - 1; pntc &= ~(1
<< index);
>>>>> -      if (vroute_add(r, attrib, TGSI_SEMANTIC_GENERIC,
&index)) {
>>>>> +      if (vroute_add(r, attrib, TGSI_SEMANTIC_TEXCOORD,
&index)) {
>>>>>              vp_attribs |= (1 << attrib++);
>>>>>              vp_results |= index;
>>>>>           }
>>>>

Nouveau - May 2015 - [PATCH 2/2] nv30/draw: switch varying hookup logic to know about texcoords

[Nouveau] [PATCH 2/2] nv30/draw: switch varying hookup logic to know about texcoords

[Nouveau] [PATCH 2/2] nv30/draw: switch varying hookup logic to know about texcoords

[Nouveau] [PATCH 2/2] nv30/draw: switch varying hookup logic to know about texcoords