search for: nv40_3d_class

...gt; > - 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 ? > + sem = TGSI_SEMANTIC_TEXCOORD; > emit = vroute[sem].emit; >...

...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-...

...++ b/src/gallium/drivers/nouveau/nv30/nv30_screen.c @@ -219,7 +219,7 @@ nv30_screen_get_shader_param(struct pipe_screen *pscreen, unsigned shader, case PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH: return 0; case PIPE_SHADER_CAP_MAX_INPUTS: - return (eng3d->oclass >= NV40_3D_CLASS) ? 12 : 10; + return (eng3d->oclass >= NV40_3D_CLASS) ? 10 : 8; case PIPE_SHADER_CAP_MAX_CONSTS: return (eng3d->oclass >= NV40_3D_CLASS) ? 224 : 32; case PIPE_SHADER_CAP_MAX_CONST_BUFFERS: -- 1.8.3.2

This makes the vertex buffer go to GART, not VRAM, and redoes the mapping to not use the UNSYNCHRONIZED access (which is meaningless on a VRAM buffer anyways). While we're at it, add some flushes for VBO data. Moving the vertex buffer from VRAM to GART makes glxgears work fully with NV30_SWTNL=1. The other changes just seem like a good idea. I'm not sure *why* moving the buffer from VRAM

Hi All, Here is a bunch of fixes for nv30 cards, the first patch is a resend of a patch I send a while back. AFAICT that one is ready for merging, but it is not entirely clear to me what the process is for getting (nouveau) mesa patches merged. Should I request commit rights, and push my own patches once they have been reviewed ? Regards, Hans

...> unsigned sample_count, > unsigned bindings) > { > - if (sample_count > 4) > - return false; > + struct nv30_screen *screen = nv30_screen(pscreen); > + > + if (screen->eng3d->oclass >= NV40_3D_CLASS) { > + if (sample_count > 4) > + return false; > + } else { > + if (sample_count > 0) > + return false; > + } > + > if (!(0x00000017 & (1 << sample_count))) > return false; > > -- > 2.4.3 > > ________...

...ndex 2146d27..4f68eee 100644 --- a/src/gallium/drivers/nouveau/nv30/nv30_context.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_context.c @@ -235,7 +235,6 @@ nv30_context_create(struct pipe_screen *pscreen, void *priv) /*XXX: nvfx... */ nv30->is_nv4x = (screen->eng3d->oclass >= NV40_3D_CLASS) ? ~0 : 0; - nv30->use_nv4x = (screen->eng3d->oclass >= NV40_3D_CLASS) ? ~0 : 0; nv30->render_mode = HW; nv30->sample_mask = 0xffff; diff --git a/src/gallium/drivers/nouveau/nv30/nv30_context.h b/src/gallium/drivers/nouveau/nv30/nv30_context.h index 527614a..d0cb5f5 10...

...samples <= 1 && > !util_format_is_depth_or_stencil(info.src.resource->format) && > !util_format_is_pure_integer(info.src.resource->format)) { > - nv30_resource_resolve(nv30, blit_info); > + if (nv30->screen->eng3d->oclass >= NV40_3D_CLASS) > + nv40_resource_resolve(nv30, blit_info); > + else > + nv30_resource_resolve(nv30, blit_info); > return; > } > > -- > 2.4.3 >

The sifm object has a limit of 1024x1024 for its input size and 2048x2048 for its output. The code checking this was trying to be clever resulting in it seeing a surface of e.g 1024x256 being outside of the input size limit. This commit fixes this. Signed-off-by: Hans de Goede <hdegoede at redhat.com> --- src/gallium/drivers/nouveau/nv30/nv30_transfer.c | 4 ++-- 1 file changed, 2

Hi, On 03-08-15 20:09, Ilia Mirkin wrote: > On Mon, Aug 3, 2015 at 1:31 PM, Hans de Goede <hdegoede at redhat.com> wrote: >> Hi, >> >> >> On 03-08-15 17:36, Ilia Mirkin wrote: >>> >>> On Mon, Aug 3, 2015 at 9:02 AM, Hans de Goede <hdegoede at redhat.com> wrote: >>>> >>>> Hi, >>>> >>>> On

...h, screen->ntfy->handle); /* FENCE */ + PUSH_DATA (push, screen->ntfy->handle); /* QUERY - intr 0x80 if nullobj */ PUSH_DATA (push, screen->null->handle); /* UNK1AC */ PUSH_DATA (push, screen->null->handle); /* UNK1B0 */ if (screen->eng3d->oclass < NV40_3D_CLASS) { @@ -562,51 +531,21 @@ nv30_screen_create(struct nouveau_device *dev) PUSH_DATA (push, NV40_3D_MIPMAP_ROUNDING_MODE_DOWN); } - ret = nouveau_object_new(screen->base.channel, 0xbeef3901, NV03_M2MF_CLASS, - NULL, 0, &screen->m2mf); - if (ret) -...

Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com> --- src/gallium/drivers/nouveau/nouveau_fence.c | 76 ++++++++++++------------- src/gallium/drivers/nouveau/nouveau_fence.h | 22 +++++-- src/gallium/drivers/nouveau/nouveau_screen.c | 9 +++ src/gallium/drivers/nouveau/nouveau_screen.h | 14 ++--- src/gallium/drivers/nouveau/nv30/nv30_context.c | 4 +-

...gt;handle); /* FENCE */ > + PUSH_DATA (push, screen->ntfy->handle); /* QUERY - intr 0x80 if nullobj */ > PUSH_DATA (push, screen->null->handle); /* UNK1AC */ > PUSH_DATA (push, screen->null->handle); /* UNK1B0 */ > if (screen->eng3d->oclass < NV40_3D_CLASS) { > @@ -562,51 +531,21 @@ nv30_screen_create(struct nouveau_device *dev) > PUSH_DATA (push, NV40_3D_MIPMAP_ROUNDING_MODE_DOWN); > } > > - ret = nouveau_object_new(screen->base.channel, 0xbeef3901, NV03_M2MF_CLASS, > - NULL, 0, &scree...

Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com> --- src/gallium/drivers/nouveau/nouveau_fence.c | 76 ++++++++++++------------- src/gallium/drivers/nouveau/nouveau_fence.h | 22 +++++-- src/gallium/drivers/nouveau/nouveau_screen.c | 9 +++ src/gallium/drivers/nouveau/nouveau_screen.h | 14 ++--- src/gallium/drivers/nouveau/nv30/nv30_context.c | 4