From eb384524d18261e42f80deeb7cbe74523f1d49eb Mon Sep 17 00:00:00 2001 From: miwi Date: Sun, 5 Feb 2012 16:43:42 +0000 Subject: - Move ports/branches/xorg-dev to ports/trunk/ git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@388 058c260c-8361-11dd-a0ac-aa2bafec7d09 --- graphics/libGL/files/extra-mach64_context.h | 21 ++++++ graphics/libGL/files/extra-sis_context.h | 22 +++++++ .../extra-src-glsl_ir_constant_expression.cpp | 14 ++++ .../files/extra-src__mesa__x86-64__glapi_x86-64.S | 12 ++++ .../libGL/files/extra-src__mesa__x86-64__xform4.S | 74 ++++++++++++++++++++++ .../libGL/files/extra-src__mesa__x86__glapi_x86.S | 11 ++++ .../extra-src__mesa__x86__read_rgba_span_x86.S | 11 ++++ 7 files changed, 165 insertions(+) create mode 100644 graphics/libGL/files/extra-mach64_context.h create mode 100644 graphics/libGL/files/extra-sis_context.h create mode 100644 graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp create mode 100644 graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S create mode 100644 graphics/libGL/files/extra-src__mesa__x86-64__xform4.S create mode 100644 graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S create mode 100644 graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S (limited to 'graphics/libGL/files') diff --git a/graphics/libGL/files/extra-mach64_context.h b/graphics/libGL/files/extra-mach64_context.h new file mode 100644 index 0000000..f844599 --- /dev/null +++ b/graphics/libGL/files/extra-mach64_context.h @@ -0,0 +1,21 @@ +--- src/mesa/drivers/dri/mach64/mach64_context.h.orig 2011-05-13 01:47:18.000000000 +0200 ++++ src/mesa/drivers/dri/mach64/mach64_context.h 2011-07-27 09:59:53.000000000 +0200 +@@ -289,7 +289,7 @@ + /* ================================================================ + * Byte ordering + */ +-#if MESA_LITTLE_ENDIAN == 1 ++#if defined(MESA_LITTLE_ENDIAN) && MESA_LITTLE_ENDIAN == 1 + #define LE32_IN( x ) ( *(GLuint *)(x) ) + #define LE32_IN_FLOAT( x ) ( *(GLfloat *)(x) ) + #define LE32_OUT( x, y ) do { *(GLuint *)(x) = (y); } while (0) +@@ -298,6 +298,9 @@ + #if defined(__OpenBSD__) || defined(__NetBSD__) + #include + #define bswap_32 bswap32 ++#elif defined(__FreeBSD__) ++#include ++#define bswap_32 bswap32 + #else + #include + #endif diff --git a/graphics/libGL/files/extra-sis_context.h b/graphics/libGL/files/extra-sis_context.h new file mode 100644 index 0000000..0e16f51 --- /dev/null +++ b/graphics/libGL/files/extra-sis_context.h @@ -0,0 +1,22 @@ +--- src/mesa/drivers/dri/sis/sis_context.h.orig 2010-12-14 22:43:15.000000000 +0100 ++++ src/mesa/drivers/dri/sis/sis_context.h 2011-07-27 09:58:22.000000000 +0200 +@@ -400,10 +400,18 @@ + #define MMIO_READ(reg) *(volatile GLint *)(smesa->IOBase + (reg)) + #define MMIO_READf(reg) *(volatile GLfloat *)(smesa->IOBase + (reg)) + +-#if defined(__i386__) || defined(__x86_64__) ++#if defined(__i386__) || defined(__x86_64__) || defined(__amd64__) + #define MMIO_WMB() __asm __volatile("" : : : "memory") + #elif defined(__ia64__) + #define MMIO_WMB() __asm __volatile("mf" : : : "memory") ++#elif defined(__powerpc__) ++#define MMIO_WMB() __asm __volatile("eieio" : : : "memory") ++#elif defined(__sparc64__) ++/* ++ * #StoreStore probably would be sufficient for this driver at the ++ * time of this writing but we use #Sync for safety. ++ */ ++#define MMIO_WMB() __asm __volatile("membar #Sync" : : : "memory") + #else + #error platform needs WMB + #endif diff --git a/graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp b/graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp new file mode 100644 index 0000000..8df4043 --- /dev/null +++ b/graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp @@ -0,0 +1,14 @@ +--- src/glsl/ir_constant_expression.cpp.orig 2011-07-23 15:08:44.000000000 +0200 ++++ src/glsl/ir_constant_expression.cpp 2011-07-23 15:09:03.000000000 +0200 +@@ -39,6 +39,11 @@ + #include "ir_visitor.h" + #include "glsl_types.h" + ++#include ++#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027) ++#define log2(x) (log(x) / log(2)) ++#endif ++ + static float + dot(ir_constant *op0, ir_constant *op1) + { diff --git a/graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S b/graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S new file mode 100644 index 0000000..908a6fe --- /dev/null +++ b/graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S @@ -0,0 +1,12 @@ +--- ./src/mesa/x86-64/glapi_x86-64.S.orig 2009-03-13 04:28:49.000000000 +0100 ++++ ./src/mesa/x86-64/glapi_x86-64.S 2011-01-28 18:12:18.000000000 +0100 +@@ -73,7 +73,8 @@ _x86_64_get_dispatch: + + .p2align 4,,15 + _x86_64_get_dispatch: +- movq _gl_DispatchTSD(%rip), %rdi ++ movq _gl_DispatchTSD@GOTPCREL(%rip), %rax ++ movl (%rax), %edi + jmp pthread_getspecific@PLT + + #elif defined(THREADS) diff --git a/graphics/libGL/files/extra-src__mesa__x86-64__xform4.S b/graphics/libGL/files/extra-src__mesa__x86-64__xform4.S new file mode 100644 index 0000000..193e6cc --- /dev/null +++ b/graphics/libGL/files/extra-src__mesa__x86-64__xform4.S @@ -0,0 +1,74 @@ +--- src/mesa/x86-64/xform4.S.orig 2009-01-22 18:38:35.000000000 +0100 ++++ src/mesa/x86-64/xform4.S 2011-05-09 21:26:00.000000000 +0200 +@@ -53,7 +53,7 @@ _mesa_x86_64_transform_points4_general: + * rdx = source + */ + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ + + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -116,7 +116,7 @@ p4_constants: + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 +-.float 0f+1.0 ++.float 1.0 + + .text + .align 16 +@@ -135,7 +135,7 @@ _mesa_x86_64_transform_points4_3d: + movaps 16(%rax), %xmm10 + + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ + + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -195,7 +195,7 @@ p4_3d_done: + _mesa_x86_64_transform_points4_identity: + + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ + + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -223,7 +223,7 @@ p4_identity_done: + _mesa_3dnow_transform_points4_3d_no_rot: + + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ + + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -287,7 +287,7 @@ p4_3d_no_rot_done: + _mesa_3dnow_transform_points4_perspective: + + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ + + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -353,7 +353,7 @@ p4_perspective_done: + _mesa_3dnow_transform_points4_2d_no_rot: + + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ + + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -408,7 +408,7 @@ p4_2d_no_rot_done: + _mesa_3dnow_transform_points4_2d: + + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ + + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ diff --git a/graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S b/graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S new file mode 100644 index 0000000..71da78c --- /dev/null +++ b/graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S @@ -0,0 +1,11 @@ +--- ./src/mesa/x86/glapi_x86.S.orig 2009-03-13 04:28:49.000000000 +0100 ++++ ./src/mesa/x86/glapi_x86.S 2011-01-28 18:11:56.000000000 +0100 +@@ -47,7 +47,7 @@ + #define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX)) + + #if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__) +-#define GLOBL_FN(x) GLOBL x ; .type x, function ++#define GLOBL_FN(x) GLOBL x ; .type x, @function + #else + #define GLOBL_FN(x) GLOBL x + #endif diff --git a/graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S b/graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S new file mode 100644 index 0000000..37b08d1 --- /dev/null +++ b/graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S @@ -0,0 +1,11 @@ +--- ./src/mesa/x86/read_rgba_span_x86.S.orig 2008-08-25 16:46:47.000000000 +0200 ++++ ./src/mesa/x86/read_rgba_span_x86.S 2011-01-28 18:10:06.000000000 +0100 +@@ -648,7 +648,7 @@ _generic_read_RGBA_span_RGB565_MMX: + testl $0x01, %ecx + je .L01 + +- movzxw (%eax), %ecx ++ movzwl (%eax), %ecx + movd %ecx, %mm4 + + pshufw $0x00, %mm4, %mm0 -- cgit v1.2.3