search for: pictureptr

...{}, + +}, nv20_tex_format_rect[] = { + { PICT_a8, 0xd80 }, + { PICT_r5g6b5, 0x880 }, + { PICT_x8r8g8b8, 0x900 }, + { PICT_a8r8g8b8, 0x900 }, + {}, + +}, nv10_rt_format[] = { + { PICT_r5g6b5, 0x103 }, + { PICT_x8r8g8b8, 0x108 }, + { PICT_a8r8g8b8, 0x108 }, + {}, +}; + +static int +get_tex_format(PicturePtr pict) +{ + ScrnInfoPtr pScrn = xf86Screens[pict->pDrawable->pScreen->myNum]; + NVPtr pNv = NVPTR(pScrn); + + /* If repeat is set we're always handling a 1x1 texture with + * ARGB/XRGB destination, in that case we change the format to + * use the POT (swizzled) matching format. + */...

..., NV34TCL_BLEND_FUNC_ENABLE, 3); OUT_RING (chan, 1); - OUT_RING (chan, (sblend << 16) | sblend); - OUT_RING (chan, (dblend << 16) | dblend); + OUT_RING (chan, sblend); + OUT_RING (chan, dblend); } } @@ -305,43 +255,47 @@ NV30EXATexture(ScrnInfoPtr pScrn, PixmapPtr pPix, PicturePtr pPict, int unit) struct nouveau_channel *chan = pNv->chan; struct nouveau_grobj *rankine = pNv->Nv3D; struct nouveau_bo *bo = nouveau_pixmap_bo(pPix); - nv_pict_texture_format_t *fmt; - uint32_t card_filter, card_repeat; uint32_t tex_reloc = NOUVEAU_BO_VRAM | NOUVEAU_BO_GART | NOUVEAU...

The higher 0x800 was getting overwritten by the 0x7ff anyways, so it wasn't doing any good. The mesa driver just uses 0x800 for the low portion and doesn't set the 8 bit in the higher portion, so do the same thing here. Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu> --- src/nv10_exa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nv10_exa.c

...PUSH_DATA(push, 0x000000000); > + PUSH_DATA(push, 0x000000000); > + } > + } > +} > + > #endif > diff --git a/src/nvc0_exa.c b/src/nvc0_exa.c > index a53dfe6..017a7da 100644 > --- a/src/nvc0_exa.c > +++ b/src/nvc0_exa.c > @@ -532,20 +532,13 @@ NVC0EXACheckTexture(PicturePtr ppict, PicturePtr pdpict, int op) > static Bool > NVC0EXAPictSolid(NVPtr pNv, PicturePtr ppict, unsigned unit) > { > - uint64_t offset = pNv->scratch->offset + SOLID(unit); > struct nouveau_pushbuf *push = pNv->pushbuf; > > PUSH_DATAu(push, pNv->scratch, SOLI...

...a8 rt */ #define PFP_C_A8 0x0500 /* (src IN mask) a8 rt - same for CA and CA_SA */ #define PFP_NV12 0x0600 /* NV12 YUV->RGB */ diff --git a/src/nv50_exa.c b/src/nv50_exa.c index e86f903..8bacdf0 100644 --- a/src/nv50_exa.c +++ b/src/nv50_exa.c @@ -751,7 +751,7 @@ NV50EXABlend(PixmapPtr ppix, PicturePtr ppict, int op, int component_alpha) NV50EXA_LOCALS(ppix); struct nv50_blend_op *b = &NV50EXABlendOp[op]; unsigned sblend = b->src_blend; - unsigned dblend = b->dst_blend; + unsigned dblend = b->dst_blend, dblend_a = b->dst_blend; if (b->dst_alpha) { if (!PICT_FORMAT_...

...h, GM107_TIC2_5_NORMALIZED_COORDS | (height - 1)); + PUSH_DATA(push, 0x000000000); + PUSH_DATA(push, 0x000000000); + } + } +} + #endif diff --git a/src/nvc0_exa.c b/src/nvc0_exa.c index a53dfe6..017a7da 100644 --- a/src/nvc0_exa.c +++ b/src/nvc0_exa.c @@ -532,20 +532,13 @@ NVC0EXACheckTexture(PicturePtr ppict, PicturePtr pdpict, int op) static Bool NVC0EXAPictSolid(NVPtr pNv, PicturePtr ppict, unsigned unit) { - uint64_t offset = pNv->scratch->offset + SOLID(unit); struct nouveau_pushbuf *push = pNv->pushbuf; PUSH_DATAu(push, pNv->scratch, SOLID(unit), 1); PUSH_DATA (push, p...

...0000000); >> + } >> + } >> +} >> + >> #endif >> diff --git a/src/nvc0_exa.c b/src/nvc0_exa.c >> index a53dfe6..017a7da 100644 >> --- a/src/nvc0_exa.c >> +++ b/src/nvc0_exa.c >> @@ -532,20 +532,13 @@ NVC0EXACheckTexture(PicturePtr ppict, PicturePtr >> pdpict, int op) >> static Bool >> NVC0EXAPictSolid(NVPtr pNv, PicturePtr ppict, unsigned unit) >> { >> - uint64_t offset = pNv->scratch->offset + SOLID(unit); >> struct nouveau_pushbuf *push = pNv->pushbuf; >>...

