diff --git a/glamor/glamor.c b/glamor/glamor.c index ea822f318..f924c91db 100644 --- a/glamor/glamor.c +++ b/glamor/glamor.c @@ -22,6 +22,7 @@ * * Authors: * Eric Anholt + * Zhigang Gong * */ diff --git a/glamor/glamor.h b/glamor/glamor.h index e6206d09e..da45acc89 100644 --- a/glamor/glamor.h +++ b/glamor/glamor.h @@ -22,6 +22,7 @@ * * Authors: * Eric Anholt + * Zhigang Gong * */ diff --git a/glamor/glamor_copyarea.c b/glamor/glamor_copyarea.c index f28206791..ee9e9f44a 100644 --- a/glamor/glamor_copyarea.c +++ b/glamor/glamor_copyarea.c @@ -19,6 +19,10 @@ * 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. + * + * Authors: + * Eric Anholt + * Zhigang Gong */ #include "glamor_priv.h" @@ -329,7 +333,6 @@ _glamor_copy_n_to_n(DrawablePtr src, } } } - /* XXX need revisit to handle overlapped area copying. */ #ifndef GLAMOR_GLES2 if ((overlaped || !src_pixmap_priv->gl_tex || !dst_pixmap_priv->gl_tex) diff --git a/glamor/glamor_debug.h b/glamor/glamor_debug.h index ac7e69870..99dce041c 100644 --- a/glamor/glamor_debug.h +++ b/glamor/glamor_debug.h @@ -1,3 +1,31 @@ +/* + * Copyright © 2009 Intel Corporation + * Copyright © 1998 Keith Packard + * + * 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: + * Zhigang Gong + * + */ + #ifndef __GLAMOR_DEBUG_H__ #define __GLAMOR_DEBUG_H__ diff --git a/glamor/glamor_eglmodule.c b/glamor/glamor_eglmodule.c index 096165162..046f4de5b 100644 --- a/glamor/glamor_eglmodule.c +++ b/glamor/glamor_eglmodule.c @@ -22,6 +22,9 @@ * not be used in advertising or otherwise to promote the sale, use or other * dealings in this Software without prior written authorization from the * XFree86 Project. + * + * Authors: + * Zhigang Gong */ #ifdef HAVE_CONFIG_H diff --git a/glamor/glamor_fbo.c b/glamor/glamor_fbo.c index a7cae664d..9b8dcdf5e 100644 --- a/glamor/glamor_fbo.c +++ b/glamor/glamor_fbo.c @@ -1,3 +1,31 @@ +/* + * Copyright © 2009 Intel Corporation + * Copyright © 1998 Keith Packard + * + * 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: + * Zhigang Gong + * + */ + #include #include "glamor_priv.h" diff --git a/glamor/glamor_fill.c b/glamor/glamor_fill.c index 95b070db0..def4550c0 100644 --- a/glamor/glamor_fill.c +++ b/glamor/glamor_fill.c @@ -19,6 +19,10 @@ * 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. + * + * Authors: + * Eric Anholt + * Zhigang Gong */ #include "glamor_priv.h" diff --git a/glamor/glamor_getspans.c b/glamor/glamor_getspans.c index 22e2b7c6b..6d6c8e9a4 100644 --- a/glamor/glamor_getspans.c +++ b/glamor/glamor_getspans.c @@ -22,6 +22,7 @@ * * Authors: * Eric Anholt + * Zhigang Gong * */ diff --git a/glamor/glamor_gl_dispatch.c b/glamor/glamor_gl_dispatch.c index e6da94d9c..f99650425 100644 --- a/glamor/glamor_gl_dispatch.c +++ b/glamor/glamor_gl_dispatch.c @@ -1,3 +1,31 @@ +/* + * Copyright © 2009 Intel Corporation + * Copyright © 1998 Keith Packard + * + * 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: + * Zhigang Gong + * + */ + #include "glamor_priv.h" #include diff --git a/glamor/glamor_glext.h b/glamor/glamor_glext.h index f734d1313..d60c69690 100644 --- a/glamor/glamor_glext.h +++ b/glamor/glamor_glext.h @@ -1,3 +1,32 @@ +/* + * Copyright © 2001 Keith Packard + * Copyright © 2008 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: + * Zhigang Gong + * + */ + + #ifdef GLAMOR_GLES2 #define GL_BGRA GL_BGRA_EXT diff --git a/glamor/glamor_picture.c b/glamor/glamor_picture.c index 38185a491..a6d21f110 100644 --- a/glamor/glamor_picture.c +++ b/glamor/glamor_picture.c @@ -1,3 +1,31 @@ +/* + * Copyright © 2009 Intel Corporation + * Copyright © 1998 Keith Packard + * + * 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: + * Zhigang Gong + * + */ + #include #include "glamor_priv.h" diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c index 68a7b0638..5c46b0355 100644 --- a/glamor/glamor_pixmap.c +++ b/glamor/glamor_pixmap.c @@ -1,3 +1,32 @@ +/* + * Copyright © 2001 Keith Packard + * Copyright © 2008 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 + * Zhigang Gong + * + */ + #include #include "glamor_priv.h" diff --git a/glamor/glamor_putimage.c b/glamor/glamor_putimage.c index 0c3c0c5ba..a1119b65c 100644 --- a/glamor/glamor_putimage.c +++ b/glamor/glamor_putimage.c @@ -22,6 +22,7 @@ * * Authors: * Eric Anholt + * Zhigang Gong * */ diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c index 3f3a3bc18..0377a8a00 100644 --- a/glamor/glamor_render.c +++ b/glamor/glamor_render.c @@ -22,6 +22,8 @@ * * Authors: * Eric Anholt + * Zhigang Gong + * Junyan He * */ diff --git a/glamor/glamor_setspans.c b/glamor/glamor_setspans.c index e28385335..a71efe901 100644 --- a/glamor/glamor_setspans.c +++ b/glamor/glamor_setspans.c @@ -22,6 +22,7 @@ * * Authors: * Eric Anholt + * Zhigang Gong * */ diff --git a/glamor/glamor_tile.c b/glamor/glamor_tile.c index 8e0955364..df66d05ec 100644 --- a/glamor/glamor_tile.c +++ b/glamor/glamor_tile.c @@ -22,6 +22,7 @@ * * Authors: * Eric Anholt + * Zhigang Gong * */ diff --git a/glamor/glamor_utils.h b/glamor/glamor_utils.h index f39e3a532..d133135af 100644 --- a/glamor/glamor_utils.h +++ b/glamor/glamor_utils.h @@ -1,3 +1,30 @@ +/* + * 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: + * Zhigang Gong + * + */ + #ifndef GLAMOR_PRIV_H #error This file can only be included by glamor_priv.h #endif