Proxmox-Port/pixman
1
0
Fork 0
mirror of https://salsa.debian.org/xorg-team/lib/pixman synced 2025-09-04 00:13:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,110 Commits 8 Branches 68 Tags 5.5 MiB
pixman-0.15.20-1
Commit Graph

1110 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Søren Sandmann Pedersen
61254a3c09 Add a BUILT_SOURCES with pixman-combine{32,64}.{c.h} 
Bug 22681.
 2009-07-09 23:17:56 -04:00
Adrian Bunk
34ec50a476 Fix the NEON build after "Convert CamelCase names to underscore_names." 
This patch fixes the following build error caused
    by commit a98b71eff4
    (Convert CamelCase names to underscore_names.):

    <--   snip  -->

    ...
    pixman-arm-neon.c: In function 'neon_composite_over_n_8_0565':
    pixman-arm-neon.c:1784: error: 'x_dst' undeclared (first use in this function)
    pixman-arm-neon.c:1784: error: (Each undeclared identifier is reported only once
    pixman-arm-neon.c:1784: error: for each function it appears in.)
    pixman-arm-neon.c:1785: error: 'p_dst' undeclared (first use in this function)
    pixman-arm-neon.c: In function 'neon_composite_over_n_0565':
    pixman-arm-neon.c:1937: error: 'x_dst' undeclared (first use in this function)
    pixman-arm-neon.c:1938: error: 'p_dst' undeclared (first use in this function)
    pixman-arm-neon.c: In function 'neon_composite_over_8888_0565':
    pixman-arm-neon.c:2074: error: 'x_dst' undeclared (first use in this function)
    pixman-arm-neon.c:2075: error: 'p_dst' undeclared (first use in this function)
    make[3]: *** [libpixman_arm_neon_la-pixman-arm-neon.lo] Error 1
    ...

    <--  snip  -->
 2009-07-09 17:50:30 -04:00
Søren Sandmann Pedersen
6b34482870 Update the CRC value in scaling-test.c. 
The changes in pixman behavior justifying this are:

- New clipping rules

- Bug fixes in region code. In particular, when
  pixman_region_init_rects() is called on these two boxes:

	{ 2, 6, 7, 6 }
	{ 4, 1, 6, 7 }

  it now ignores the first one, which is empty and produces

	{ 4, 1, 6, 7 }

  Previously, it would produce:

	{ 2, 1, 7, 7 }

  for some reason.
 2009-07-09 04:04:00 -04:00
Søren Sandmann Pedersen
4c60ed5ec6 Fix bug in pixman-region.c where empty regions would not be properly initialized. 
Also add a couple more tests to region-test.c.
 2009-07-09 04:00:19 -04:00
Søren Sandmann Pedersen
bcf01c21d7 Fix a couple of problems with the tests when HAVE_GTK is not defined. 
- Make sure the non-gtk+ test programs are added to noinst_PROGRAMS
  when HAVE_GTK is not set.

- Don't include glib.h in oob-test.c
 2009-07-09 01:47:19 -04:00
Søren Sandmann Pedersen
0db0430d1d Merge branch 'naming' 2009-07-08 18:59:15 -04:00
Søren Sandmann Pedersen
31a40a1725 Eliminate boxes with x1 > x2 or y1 > y2 in pixman_region_init_rects(). 2009-07-08 18:41:41 -04:00
Søren Sandmann Pedersen
706e659431 Add a box with y2 < y1 in region-test.c 2009-07-08 18:39:43 -04:00
Søren Sandmann Pedersen
b3cf3f0c2b Fix up some overeager search-and-replace renamings 2009-07-08 00:39:32 -04:00
Søren Sandmann Pedersen
c2e331693d Rename num_rects back to numRects. 
The name numRects is public API and can't be changed.
 2009-07-08 00:39:32 -04:00
Søren Sandmann Pedersen
8261b4d57c Rename combine_*_c to combine_*_ca 
s/combine_(.+)_c([^a-z0-9A-Z])/combine_$1_ca$2/g;
 2009-07-08 00:39:32 -04:00
