Zhigang Gong
26ff612171
glamor: Resolved merge conflictions with Kristian's glamor-ddx patch.
2011-09-26 16:46:34 +08:00
Kristian Høgsberg
49bf0e301e
glamor ddx driver using EGL on KMS
2011-09-26 16:46:34 +08:00
Zhigang Gong
47b6531273
glamor: Fixed one segfault bug when close screen.
...
move the original glamor_fini to glamor_close_screen. And wrap the CloseScreen
with glamor_close_screen, Then we can do some thing before call the underlying
CloseScreen().
The root cause is that glamor_fini will be called after the ->CloseScreen().
This may trigger a segmentation fault at
glamor_unrealize_glyph_caches() at calling into FreePicture().
2011-09-26 16:46:34 +08:00
Zhigang Gong
0d9e8db8d0
glamor: Fixed one linking error.
...
As current glamor implementation depends on the glx library in the
mesa package which is conflict with the version in xorg. We have to
--disable-glx when build Xephyr. But this leads to the linking error
here. We comment out the calling to ephyrHijackGLXExtension() now.
Need revisit latter.
2011-09-26 16:46:34 +08:00
Zhigang Gong
b3577a1c85
glamor: Merged with latest xserver.
...
Merged with latest xserver, the major change is due to the API change of
the management of devPrivates.
2011-09-26 16:46:34 +08:00
Zhigang Gong
3105fe9f64
glamor: Call glamor_composite_rects only when enable RENDER.
2011-09-26 16:46:34 +08:00
Zhigang Gong
f9843c7a35
glamor: Fixed one conflict data type(XID) bug.
...
We should include the dix-config.h for all the glamor files. Otherwise
the XID type maybe inconsisitent in different files in 64bit machine.
The root cause is this macro "#define _XSERVER64 1" should be included
in all files refer to the data type "XID" which is originally defined
in X.h. If _XSERVER64 is defined as 1, then XID is defined as CARD32
which is a 32bit integer. If _XSERVER64 is not defined as 1 then XID
is "unsigned long". In a 32bit machine, "unsigned long" should be
identical to CARD32. But in a 64bit machine, they are different.
2011-09-26 16:46:34 +08:00
Zhigang Gong
e194740c94
glamor: Fixed some compiling and linking errors.
...
Change the inline functions to static type, otherwise when linking it
complains multiple definitions of those functions.
2011-09-26 16:46:34 +08:00
Eric Anholt
8cfcc61403
glamor: Add support for using EXT_framebuffer_blit to do CopyArea.
2011-09-26 16:46:34 +08:00
Eric Anholt
d2da9d1c22
glamor: Reduce the noise from wide lines "fallback".
2011-09-26 16:46:34 +08:00
Eric Anholt
955ccfbc34
glamor: Fix the segfault at screen fini.
2011-09-26 16:46:34 +08:00
Eric Anholt
003dee4c82
glamor: Replace the immediate mode in glamor_fill() with glDrawArrays().
2011-09-26 16:46:34 +08:00
Eric Anholt
60775e21e3
glamor: Use a VBO to accumulate multiple glyph quads at once.
...
This increases us from 23000 to 27000/sec on rgb24text.
2011-09-26 16:46:34 +08:00
Eric Anholt
8ce312e619
glamor: Use glamor_composite_with_shader once per group of glyphs.
...
This shaves CPU time in GL setup. Performance of rgb24text went from
18400/sec to 23500/sec.
2011-09-26 16:46:34 +08:00
Eric Anholt
6ce05e0b28
glamor: Convert the shaders path to handling glamor_composite_rect_t.
2011-09-26 16:46:34 +08:00
Eric Anholt
858ce0c192
glamor: Add support for component alpha rendering.
...
Brings x11perf -rgb24text from 230/sec to 18400/sec
2011-09-26 16:46:34 +08:00
Eric Anholt
d07fc66a05
glamor: Rework shader setup to make extending the IN types easier.
2011-09-26 16:46:33 +08:00
Eric Anholt
8cefa287dd
glamor: Add a little mechanism for only printing fallbacks when they happen.
...
Sometimes we want to try a couple of different methods for
accelerating. If one of them says "no" and the other says "yes",
don't spam the log about the "no."
2011-09-26 16:46:33 +08:00
Eric Anholt
5f5c35b56d
glamor: Fix up the fallback message for no texture present on compositing.
2011-09-26 16:46:33 +08:00
Eric Anholt
2fa95725d8
glamor: Add support for a1 composite sources.
...
They're stored just like a8, but the values are set to either 0.0 or
1.0. Because they're a8 with only two legal values, we can't use them
as destinations, but nobody's rendering to a1 dests anyway (we hope).
2011-09-26 16:46:33 +08:00
Eric Anholt
9bcbcbf8c2
glamor: Fix and enable ZPixmap PutImage acceleration.
2011-09-26 16:46:33 +08:00
Eric Anholt
2ba634fab9
glamor: Fix render source transforms.
...
Fixes (except for small bit differences) cairo source-pattern.
2011-09-26 16:46:33 +08:00
Eric Anholt
b1f67a5082
glamor: Fix and enable glamor_get_spans().
...
This makes running the cairo test suite almost tolerable.
2011-09-26 16:46:33 +08:00
Eric Anholt
f88d76cf7e
glamor: Enable glamor_fill_spans().
...
x11perf -wline100 performance goes from 8.8/sec to 111/sec.
2011-09-26 16:46:33 +08:00
Eric Anholt
a63df0c504
glamor: Fix up the wide/non-solid lines fallback.
2011-09-26 16:46:33 +08:00
Eric Anholt
d61a13cf3f
glamor: Fix and enable tile fill acceleration (aka the root weave).
2011-09-26 16:46:33 +08:00
Eric Anholt
86a2065253
glamor: Fix off-by-one in CopyPixels CopyArea path.
...
Fixes window dragging in uncomposited metacity.
2011-09-26 16:46:33 +08:00
Eric Anholt
be82a06242
glamor: Fix screen_x/screen_y handling for compositing.
...
It's not an offset from pixmap coords to composited pixmap coords,
it's an offset from screen-relative window drawable coords to
composited pixmap coords.
2011-09-26 16:46:33 +08:00
Eric Anholt
5360b1e8bb
glamor: Implement glCopyPixels based src == dest CopyArea acceleration
2011-09-26 16:46:33 +08:00
Eric Anholt
0565c1d789
glamor: Add support for accel of x8r8g8b8 source pictures.
...
There's a limitation still for RepeatNone, but this fixes a bunch of
fallbacks for gnome-terminal.
2011-09-26 16:46:33 +08:00
Eric Anholt
e6bf505736
glamor: Set active texture on glamor_copy_n_to_n setup.
...
Fixes failure in rendercheck -t blend -o src
2011-09-26 16:46:33 +08:00
Eric Anholt
be64167fea
glamor: Don't try to CopyArea from a Solid source picture.
...
Fixes failure with rendercheck.
2011-09-26 16:46:33 +08:00
Eric Anholt
126fc09cb5
glamor: Rework the Render shader setup to be easily modified, like cairo-gl.
2011-09-26 16:46:33 +08:00
Eric Anholt
f4a3194837
glamor: Add the glyph cache from UXA (de-camelCased).
...
This doesn't yet have an optimized glamor_composite_rects()
implementation, but it does triple the speed of x11perf -aa10text.
2011-09-26 16:46:33 +08:00
Eric Anholt
7e6432e7b9
glamor: Fix up and enable accelerated composite.
2011-09-26 16:46:33 +08:00
Eric Anholt
a0b589e90a
glamor: Restore planemask to all-on when finishing a fill.
2011-09-26 16:46:33 +08:00
Eric Anholt
d8c2662bf4
glamor: Set active texture in finishaccess drawing.
2011-09-26 16:46:33 +08:00
Eric Anholt
4f398b29dd
glamor: Align stride of fallback pixmap data to 32 bits.
...
fb/pixman demand this alignment, and all sorts of things go badly otherwise.
Fixes piglit x11-8bpp-7x8-draw.
2011-09-26 16:46:33 +08:00
Eric Anholt
15e58b5ffb
glamor: Split the copy path out into its own function.
2011-09-26 16:46:33 +08:00
Eric Anholt
ad67299fa2
glamor: Provide more information about the operands to fallback composites.
2011-09-26 16:46:33 +08:00
Eric Anholt
4811e428a9
glamor: Pull in UXA code for dumping some composites down to copy_n_to_n.
...
Window dragging with metacity+gnome-terminal+xcompmgr is almost credible.
2011-09-26 16:46:33 +08:00
Eric Anholt
35847c578e
glamor: Add acceleration for copyarea not from the screen.
2011-09-26 16:46:32 +08:00
Eric Anholt
647b9fb49a
glamor: Add CopyWindow implementation so it doesn't crash.
2011-09-26 16:46:32 +08:00
Eric Anholt
95d4a5a6ab
glamor: Enable fill acceleration and flip opposite for pixmaps too.
...
Here's my theory for the flipping: It doesn't really matter which
orientation we store the pixmaps if we don't scan them out. We have
to flip coordinates for the window system framebuffer. Doing so for
everything else makes things consistent. I'm not sure how this will
interact with future GLX integration, though.
2011-09-26 16:46:32 +08:00
Eric Anholt
5332547a0a
glamor: Fix prepare_access on 1bpp data.
...
Apparently I don't have anything hitting this path, so I'm not sure if
it's good or not.
2011-09-26 16:46:32 +08:00
Eric Anholt
c3c3a63497
glamor: Use the pixmap stride in fallbacks instead of trying to guess it.
...
Mostly fixes gnome-terminal text.
2011-09-26 16:46:32 +08:00
Eric Anholt
45de3d24b4
glamor: Replace the glDrawPixels in glamor_finish_access with GLSL.
...
Root weave displays. \o/
2011-09-26 16:46:32 +08:00
Eric Anholt
d8d3fa1034
glamor: All the fallbacks in the world.
...
Bringup is really not flying when I can't see anything. So dump back
to all software so I can turn on a bit at a time.
2011-09-26 16:46:32 +08:00
Eric Anholt
745502af96
glamor: Add check for EXT_bgra which we rely on.
2011-09-26 16:46:32 +08:00
Eric Anholt
6ce378f11f
glamor: Add fallback support for glamor_get_spans().
2011-09-26 16:46:32 +08:00