fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-03 11:17:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
8455 commits 12 branches 118 tags 121 MiB
Commit graph

8455 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benjamin Otte
e20261ddda gl: Get rid of operand argument to emit functions 2010-06-07 13:37:47 +02:00
Benjamin Otte
8062fb352e gl: Add an enum for tex units 
Instead of hardcoding 0 for source and 1 for mask, use an enum. It's
also clearer when functions take a cairo_gl_tex_t argument instead of a
GLuint.
 2010-06-07 13:37:47 +02:00
Benjamin Otte
5db362dd67 gl: Keep a copy of the current operand in the context 
Note that they are currently only valid as long as the
cairo_gl_composite_t exists, but that will be changed soon.
 2010-06-07 13:37:47 +02:00
Benjamin Otte
a05f062c80 gl: Move struct definitions in header 2010-06-07 13:37:47 +02:00
Benjamin Otte
85d4c6c55b gl: operand->texture.surface cannot be NULL 2010-06-07 13:37:47 +02:00
Benjamin Otte
9486ad5fbd gl: Remove composite_t argument from _flush() function 2010-06-07 13:37:47 +02:00
Benjamin Otte
16e420b4dc gl: Remove dependency on composite_t in draw function 2010-06-07 13:37:47 +02:00
Benjamin Otte
e46215ec6b gl: Remove unneeded and broken workaround 
We now ensure the values are properly zeroed when setting the operator.
 2010-06-07 13:37:47 +02:00
Benjamin Otte
b2d709b5c7 gl: Switch src alpha handling to a tiny on/off function 
Instead of doing setup every time, we just set this one flag. Much
nicer.
 2010-06-07 13:37:47 +02:00
Benjamin Otte
53fd451f85 gl: Avoid redundant mask setup 
The mask doesn't change, so no need to set it up twice
 2010-06-07 13:37:47 +02:00
Benjamin Otte
1b3675fc4b gl: Split fixed-function operand setup into own function 2010-06-07 13:37:47 +02:00
Benjamin Otte
02da871050 gl: Unify fixed function setup code 2010-06-07 13:37:47 +02:00
Benjamin Otte
74f9094162 gl: switch OPERAND0 and OPERAND1 in the fixed function path 
This should not change anything as we multiply the values.
But it allows unifying parts of the code, which will happen in another
patch.
 2010-06-07 13:37:47 +02:00
Benjamin Otte
c6aac5d013 gl: Move the pre shader to the context, too 
It's required when flushing, too.
 2010-06-07 13:37:47 +02:00
Benjamin Otte
61bc3067ca gl: Store the clip region in the context 
This is necessary because we want to get rid of keeping the composite
stuff around.
 2010-06-07 13:37:47 +02:00
Benjamin Otte
db79880d9a gl: Make gl_composite_begin() acquire the context 
Also remove the previous places for context acquisition. This completes
fixing the potential ABBA deadlock I talked about a few commits ago.
 2010-06-07 13:37:47 +02:00
Benjamin Otte
1320a168fa gl: Remove unused code 
We don't need to acquire/release the context, we're not using it.
 2010-06-07 13:37:47 +02:00
Benjamin Otte
8f5c3b706b gl: Make composite_set_clip_region not require the context 2010-06-07 13:37:46 +02:00
Benjamin Otte
ac6abcbac7 gl: Make composite_set_source/mask/mask_spans not require a context 2010-06-07 13:37:46 +02:00
Benjamin Otte
88a70d66fc gl: Add API for querying if we need GL_TEXTURE_RECTANGLE_EXT 
We need to do that querying outside of taking the lock, so we want to be
able to query the device, not the context.
 2010-06-07 13:37:46 +02:00
Benjamin Otte
9c6e1338a1 gl: Make cairo_gl_composite_t not require a gl context anymore 
First patch in a series.

The idea is to make all gl operations in Cairo work like this:
1) prepare cairo_gl_composite_t
2) acquire device
3) begin composite operation
4) emit vertexes
5) end operation
6) release device
7) cleanup composite operation

This both reduces the time required with the device locked, cleans the
API and more importantly avoids ABBA deadlocks, as we currently call
acquire_pattern() with the device lock held.
 2010-06-07 13:37:46 +02:00
Benjamin Otte
60f0cb9c60 gl: Flush surface at the right times 2010-06-07 13:37:46 +02:00
Chris Wilson
ffeeae462e Revert "gstate: reduce a couple more operators" 
This reverts commit a85c6c1e36.

Soeren found that this introduced a regression when displaying pages in
evince, and since I'm not overly enthralled at the added complexity here
for very little gain, remove the reduction and leave it clear for a more
complete solution in the future.
 2010-06-06 16:53:46 +01:00
Makoto Kato
44e628a6f4 openvg: fix build break 2010-06-02 23:00:01 +02:00
Chris Wilson
cc080a1e27 gl: Unmap the vertex buffer prior to using in DaawArrays() 
"It is an INVALID_OPERTION error to source data from a buffer object
that is currently mapped."

mesa is currently lax in this regard, but the Nvidia libGL conforms to
the spec and thus was causing failures.
 2010-05-27 20:51:55 +01:00
Chris Wilson
b3e15bd5c3 gl: _cairo_set_shader_by_type() cannot return UNSUPPORTED 
So remove the superfuous test.
 2010-05-27 18:43:03 +01:00
Chris Wilson
59bd34e6a3 gl: Check for an error device when creating surfaces. 2010-05-27 18:35:40 +01:00
Chris Wilson
53f0861059 gl: Make _cairo_gl_shader_(init|compile) static 
Only used within _cairo_gl_shaders.c, so remove the private symbol.
 2010-05-27 18:28:52 +01:00
Chris Wilson
dd0866cdc8 boilerplate: Exercise RENDER capable windows. 
Ensure that the drivers actually work when rendering to a normal window.
 2010-05-27 17:53:30 +01:00
Chris Wilson
2dc42af942 script: Update csi-exec to match new interface. 2010-05-27 17:53:30 +01:00
Chris Wilson
2f0f4ed0e2 freed-pool: Don't access beyond the end of the array. 
Argh. This bug has been here for quite some time and only showed itself
with a corrupt pointer on ppc32. Since the erroneous write is inside the
block, it remained undetected by valgrind.
 2010-05-20 21:57:58 +01:00
Chris Wilson
97b4aeba44 atomic: Add memory barriers if required for intel primitives 2010-05-20 21:57:58 +01:00
Benjamin Otte
24e684c267 gl: spans need the dummy texture 
Thanks Eric. That took me half a day.
 2010-05-20 22:37:18 +02:00
Benjamin Otte
d7a564d8ee gl: Don't set is_clear 
1) It's wrong.
2) The core functions set the flag correctly already.
 2010-05-20 22:10:06 +02:00
Benjamin Otte
f9cf07b126 gl: Fix coverage passing for spans not being endian safe. 2010-05-20 16:08:38 +02:00
Benjamin Otte
2a0f34c6da gl: Allow NONE and SPANS sampler for source, too 2010-05-20 13:54:02 +02:00
Benjamin Otte
1586f7740a gl: Refactor fixed function setup code 
In particular get rid of the _cairo_gl_set_tex_combine_constant_color()
function by inlining it and move common glTexEnv calls out of the
switch statement.
 2010-05-20 13:18:15 +02:00
Benjamin Otte
4889090c76 gl: set the active texture before fiddling with with glTexEnv 
fixes the fixed function pipeline
 2010-05-20 12:13:43 +02:00
Benjamin Otte
3cff2da912 gl: Remove unused variables 2010-05-20 12:11:41 +02:00
Benjamin Otte
4c7dd1be45 gl: Move vertex array setup code into the texture setup code 2010-05-20 11:02:49 +02:00
Benjamin Otte
d9d5976bdf gl: Add an assertion that a context cannot call _begin() twice 
Evert _begin() call must be followed by an _end() call to avoid any
nastiness. Just like GL. :)
 2010-05-20 11:02:49 +02:00
Benjamin Otte
5b8b1fe1cb gl: Move vertex buffer handling from setup into context 
We can only emit one vertex buffer at a time anyway.
 2010-05-20 11:02:49 +02:00
Benjamin Otte
0d5f2eab77 gl: Actuall do fall back to fixed function paths. 
Previously we were just returning UNSUPPORTED all the time. I guess that
explains why my code got so slow...
 2010-05-20 11:02:49 +02:00
Benjamin Otte
bb7ca71c1a gl: Don't store the shader in the composite_t anymore 
Now that we have ctx->current_shader, there's no need to keep it in the
composite setup code.
 2010-05-20 11:02:49 +02:00
Benjamin Otte
6c477b4a94 gl: Move shader checking in the TexEnv setup code 
As the previously generic setup code only contains non-shader code now,
we can check in advance that no shader is in use and do all the other
stuff without checks.
 2010-05-20 11:02:49 +02:00
Benjamin Otte
73262edd82 gl: Move texture setup code into its own file 
This ensures textures don't need to be (re)set when doing component
alpha and running 2 shaders.
 2010-05-20 11:02:49 +02:00
Benjamin Otte
970c879dd8 gl: Binding variables only works for the current shader 
So make the code reflect that.
 2010-05-20 11:02:49 +02:00
Benjamin Otte
065969d78f gl: Separate binding to shaders from setting operands 
That way we only need to bind to shaders when creating them, but not
everytime we switch shaders on text output.
 2010-05-20 11:02:49 +02:00
Benjamin Otte
c53f7778bc gl: Use the mask, not the source 
Not that we'd ever have constant color component-alpha masks, but that's
an entirely different topic.
 2010-05-20 11:02:49 +02:00
Benjamin Otte
26e8e506b6 gl: Add _cairo_gl_surface_is_texture() 
It's more explicit then just checking surface->fb != 0
Also, it makes improving that check easier.
 2010-05-20 11:02:49 +02:00