haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Mesa 9.0.1: Changes to how our GL works

Browse Source 
* I'm moving Mesa into the opengl add-on to avoid
  then need to pack llvm into libGL
* The x86sse hack is no longer required with this
  new layout.
* We were missing libmesagallium.a from the scons
  build of Mesa.. this is essential to linking
  Gallium stuff to Mesa stuff.
  This diff will be going to upstream mesa.
This commit is contained in:
Alexander von Gluck
2012-12-19 17:46:04 +00:00
parent 41a4b3f092
commit b4e03db0ac
1 changed files with 29 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
sys-libs/mesa/patches/mesa-9.0.1.patch
View File

@@ -25,45 +25,37 @@ diff -Naur Mesa-9.0.1/src/gallium/auxiliary/Makefile Mesa-9.0.1-haiku/src/galliu
include ../Makefile.template
diff -Naur Mesa-9.0.1/src/mesa/sources.mak Mesa-9.0.1-haiku/src/mesa/sources.mak
--- Mesa-9.0.1/src/mesa/sources.mak 2012-11-09 12:16:31.037486592 -0600
+++ Mesa-9.0.1-haiku/src/mesa/sources.mak 2012-12-18 23:07:00.535560192 -0600
@@ -281,7 +281,6 @@
$(SRCDIR)x86/x86_xform.c \
$(SRCDIR)x86/3dnow.c \
$(SRCDIR)x86/sse.c \
- $(SRCDIR)x86/rtasm/x86sse.c \
$(SRCDIR)sparc/sparc.c \
$(SRCDIR)x86-64/x86-64.c
diff -Naur Mesa-9.0.1/src/mesa/SConscript Mesa-9.0.1-haiku/src/mesa/SConscript
--- Mesa-9.0.1/src/mesa/SConscript 2012-11-09 12:16:31.015728640 -0600
+++ Mesa-9.0.1-haiku/src/mesa/SConscript 2012-12-19 11:37:28.289144832 -0600
@@ -331,6 +331,14 @@
statetracker_sources
)
diff -Naur Mesa-9.0.1/src/mesa/tnl/t_vertex_sse.c Mesa-9.0.1-haiku/src/mesa/tnl/t_vertex_sse.c
--- Mesa-9.0.1/src/mesa/tnl/t_vertex_sse.c 2012-08-31 18:33:41.058982400 -0500
+++ Mesa-9.0.1-haiku/src/mesa/tnl/t_vertex_sse.c 2012-12-18 23:07:00.538181632 -0600
@@ -36,7 +36,7 @@
+mesa_gallium_sources = (
+ main_sources +
+ math_sources +
+ vbo_sources +
+ program_sources,
+ 'x86/common_x86.c'
+)
+
GLAPI = '#src/mapi/glapi/'
#if defined(USE_SSE_ASM)
if env['gles']:
@@ -495,8 +503,15 @@
source = mesa_sources,
)
-#include "x86/rtasm/x86sse.h"
+#include "rtasm/rtasm_x86sse.h"
#include "x86/common_x86_asm.h"
+mesagallium = env.ConvenienceLibrary(
+ target = 'mesagallium',
+ source = mesa_gallium_sources,
+)
+
env.Alias('mesa', mesa)
+env.Alias('mesagallium', mesagallium)
Export('mesa')
+Export('mesagallium')
@@ -356,7 +356,7 @@
struct x86_reg vp0 = x86_make_reg(file_XMM, 1);
struct x86_reg vp1 = x86_make_reg(file_XMM, 2);
struct x86_reg temp2 = x86_make_reg(file_XMM, 3);
- GLubyte *fixup, *label;
+ GLuint fixup, label;
/* Push a few regs?
*/
@@ -658,7 +658,8 @@
p.identity = x86_make_reg(file_XMM, 6);
p.chan0 = x86_make_reg(file_XMM, 7);
- if (!x86_init_func_size(&p.func, MAX_SSE_CODE_SIZE)) {
+ x86_init_func_size(&p.func, MAX_SSE_CODE_SIZE);
+ if (p.func.caps == 0) {
vtx->emit = NULL;
return;
}
SConscript('drivers/SConscript')