"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "glamor/glamor_picture.c" between
xorg-server-1.20.7.tar.bz2 and xorg-server-1.20.8.tar.bz2

About: The X.Org X Server component of the X Window System architecture.

glamor_picture.c  (xorg-server-1.20.7.tar.bz2):glamor_picture.c  (xorg-server-1.20.8.tar.bz2)
skipping to change at line 343 skipping to change at line 343
bits = pixman_image_get_data(converted_image); bits = pixman_image_get_data(converted_image);
stride = pixman_image_get_stride(converted_image); stride = pixman_image_get_stride(converted_image);
} }
if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP)
iformat = gl_iformat_for_pixmap(pixmap); iformat = gl_iformat_for_pixmap(pixmap);
else else
iformat = format; iformat = format;
if (!glamor_pixmap_ensure_fbo(pixmap, iformat, GLAMOR_CREATE_FBO_NO_FBO)) if (!glamor_pixmap_ensure_fbo(pixmap, iformat, GLAMOR_CREATE_FBO_NO_FBO)) {
ret = FALSE;
goto fail; goto fail;
}
glPixelStorei(GL_UNPACK_ALIGNMENT, 4); glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
glamor_priv->suppress_gl_out_of_memory_logging = true; glamor_priv->suppress_gl_out_of_memory_logging = true;
/* We can't use glamor_pixmap_loop() because GLAMOR_MEMORY pixmaps /* We can't use glamor_pixmap_loop() because GLAMOR_MEMORY pixmaps
* don't have initialized boxes. * don't have initialized boxes.
*/ */
glBindTexture(GL_TEXTURE_2D, pixmap_priv->fbo->tex); glBindTexture(GL_TEXTURE_2D, pixmap_priv->fbo->tex);
glTexImage2D(GL_TEXTURE_2D, 0, iformat, glTexImage2D(GL_TEXTURE_2D, 0, iformat,
 End of changes. 2 change blocks. 
1 lines changed or deleted 3 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)