Søren Sandmann Pedersen
3c03990ba2 Various sse2 renamings 2009-07-08 00:39:32 -04:00
Søren Sandmann Pedersen
9d0be1d4c8 s/sse2combine/sse2_combine/g 2009-07-08 00:39:32 -04:00
Søren Sandmann Pedersen
a98b71eff4 Convert CamelCase names to underscore_names. 
s/sizeRI/size_ri/g;
s/numRI/num_ri/g;
s/RepeatNone/REPEAT_NONE/g;
s/fbOver/over/g;
s/fbIn/in/g;
s/iSrc/src_image/g;
s/iMask/mask_image/g;
s/iDst/dest_image/g;
s/SaDa/Sa.Da/g;
s/FbMaskBits/MASK_BITS/g;
s/RenderSamplesX/RENDER_SAMPLES_X/g;
s/MMXData/mmx_data_t/g;
s/RegionInfo/region_info_t/g;

s/([^0x])([a-z])([A-Z])/$1$2_\l$3/g;
s/([^0x])([A-Z])([A-Z])([a-z])/$1$2_\l$3$4/g;
s/([^0x])([A-Z])([a-z]+)_([a-z])/$1\l$2$3_$4/g;
s/([a-z])_([A-Z])/$1_\l$2/g;

s/su_sE/SuSE/g;
s/X_Free86/XFree86/g;
s/X_free86/XFree86/g;

s/_ULL/ULL/g;
s/_uLL/ULL/g;

s/U_nc/UNc/g;
s/combine ##/combine_ ##/g;
s/## U/## _u/g;
s/## C/## _c/g;
s/UNc_aDD/UNc_ADD/g;

s/BLEND_MODE \((.+)\)/BLEND_MODE (\l$1)/g;
s/blend_(.+)/blend_\l$1/g;

s/AN_ds/ANDs/g;
s/O_rs/ORs/g;
s/over565/over_565/g;
s/8pix/8_pix/g;
s/Over565/over_565/g;
s/inU/in_u/g;
s/inPart/in_part/g;
s/inC/in_c/g;
s/inreverse/in_reverse/g;
s/get_exception_code/GetExceptionCode/g; # GetExceptionCode is WinCE API
s/CP_us/CPUs/g;
s/authentic_aMD/AuthenticAMD/g;
s/op_sR_cx_mAS_kx_dST/op_src_mask_dest/g;
s/no_VERBOSE/noVERBOSE/g;
s/mc_cormack/McCormack/g;
s/r1band/r1_band/g;
s/r2band/r2_band/g;
s/as GOOD things/as good things/g;
s/brokendata/broken_data/g;
s/X_render/XRender/g;
s/__open_bSD__/__OpenBSD__/g;
s/^Quick/quick/g;
s/NextRect/next_rect/g;
s/RectIn/rect_in/g;
s/pboxout/pbox_out/g;
s/F_sorted/FSorted/g;
s/usse2/u_sse2/g;
s/csse2/c_sse2/g;
s/cPixelsse2/c_pixel_sse2/g;
s/Mask565/mask_565/g;
s/565fix_rB/565_fix_rb/g;
s/565fix_g/565_fix_g/g;
s/565r/565_r/g;
s/565g/565_g/g;
s/565b/565_b/g;
s/uPixelsse2/u_pixel_sse2/g;
s/Mask00ff/mask_00ff/g;
s/Mask0080/mask_0080/g;
s/Mask0101/mask_0101/g;
s/Maskffff/mask_ffff/g;
s/Maskff000000/mask_ff000000/g;
s/load128Aligned/load_128_aligned/g;
s/load128Unaligned/load_128_unaligned/g;
s/save128Aligned/save_128_aligned/g;
s/save128Unaligned/save_128_unaligned/g;
s/fillsse2/fill_sse2/g;
s/unpack565/unpack_565/g;
s/pack565/pack_565/g;
s/bltsse2/blt_sse2/g;
s/x565Unpack/x565_unpack/g;
s/r1End/r1_end/g;
s/r2End/r2_end/g;
s/argb8Pixels/argb8_pixels/g;
 2009-07-08 00:39:32 -04:00
