glamor: Move setspans to a separate file.
This commit is contained in:
parent
cfb8dea815
commit
cdb1fe6d96
|
@ -20,6 +20,7 @@ libglamor_la_SOURCES = \
|
||||||
glamor_fillspans.c \
|
glamor_fillspans.c \
|
||||||
glamor_getspans.c \
|
glamor_getspans.c \
|
||||||
glamor_putimage.c \
|
glamor_putimage.c \
|
||||||
|
glamor_setspans.c \
|
||||||
glamor_render.c \
|
glamor_render.c \
|
||||||
glamor_tile.c \
|
glamor_tile.c \
|
||||||
glamor.h
|
glamor.h
|
||||||
|
|
|
@ -260,41 +260,6 @@ glamor_stipple(PixmapPtr pixmap, PixmapPtr stipple,
|
||||||
glamor_solid_fail_region(pixmap, x, y, width, height);
|
glamor_solid_fail_region(pixmap, x, y, width, height);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
glamor_set_spans(DrawablePtr drawable, GCPtr gc, char *src,
|
|
||||||
DDXPointPtr points, int *widths, int n, int sorted)
|
|
||||||
{
|
|
||||||
PixmapPtr dest_pixmap = glamor_get_drawable_pixmap(drawable);
|
|
||||||
GLenum format, type;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
switch (drawable->depth) {
|
|
||||||
case 8:
|
|
||||||
format = GL_ALPHA;
|
|
||||||
type = GL_UNSIGNED_BYTE;
|
|
||||||
case 24:
|
|
||||||
case 32:
|
|
||||||
format = GL_BGRA;
|
|
||||||
type = GL_UNSIGNED_INT_8_8_8_8_REV;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
ErrorF("Unknown setspans depth %d\n", drawable->depth);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!glamor_set_destination_pixmap(dest_pixmap))
|
|
||||||
return;
|
|
||||||
for (i = 0; i < n; i++) {
|
|
||||||
glRasterPos2i(points[i].x - dest_pixmap->screen_x,
|
|
||||||
points[i].y - dest_pixmap->screen_y);
|
|
||||||
glDrawPixels(widths[i],
|
|
||||||
1,
|
|
||||||
format, type,
|
|
||||||
src);
|
|
||||||
src += PixmapBytePad(widths[i], drawable->depth);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* glamor_poly_lines() checks if it can accelerate the lines as a group of
|
* glamor_poly_lines() checks if it can accelerate the lines as a group of
|
||||||
* horizontal or vertical lines (rectangles), and uses existing rectangle fill
|
* horizontal or vertical lines (rectangles), and uses existing rectangle fill
|
||||||
|
|
|
@ -139,6 +139,10 @@ glamor_get_spans(DrawablePtr drawable,
|
||||||
int nspans,
|
int nspans,
|
||||||
char *dst_start);
|
char *dst_start);
|
||||||
|
|
||||||
|
/* glamor_setspans.c */
|
||||||
|
void glamor_set_spans(DrawablePtr drawable, GCPtr gc, char *src,
|
||||||
|
DDXPointPtr points, int *widths, int n, int sorted);
|
||||||
|
|
||||||
/* glamor_putimage.c */
|
/* glamor_putimage.c */
|
||||||
void
|
void
|
||||||
glamor_put_image(DrawablePtr drawable, GCPtr gc, int depth, int x, int y,
|
glamor_put_image(DrawablePtr drawable, GCPtr gc, int depth, int x, int y,
|
||||||
|
|
67
glamor/glamor_setspans.c
Normal file
67
glamor/glamor_setspans.c
Normal file
|
@ -0,0 +1,67 @@
|
||||||
|
/*
|
||||||
|
* Copyright © 2009 Intel Corporation
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
|
* copy of this software and associated documentation files (the "Software"),
|
||||||
|
* to deal in the Software without restriction, including without limitation
|
||||||
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||||
|
* and/or sell copies of the Software, and to permit persons to whom the
|
||||||
|
* Software is furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice (including the next
|
||||||
|
* paragraph) shall be included in all copies or substantial portions of the
|
||||||
|
* Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||||
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||||
|
* IN THE SOFTWARE.
|
||||||
|
*
|
||||||
|
* Authors:
|
||||||
|
* Eric Anholt <eric@anholt.net>
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifdef HAVE_DIX_CONFIG_H
|
||||||
|
#include <dix-config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "glamor_priv.h"
|
||||||
|
|
||||||
|
void
|
||||||
|
glamor_set_spans(DrawablePtr drawable, GCPtr gc, char *src,
|
||||||
|
DDXPointPtr points, int *widths, int n, int sorted)
|
||||||
|
{
|
||||||
|
PixmapPtr dest_pixmap = glamor_get_drawable_pixmap(drawable);
|
||||||
|
GLenum format, type;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
switch (drawable->depth) {
|
||||||
|
case 8:
|
||||||
|
format = GL_ALPHA;
|
||||||
|
type = GL_UNSIGNED_BYTE;
|
||||||
|
case 24:
|
||||||
|
case 32:
|
||||||
|
format = GL_BGRA;
|
||||||
|
type = GL_UNSIGNED_INT_8_8_8_8_REV;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
ErrorF("Unknown setspans depth %d\n", drawable->depth);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!glamor_set_destination_pixmap(dest_pixmap))
|
||||||
|
return;
|
||||||
|
for (i = 0; i < n; i++) {
|
||||||
|
glRasterPos2i(points[i].x - dest_pixmap->screen_x,
|
||||||
|
points[i].y - dest_pixmap->screen_y);
|
||||||
|
glDrawPixels(widths[i],
|
||||||
|
1,
|
||||||
|
format, type,
|
||||||
|
src);
|
||||||
|
src += PixmapBytePad(widths[i], drawable->depth);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user