...NOUVEAU_BO_VRAM; bo_flags |= is_src ? NOUVEAU_BO_RD : NOUVEAU_BO_WR; - if (!nouveau_exa_pixmap_is_tiled(ppix)) { + if (!nv50_style_tiled_pixmap(ppix)) { BEGIN_RING(chan, eng2d, mthd, 2); OUT_RING (chan, fmt); OUT_RING (chan, 1); @@ -465,7 +465,7 @@ NV50EXARenderTarget(PixmapPtr ppix, PicturePtr ppict) unsigned format; /*XXX: Scanout buffer not tiled, someone needs to figure it out */ - if (!nouveau_exa_pixmap_is_tiled(ppix)) + if (!nv50_style_tiled_pixmap(ppix)) NOUVEAU_FALLBACK("pixmap is scanout buffer\n"); switch (ppict->format) { @@ -553,7 +553,7 @@ NV50EXATe...

...TA(push, 0x000000000); > + PUSH_DATA(push, 0x000000000); > + } > + } > +} > + > #endif > diff --git a/src/nvc0_exa.c b/src/nvc0_exa.c > index a53dfe6..c8ace97 100644 > --- a/src/nvc0_exa.c > +++ b/src/nvc0_exa.c > @@ -538,14 +538,8 @@ NVC0EXAPictSolid(NVPtr pNv, PicturePtr ppict, unsigned unit) > PUSH_DATAu(push, pNv->scratch, SOLID(unit), 1); > PUSH_DATA (push, ppict->pSourcePict->solidFill.color); > PUSH_DATAu(push, pNv->scratch, TIC_OFFSET + (unit * 32), 8); > - PUSH_DATA (push, _(B_C0, G_C1, R_C2, A_C3, 8_8_8_8)); > - PUSH_DATA (p...

...r10g10b10 PICT_FORMAT(32, PICT_TYPE_ARGB, 0, 10, 10, 10) +#endif +#ifndef PICT_b8g8r8a8 +#define PICT_b8g8r8a8 PIXMAN_FORMAT(32,PIXMAN_TYPE_BGRA,8,8,8,8) +#endif +#ifndef PICT_b8g8r8x8 +#define PICT_b8g8r8x8 PIXMAN_FORMAT(32,PIXMAN_TYPE_BGRA,0,8,8,8) +#endif + static Bool NV50EXACheckRenderTarget(PicturePtr ppict) { --=20 1.6.6.rc4 On Sun, Jan 3, 2010 at 2:55 AM, Johannes Obermayr <johannesobermayr at gmx.de> wrote: > I forgot to add the mailing list: > > It changed: > > CC nv50_sor.lo > nv50_exa.c: In function 'NV50EXACheckTexture': > nv50_exa.c:545: error: '...

...7_TIC2_5_NORMALIZED_COORDS | (height - 1)); + PUSH_DATA(push, 0x000000000); + PUSH_DATA(push, 0x000000000); + } + } +} + #endif diff --git a/src/nvc0_exa.c b/src/nvc0_exa.c index a53dfe6..c8ace97 100644 --- a/src/nvc0_exa.c +++ b/src/nvc0_exa.c @@ -538,14 +538,8 @@ NVC0EXAPictSolid(NVPtr pNv, PicturePtr ppict, unsigned unit) PUSH_DATAu(push, pNv->scratch, SOLID(unit), 1); PUSH_DATA (push, ppict->pSourcePict->solidFill.color); PUSH_DATAu(push, pNv->scratch, TIC_OFFSET + (unit * 32), 8); - PUSH_DATA (push, _(B_C0, G_C1, R_C2, A_C3, 8_8_8_8)); - PUSH_DATA (push, offset); - PUSH_DAT...

...); >> + } >> + } >> +} >> + >> #endif >> diff --git a/src/nvc0_exa.c b/src/nvc0_exa.c >> index a53dfe6..c8ace97 100644 >> --- a/src/nvc0_exa.c >> +++ b/src/nvc0_exa.c >> @@ -538,14 +538,8 @@ NVC0EXAPictSolid(NVPtr pNv, PicturePtr ppict, >> unsigned unit) >> PUSH_DATAu(push, pNv->scratch, SOLID(unit), 1); >> PUSH_DATA (push, ppict->pSourcePict->solidFill.color); >> PUSH_DATAu(push, pNv->scratch, TIC_OFFSET + (unit * 32), 8); >> - PUSH_DATA (push, _(B_C0,...