Søren Sandmann Pedersen
437ab04987 Remove reference to 8888_RevNP 2009-07-08 00:39:32 -04:00
Søren Sandmann Pedersen
55e63bd0f0 Remove reference to 8888RevNP 2009-07-08 00:39:32 -04:00
Søren Sandmann Pedersen
01994a59ca NoFeatures => NO_FEATURES 2009-07-08 00:39:32 -04:00
Søren Sandmann Pedersen
309d358ea6 s/FbScrRight/SCREEN_SHIFT_RIGHT/g 2009-07-08 00:39:32 -04:00
Søren Sandmann Pedersen
71fe4e3e5c CPUFeatures => cpu_features 2009-07-08 00:39:32 -04:00
Søren Sandmann Pedersen
255ddbe535 Rename FbGet8 to GET8 2009-07-08 00:39:31 -04:00
Søren Sandmann Pedersen
446276c36f Rename RBmask/Gmask => rb_mask/g_mask in pixman-arm-neon.c 2009-07-08 00:39:31 -04:00
Søren Sandmann Pedersen
412b4b50f7 Use ALPHA_8 in pixman-image.c instead of Alpha 2009-07-08 00:39:31 -04:00
Søren Sandmann Pedersen
887383b0ad Uppercase a few more macros in pixman-combine.c.template 2009-07-08 00:39:31 -04:00
Søren Sandmann Pedersen
4153361c52 Rename macros for non-separable blend modes 
Lum => LUM
Sat => SAT
Min => CH_MIN
Max => CH_MAX
 2009-07-08 00:39:31 -04:00
Søren Sandmann Pedersen
68405c326d Rename some macros in pixman-combine.c.template 
s/Combine([AB])([a-zA-Z]+)([^a-zA-Z])/COMBINE_$1_\U$2$3/g;
s/CombineA/COMBINE_A/g;
s/CombineB/COMBINE_B/g;
s/CombineXor/COMBINE_XOR/g;
s/CombineClear/COMBINE_CLEAR/g;
 2009-07-08 00:39:30 -04:00
Søren Sandmann Pedersen
835520b28f Rename U{no}mask => U_{no_}mask in pixman-vmx.c 2009-07-08 00:39:30 -04:00
Søren Sandmann Pedersen
f9bdd1a82c Change name fbComposeGetStart to PIXMAN_IMAGE_GET_LINE. 2009-07-08 00:39:30 -04:00
Søren Sandmann Pedersen
e064aa7618 Rename fbCombine* to combine* 
s/fbCombine/combine/g;
 2009-07-08 00:39:30 -04:00
Søren Sandmann Pedersen
f61855e186 Fix overeager search and replace 2009-07-08 00:39:30 -04:00
Søren Sandmann Pedersen
1de32ae2ef Uppercase some more macro names 2009-07-08 00:39:30 -04:00
Søren Sandmann Pedersen
47296209da Consolidate channel macros in pixman-combine.h 
There are now RED_8/RED_16 etc. macros instead of the old Red/Green/Blue.
 2009-07-08 00:39:30 -04:00
Søren Sandmann Pedersen
2f3e3d62f7 Change some macro names to be all uppercase 2009-07-08 00:39:30 -04:00
Søren Sandmann Pedersen
8339a4abc4 Change names of the FbByte* macros to be more descriptive. 
But also more cryptic unfortunately. For example FbByteMul() becomes
UN8x4_MUL_UN8() to indicate that it multiplies 4 UN8 numbers with one
UN8 number.
 2009-07-08 00:39:30 -04:00
Søren Sandmann Pedersen
e7f162a5a8 Clarify a couple of comments 2009-07-08 00:39:30 -04:00
Søren Sandmann Pedersen
b02c33e7da Change name of macros that operate on normalized integers. 
For example IntMul becomes MUL_UN8 to indicate that it multiplies two
unsigned normalized 8 bit integers.
 2009-07-08 00:39:30 -04:00
