frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glamor: use vbos in gradient/picture code. 

This converts two client arrays users to using vbos,
this is necessary to move to using core profile later.

Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2016-01-11 14:00:04 +10:00
parent 25eca80265
commit 5582ad1b9b
2 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
glamor/glamor_gradient.c
View File

@ -647,12 +647,12 @@ _glamor_gradient_set_pixmap_destination(ScreenPtr screen,
PicturePtr dst_picture, PicturePtr dst_picture,
GLfloat *xscale, GLfloat *yscale, GLfloat *xscale, GLfloat *yscale,
int x_source, int y_source, int x_source, int y_source,
float vertices[8],
float tex_vertices[8],
int tex_normalize) int tex_normalize)
{ {
glamor_pixmap_private *pixmap_priv; glamor_pixmap_private *pixmap_priv;
PixmapPtr pixmap = NULL; PixmapPtr pixmap = NULL;
GLfloat *v;
char *vbo_offset;
pixmap = glamor_get_drawable_pixmap(dst_picture->pDrawable); pixmap = glamor_get_drawable_pixmap(dst_picture->pDrawable);
pixmap_priv = glamor_get_pixmap_private(pixmap); pixmap_priv = glamor_get_pixmap_private(pixmap);
@ -670,13 +670,15 @@ _glamor_gradient_set_pixmap_destination(ScreenPtr screen,
*xscale, *yscale, x_source, y_source, *xscale, *yscale, x_source, y_source,
dst_picture->pDrawable->width, dst_picture->pDrawable->height); dst_picture->pDrawable->width, dst_picture->pDrawable->height);
v = glamor_get_vbo_space(screen, 16 * sizeof(GLfloat), &vbo_offset);
glamor_set_normalize_vcoords_tri_strip(*xscale, *yscale, glamor_set_normalize_vcoords_tri_strip(*xscale, *yscale,
0, 0, 0, 0,
(INT16) (dst_picture->pDrawable-> (INT16) (dst_picture->pDrawable->
width), width),
(INT16) (dst_picture->pDrawable-> (INT16) (dst_picture->pDrawable->
height), height),
vertices); v);
if (tex_normalize) { if (tex_normalize) {
glamor_set_normalize_tcoords_tri_stripe(*xscale, *yscale, glamor_set_normalize_tcoords_tri_stripe(*xscale, *yscale,
@ -687,7 +689,7 @@ _glamor_gradient_set_pixmap_destination(ScreenPtr screen,
(INT16) (dst_picture-> (INT16) (dst_picture->
pDrawable->height + pDrawable->height +
y_source), y_source),
tex_vertices); &v[8]);
} }
else { else {
glamor_set_tcoords_tri_strip(x_source, y_source, glamor_set_tcoords_tri_strip(x_source, y_source,
@ -695,28 +697,29 @@ _glamor_gradient_set_pixmap_destination(ScreenPtr screen,
x_source, x_source,
(INT16) (dst_picture->pDrawable->height) + (INT16) (dst_picture->pDrawable->height) +
y_source, y_source,
tex_vertices); &v[8]);
} }
DEBUGF("vertices --> leftup : %f X %f, rightup: %f X %f," DEBUGF("vertices --> leftup : %f X %f, rightup: %f X %f,"
"rightbottom: %f X %f, leftbottom : %f X %f\n", "rightbottom: %f X %f, leftbottom : %f X %f\n",
vertices[0], vertices[1], vertices[2], vertices[3], v[0], v[1], v[2], v[3],
vertices[4], vertices[5], vertices[6], vertices[7]); v[4], v[5], v[6], v[7]);
DEBUGF("tex_vertices --> leftup : %f X %f, rightup: %f X %f," DEBUGF("tex_vertices --> leftup : %f X %f, rightup: %f X %f,"
"rightbottom: %f X %f, leftbottom : %f X %f\n", "rightbottom: %f X %f, leftbottom : %f X %f\n",
tex_vertices[0], tex_vertices[1], tex_vertices[2], tex_vertices[3], v[8], v[9], v[10], v[11],
tex_vertices[4], tex_vertices[5], tex_vertices[6], tex_vertices[7]); v[12], v[13], v[14], v[15]);
glamor_make_current(glamor_priv); glamor_make_current(glamor_priv);
glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT, glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT,
GL_FALSE, 0, vertices); GL_FALSE, 0, vbo_offset);
glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2, GL_FLOAT, glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2, GL_FLOAT,
GL_FALSE, 0, tex_vertices); GL_FALSE, 0, vbo_offset + 8 * sizeof(GLfloat));
glEnableVertexAttribArray(GLAMOR_VERTEX_POS); glEnableVertexAttribArray(GLAMOR_VERTEX_POS);
glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE); glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
glamor_put_vbo_space(screen);
return 1; return 1;
} }
@ -812,13 +815,11 @@ glamor_generate_radial_gradient_picture(ScreenPtr screen,
PixmapPtr pixmap = NULL; PixmapPtr pixmap = NULL;
GLint gradient_prog = 0; GLint gradient_prog = 0;
int error; int error;
float tex_vertices[8];
int stops_count = 0; int stops_count = 0;
int count = 0; int count = 0;
GLfloat *stop_colors = NULL; GLfloat *stop_colors = NULL;
GLfloat *n_stops = NULL; GLfloat *n_stops = NULL;
GLfloat xscale, yscale; GLfloat xscale, yscale;
float vertices[8];
float transform_mat[3][3]; float transform_mat[3][3];
static const float identity_mat[3][3] = { {1.0, 0.0, 0.0}, static const float identity_mat[3][3] = { {1.0, 0.0, 0.0},
{0.0, 1.0, 0.0}, {0.0, 1.0, 0.0},
@ -969,7 +970,7 @@ glamor_generate_radial_gradient_picture(ScreenPtr screen,
if (!_glamor_gradient_set_pixmap_destination if (!_glamor_gradient_set_pixmap_destination
(screen, glamor_priv, dst_picture, &xscale, &yscale, x_source, y_source, (screen, glamor_priv, dst_picture, &xscale, &yscale, x_source, y_source,
vertices, tex_vertices, 0)) 0))
goto GRADIENT_FAIL; goto GRADIENT_FAIL;
glamor_set_alu(screen, GXcopy); glamor_set_alu(screen, GXcopy);
@ -1123,7 +1124,6 @@ glamor_generate_linear_gradient_picture(ScreenPtr screen,
float pt_distance; float pt_distance;
float p1_distance; float p1_distance;
GLfloat cos_val; GLfloat cos_val;
float tex_vertices[8];
int stops_count = 0; int stops_count = 0;
GLfloat *stop_colors = NULL; GLfloat *stop_colors = NULL;
GLfloat *n_stops = NULL; GLfloat *n_stops = NULL;
@ -1131,7 +1131,6 @@ glamor_generate_linear_gradient_picture(ScreenPtr screen,
float slope; float slope;
GLfloat xscale, yscale; GLfloat xscale, yscale;
GLfloat pt1[2], pt2[2]; GLfloat pt1[2], pt2[2];
float vertices[8];
float transform_mat[3][3]; float transform_mat[3][3];
static const float identity_mat[3][3] = { {1.0, 0.0, 0.0}, static const float identity_mat[3][3] = { {1.0, 0.0, 0.0},
{0.0, 1.0, 0.0}, {0.0, 1.0, 0.0},
@ -1287,7 +1286,7 @@ glamor_generate_linear_gradient_picture(ScreenPtr screen,
if (!_glamor_gradient_set_pixmap_destination if (!_glamor_gradient_set_pixmap_destination
(screen, glamor_priv, dst_picture, &xscale, &yscale, x_source, y_source, (screen, glamor_priv, dst_picture, &xscale, &yscale, x_source, y_source,
vertices, tex_vertices, 1)) 1))
goto GRADIENT_FAIL; goto GRADIENT_FAIL;
glamor_set_alu(screen, GXcopy); glamor_set_alu(screen, GXcopy);

27
glamor/glamor_picture.c
View File

@ -597,14 +597,6 @@ _glamor_upload_bits_to_pixmap_texture(PixmapPtr pixmap, GLenum format,
glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap); glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
glamor_screen_private *glamor_priv = glamor_screen_private *glamor_priv =
glamor_get_screen_private(pixmap->drawable.pScreen); glamor_get_screen_private(pixmap->drawable.pScreen);
static float vertices[8];
static float texcoords_inv[8] = { 0, 0,
1, 0,
1, 1,
0, 1
};
float *ptexcoords;
float dst_xscale, dst_yscale; float dst_xscale, dst_yscale;
GLuint tex = 0; GLuint tex = 0;
int need_free_bits = 0; int need_free_bits = 0;
@ -666,14 +658,22 @@ _glamor_upload_bits_to_pixmap_texture(PixmapPtr pixmap, GLenum format,
return FALSE; return FALSE;
} }
} else { } else {
ptexcoords = texcoords_inv; static const float texcoords_inv[8] = { 0, 0,
1, 0,
1, 1,
0, 1
};
GLfloat *v;
char *vbo_offset;
v = glamor_get_vbo_space(screen, 16 * sizeof(GLfloat), &vbo_offset);
pixmap_priv_get_dest_scale(pixmap, pixmap_priv, &dst_xscale, &dst_yscale); pixmap_priv_get_dest_scale(pixmap, pixmap_priv, &dst_xscale, &dst_yscale);
glamor_set_normalize_vcoords(pixmap_priv, dst_xscale, glamor_set_normalize_vcoords(pixmap_priv, dst_xscale,
dst_yscale, dst_yscale,
x, y, x, y,
x + w, y + h, x + w, y + h,
vertices); v);
/* Slow path, we need to flip y or wire alpha to 1. */ /* Slow path, we need to flip y or wire alpha to 1. */
glamor_make_current(glamor_priv); glamor_make_current(glamor_priv);
@ -685,13 +685,16 @@ _glamor_upload_bits_to_pixmap_texture(PixmapPtr pixmap, GLenum format,
return FALSE; return FALSE;
} }
memcpy(&v[8], texcoords_inv, 8 * sizeof(GLfloat));
glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT, glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT,
GL_FALSE, 2 * sizeof(float), vertices); GL_FALSE, 2 * sizeof(float), vbo_offset);
glEnableVertexAttribArray(GLAMOR_VERTEX_POS); glEnableVertexAttribArray(GLAMOR_VERTEX_POS);
glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2, GL_FLOAT, glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2, GL_FLOAT,
GL_FALSE, 2 * sizeof(float), ptexcoords); GL_FALSE, 2 * sizeof(float), vbo_offset + 8 * sizeof(GLfloat));
glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE); glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
glamor_put_vbo_space(screen);
glamor_set_destination_pixmap_priv_nc(glamor_priv, pixmap, pixmap_priv); glamor_set_destination_pixmap_priv_nc(glamor_priv, pixmap, pixmap_priv);
glamor_set_alu(screen, GXcopy); glamor_set_alu(screen, GXcopy);
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);