From bdc7ac211f0ec7722cec5435c22f90a2bebfef18 Mon Sep 17 00:00:00 2001 From: Jay Sorg Date: Sun, 28 Sep 2014 21:18:59 -0700 Subject: [PATCH] Xorg: added a header file to the asm funcs --- xorg/server/module/rdpXv.c | 11 +-------- xorg/server/module/x86/funcs_x86.h | 39 ++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 10 deletions(-) create mode 100644 xorg/server/module/x86/funcs_x86.h diff --git a/xorg/server/module/rdpXv.c b/xorg/server/module/rdpXv.c index be44542f..d055c68b 100644 --- a/xorg/server/module/rdpXv.c +++ b/xorg/server/module/rdpXv.c @@ -624,16 +624,7 @@ yuy2_to_rgb32_amd64_sse2(unsigned char *yuvs, int width, int height, int *rgbs); int uyvy_to_rgb32_amd64_sse2(unsigned char *yuvs, int width, int height, int *rgbs); #elif defined(__x86__) || defined(_M_IX86) || defined(__i386__) -int -cpuid_x86(int eax_in, int ecx_in, int *eax, int *ebx, int *ecx, int *edx); -int -yv12_to_rgb32_x86_sse2(unsigned char *yuvs, int width, int height, int *rgbs); -int -i420_to_rgb32_x86_sse2(unsigned char *yuvs, int width, int height, int *rgbs); -int -yuy2_to_rgb32_x86_sse2(unsigned char *yuvs, int width, int height, int *rgbs); -int -uyvy_to_rgb32_x86_sse2(unsigned char *yuvs, int width, int height, int *rgbs); +#include "x86/funcs_x86.h" #endif #endif diff --git a/xorg/server/module/x86/funcs_x86.h b/xorg/server/module/x86/funcs_x86.h new file mode 100644 index 00000000..00724e62 --- /dev/null +++ b/xorg/server/module/x86/funcs_x86.h @@ -0,0 +1,39 @@ +/* +Copyright 2014 Jay Sorg + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice 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 +OPEN GROUP 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. + +x86 asm files + +*/ + +#ifndef __FUNCS_X86_H +#define __FUNCS_X86_H + +int +cpuid_x86(int eax_in, int ecx_in, int *eax, int *ebx, int *ecx, int *edx); +int +yv12_to_rgb32_x86_sse2(unsigned char *yuvs, int width, int height, int *rgbs); +int +i420_to_rgb32_x86_sse2(unsigned char *yuvs, int width, int height, int *rgbs); +int +yuy2_to_rgb32_x86_sse2(unsigned char *yuvs, int width, int height, int *rgbs); +int +uyvy_to_rgb32_x86_sse2(unsigned char *yuvs, int width, int height, int *rgbs); + +#endif +