Søren Sandmann Pedersen
d4a366193b Fix names in the trap rasterizer. 
s/Shift4/SHIFT_4/g;
s/Get4/GET_4/g;
s/Put4/PUT_4/g;
s/DefineAlpha/DEFINE_ALPHA/g;
s/AddAlpha/ADD_ALPHA/g;
s/StepAlpha/STEP_ALPHA/g;
s/add_saturate_8/ADD_SATURATE_8/g;
s/RenderEdgeStepSmall/RENDER_EDGE_STEP_SMALL/g;
s/RenderEdgeStepBig/RENDER_EDGE_STEP_BIG/g;
s/fbRasterizeEdges/b00_re/g;
s/rasterizeEdges/RASTERIZE_EDGES/g;
s/b00_re/rasterize_edges_/g;
 2009-07-08 00:39:30 -04:00
Søren Sandmann Pedersen
bcdf0861be Rename QuadwordCopy_neon to neon_quadword_copy 
s/QuadwordCopy_neon/neon_quadword_copy/g;
 2009-07-08 00:39:30 -04:00
Søren Sandmann Pedersen
a08548bd52 Fix up the names in pixman_compute_composite_region() 
s/miClipPictureSrc/clip_source_image/g;
    s/miClipPictureReg/clip_general_image/g;
 2009-07-08 00:39:30 -04:00
Søren Sandmann Pedersen
e27b2a1fcc Fix some more pFoo names 
s/([^a-z])pReg/$1region/g;
s/([^a-z])pY/$1y_line/g;
s/([^a-z])pU/$1u_line/g;
s/([^a-z])pV/$1v_line/g;
s/([^a-z])p([A-Z])/$1\l$2/g;
 2009-07-08 00:39:30 -04:00
Søren Sandmann Pedersen
006f21b02b Fix the names of some common parameters 
s/xDst/dest_x/g;
    s/yDst/dest_y/g;
    s/xMask/mask_x/g;
    s/yMask/mask_y/g;
    s/xSrc/src_x/g;
    s/ySrc/src_y/g;
 2009-07-08 00:39:29 -04:00
Søren Sandmann Pedersen
d2a4281376 Various simple renamings 
s/CvtR8G8B8toY15/CONVERT_RGB24_TO_Y15/g;
    s/cvt8888to0565/CONVERT_8888_TO_0565/g;
    s/cvt0565to0888/CONVERT_0565_TO_0888/g;
    s/miIndexToEnt15/RGB16_TO_ENTRY/g;
    s/miIndexToEnt24/RGB24_TO_ENTRY/g;
    s/miIndexToEntY24/RGB24_TO_ENTRY_Y/g;
    s/miCvtR8G8B8to15/CONVERT_RGB24_TO_RGB15/g;
    s/is_same/IS_SAME/g;
    s/is_zero/IS_ZERO/g;
    s/is_int([ (])/IS_INT$1/g;
    s/is_one/IS_ONE/g;
    s/is_unit/IS_UNIT/g;
    s/Fetch4/FETCH_4/g;
    s/Store4/STORE_4/g;
    s/Fetch8/FETCH_8/g;
    s/Store8/STORE_8/g;
    s/Fetch24/fetch_24/g;
    s/Store24/store_24/g;
    s/_64_generic/64_generic/g;
    s/64_generic/_generic_64/g;
    s/32_generic_lossy/_generic_lossy_32/g;
    s/PdfSeparableBlendMode/PDF_SEPARABLE_BLEND_MODE/g;
    s/PdfNonSeparableBlendMode/PDF_NON_SEPARABLE_BLEND_MODE/g;
    s/([^_])HSL/$1Hsl/g;
    s/Blend/blend_/g;
    s/FbScrLeft/SCREEN_SHIFT_LEFT/g;
    s/FbScrRigth/SCREEN_SHIFT_RIGHT/g;
    s/FbLeftMask/LEFT_MASK/g;
    s/FbRightMask/RIGHT_MASK/g;
    s/Splita/SPLIT_A/g;
    s/Split/SPLIT/g;
    s/MMX_Extensions/MMX_EXTENSIONS/g;
 2009-07-08 00:39:29 -04:00
Søren Sandmann Pedersen
1c5774bf6d Get rid of pFoo names. 
s/([^o])pSrc/$1src_image/g;
    s/([^o])pDst/$1dst_image/g;
    s/([^o])pMask/$1mask_image/g;
    s/pRegion/region/g;
    s/pNextRect/next_rect/g;
 2009-07-08 00:39:29 -04:00
Søren Sandmann Pedersen
e3489730c3 Change the name of some routines that were simply misnamed. 
s/Src_pixbuf/_over_pixbuf/g;
    s/Src_x888_n/_over_x888_n/g;
    s/CompositeSrc_8888_8888/composite_over_8888_8888/g;
    s/CompositeSrc_8888_0565/composite_over_8888_0565/g;
    s/CompositeSrc_8888_8_8888/composite_over_8888_n_8888/g;
 2009-07-08 00:39:29 -04:00
Søren Sandmann Pedersen
90cac11155 Fix up names of compositing functions 
s/SrcAdd/Add/g;
    s/SolidMaskSrc/Src/g;
    s/SolidMaskIn/In/g;
    s/SolidMask/Over/g;
    s/Solid_n/Over_n/g;
    s/SrcIn/In/g;

    s/(fb)(Composite.*)sse2/sse2_$2/g;
    s/(fb)(Composite.*)mmx/mmx_$2/g;
    s/(fb)(Composite.*)neon/neon_$2/g;
    s/(fb)(Composite.*)arm/arm_$2/g;
    s/(fb)(Composite.*)vmx/vmx_$2/g;
    s/(fb)(Composite.*)/fast_$2/g;

    s/b8g8r8x8/f00bar/g;
    s/8888C/8888_ca/g;
    s/0565C/0565_ca/g;
    s/8888RevNPx/pixbuf_x_/g;
    s/8x0/8_x_0/g;
    s/00x8/00_x_8/g;
    s/8x8/8_x_8/g;
    s/8x8/8_x_8/g;
    s/nx8/n_x_8/g;
    s/24x16/24_x_16/g;
    s/16x16/16_x_16/g;
    s/8xx8/8_x_x8/g;
    s/8xn/8_x_n/g;
    s/nx0/n_x_0/g;
    s/_x_/_/g;
    s/f00bar/b8g8r8x8/;

    # Fix up NEON type names
    s/uint8_8/uint8x8/g;
 2009-07-08 00:39:29 -04:00
Søren Sandmann Pedersen
e987661667 Rename fetchers. 
s/fbFetchPixel/fetch_pixels/g;
s/fbFetch/fetch_scanline/g;
s/fbStore/store_scanline/g;
 2009-07-08 00:39:29 -04:00
Søren Sandmann Pedersen
2d32d91e5d Use postfix decrement, not prefix, in region-test.c 2009-07-08 00:38:28 -04:00
Søren Sandmann Pedersen
4e41905bac Eliminate empty rectangles in pixman_region_init_rects(). 
Otherwise they show up in the validated regions.
 2009-07-08 00:08:49 -04:00
Søren Sandmann Pedersen
967ff0bdc7 Add an initialization with an empty rectangle to region-test.c 
This should produce a valid region without empty rectangles in
it. Currently it doesn't.
 2009-07-07 22:55:32 -04:00
Søren Sandmann Pedersen
40fcc14d1c Expand comment in miClipPictureSrc() to explain why a client clip is required. 2009-07-06 20:38:07 -04:00
Søren Sandmann Pedersen
eba3be7b7a Fix forgotten use BITMAP_BIT_ORDER to be ifndef WORDS_BIG_ENDIAN 2009-07-05 00:35:31 -04:00