..._r5g6b5, 0x103 }, - { PICT_x8r8g8b8, 0x108 }, - { PICT_a8r8g8b8, 0x108 }, + { PICT_r5g6b5, NV10TCL_RT_FORMAT_COLOR_R5G6B5 }, + { PICT_x8r8g8b8, NV10TCL_RT_FORMAT_COLOR_X8R8G8B8 }, + { PICT_a8r8g8b8, NV10TCL_RT_FORMAT_COLOR_A8R8G8B8 }, {}, }; @@ -432,7 +435,7 @@ setup_render_target(NVPtr pNv, PicturePtr pict, PixmapPtr pixmap) struct nouveau_bo *bo = nouveau_pixmap_bo(pixmap); BEGIN_RING(chan, celsius, NV10TCL_RT_FORMAT, 2); - OUT_RING (chan, get_rt_format(pict)); + OUT_RING (chan, get_rt_format(pict) | NV10TCL_RT_FORMAT_TYPE_LINEAR); OUT_RING (chan, (exaGetPixmapPitch(pixmap) <<...

...50_2D_DST_FORMAT; uint32_t bo_flags; - bo_flags = nvpix->shared ? NOUVEAU_BO_GART : NOUVEAU_BO_VRAM; + bo_flags = NOUVEAU_BO_APER; bo_flags |= is_src ? NOUVEAU_BO_RD : NOUVEAU_BO_WR; if (!nv50_style_tiled_pixmap(ppix)) { @@ -579,7 +578,7 @@ NVC0EXAPictTexture(NVPtr pNv, PixmapPtr ppix, PicturePtr ppict, unsigned unit) if (!nv50_style_tiled_pixmap(ppix)) NOUVEAU_FALLBACK("pixmap is scanout buffer\n"); - PUSH_REFN (push, bo, NOUVEAU_BO_VRAM | NOUVEAU_BO_RD); + PUSH_REFN (push, bo, NOUVEAU_BO_APER | NOUVEAU_BO_RD); PUSH_DATAu(push, pNv->scratch, TIC_OFFSET + (unit * 32),...

...PICT_TYPE_ABGR, 2, 10, 10, 10) +#define PICT_x2b10g10r10 PICT_FORMAT(32, PICT_TYPE_ABGR, 0, 10, 10, 10) +#define PICT_a2r10g10b10 PICT_FORMAT(32, PICT_TYPE_ARGB, 2, 10, 10, 10) +#define PICT_x2r10g10b10 PICT_FORMAT(32, PICT_TYPE_ARGB, 0, 10, 10, 10) +#endif + static Bool NV50EXACheckRenderTarget(PicturePtr ppict) { -- 1.6.6.rc4 On Sun, Jan 3, 2010 at 1:33 AM, Johannes Obermayr <johannesobermayr at gmx.de> wrote: > Hi, > > latest 2D driver does not compile. > > libdrm and Mesa are latest git... > > Johannes > > > CC nv50_exa.lo > nv50_exa.c: In function '...

Hi, latest 2D driver does not compile. libdrm and Mesa are latest git... Johannes CC nv50_exa.lo nv50_exa.c: In function 'NV50EXACheckRenderTarget': nv50_exa.c:451: error: 'PICT_a2b10g10r10' undeclared (first use in this function) nv50_exa.c:451: error: (Each undeclared identifier is reported only once nv50_exa.c:451: error: for each function it appears in.) nv50_exa.c:452:

...def XMIR +#include "xmir.h" +#include "xf86Priv.h" +#else +typedef struct xmir_screen xmir_screen; +#define xorgMir 0 +#endif + #if XF86_CRTC_VERSION >= 5 #define NOUVEAU_PIXMAP_SHARING 1 #endif @@ -112,6 +120,8 @@ typedef struct _NVRec { PixmapPtr pspix, pmpix, pdpix; PicturePtr pspict, pmpict; Pixel fg_colour; + + xmir_screen *xmir; } NVRec; #define NVPTR(p) ((NVPtr)((p)->driverPrivate)) -- 1.8.3.2

I believe I've addressed all the feedback from the first time around, and also made fixes necessary for GM20x based on testing results. I believe now it should actually work for all GM10x and GM20x. Further, GP10x should be very easy to add, but without someone to actually test I didn't want to claim support for it. Ilia Mirkin (7): exa: add GM10x acceleration support hwdefs: update

...ap, PixmapDirtyUpdatePtr dirty, RegionPtr dirty_region) { - ScreenPtr pScreen = dirty->src->drawable.pScreen; + ScreenPtr pScreen = dirty->src->pScreen; PictFormatPtr format = PictureWindowFormat(pScreen->root); PicturePtr src, dst; XID include_inferiors = IncludeInferiors; @@ -318,7 +316,7 @@ PixmapDirtyCompositeRotate(PixmapPtr dst_pixmap, int error; src = CreatePicture(None, - &pScreen->root->drawable, + dirty->src,...

https://bugs.freedesktop.org/show_bug.cgi?id=51477 Bug #: 51477 Summary: bad/missing graphics with NV11 / GeForce 2MX/MX400 Classification: Unclassified Product: xorg Version: unspecified Platform: x86 (IA32) OS/Version: Linux (All) Status: NEW Severity: normal Priority: medium Component: