d18f5801c9
This makes sure the pixelization for dashed lines matches non-dashed
lines, while also speeding them up.
v2: Switch to glamor_make_current
v3: Create dash pattern pixmap without GLAMOR_CREATE_FBO_NO_FBO
v4: Adopt suggestions from Eric's review:
- Drops power-of-two alignment of our line vertex data, simplifying
the code.
- Stops reading from the VBO. While on keithp's and my machines the
VBO is mapped cached, on many implementations it will be mapped WC,
making those reads extremely expensive.
- Style fixes (line wrapping, spaces around operators).
v5: Adopt suggestions from Markus' review:
- Use max when computing zero-width dashed line length.
Don't open code max here.
- Embed CoordModePrevious into VBO writing for dashed lines
Instead of pre-computing the coord mode previous results, just
embed this in the loop which fills the vertex buffer. Saves
re-writing the request buffer, and shortens the code a bit
v6: Export glamor_destroy_gc for UXA
UXA needs to call glamor_destroy_gc from its GCFuncs, so export
it.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
101 lines
3.7 KiB
C
101 lines
3.7 KiB
C
/*
|
|
* Copyright © 2014 Keith Packard
|
|
*
|
|
* Permission to use, copy, modify, distribute, and sell this software and its
|
|
* documentation for any purpose is hereby granted without fee, provided that
|
|
* the above copyright notice appear in all copies and that both that copyright
|
|
* notice and this permission notice appear in supporting documentation, and
|
|
* that the name of the copyright holders not be used in advertising or
|
|
* publicity pertaining to distribution of the software without specific,
|
|
* written prior permission. The copyright holders make no representations
|
|
* about the suitability of this software for any purpose. It is provided "as
|
|
* is" without express or implied warranty.
|
|
*
|
|
* THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
|
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
|
* EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
|
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
|
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
|
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
|
|
* OF THIS SOFTWARE.
|
|
*/
|
|
|
|
#ifndef _GLAMOR_PROGRAM_H_
|
|
#define _GLAMOR_PROGRAM_H_
|
|
|
|
typedef enum {
|
|
glamor_program_location_none = 0,
|
|
glamor_program_location_fg = 1,
|
|
glamor_program_location_bg = 2,
|
|
glamor_program_location_fill = 4,
|
|
glamor_program_location_font = 8,
|
|
glamor_program_location_bitplane = 16,
|
|
glamor_program_location_dash = 32,
|
|
} glamor_program_location;
|
|
|
|
typedef enum {
|
|
glamor_program_flag_none = 0,
|
|
} glamor_program_flag;
|
|
|
|
typedef struct _glamor_program glamor_program;
|
|
|
|
typedef Bool (*glamor_use) (PixmapPtr pixmap, GCPtr gc, glamor_program *prog, void *arg);
|
|
|
|
typedef struct {
|
|
const char *name;
|
|
const int version;
|
|
const char *vs_vars;
|
|
const char *vs_exec;
|
|
const char *fs_vars;
|
|
const char *fs_exec;
|
|
const glamor_program_location locations;
|
|
const glamor_program_flag flags;
|
|
const char *source_name;
|
|
glamor_use use;
|
|
} glamor_facet;
|
|
|
|
struct _glamor_program {
|
|
GLint prog;
|
|
GLint failed;
|
|
GLint matrix_uniform;
|
|
GLint fg_uniform;
|
|
GLint bg_uniform;
|
|
GLint fill_size_uniform;
|
|
GLint fill_offset_uniform;
|
|
GLint font_uniform;
|
|
GLint bitplane_uniform;
|
|
GLint bitmul_uniform;
|
|
GLint dash_uniform;
|
|
GLint dash_length_uniform;
|
|
glamor_program_location locations;
|
|
glamor_program_flag flags;
|
|
glamor_use prim_use;
|
|
glamor_use fill_use;
|
|
};
|
|
|
|
typedef struct {
|
|
glamor_program progs[4];
|
|
} glamor_program_fill;
|
|
|
|
extern const glamor_facet glamor_fill_solid;
|
|
|
|
Bool
|
|
glamor_build_program(ScreenPtr screen,
|
|
glamor_program *prog,
|
|
const glamor_facet *prim,
|
|
const glamor_facet *fill);
|
|
|
|
Bool
|
|
glamor_use_program(PixmapPtr pixmap,
|
|
GCPtr gc,
|
|
glamor_program *prog,
|
|
void *arg);
|
|
|
|
glamor_program *
|
|
glamor_use_program_fill(PixmapPtr pixmap,
|
|
GCPtr gc,
|
|
glamor_program_fill *program_fill,
|
|
const glamor_facet *prim);
|
|
|
|
#endif /* _GLAMOR_PROGRAM_H_ */
|