i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libGL: Major shakeup

Browse Source 
* libmesa and libgallium no longer live in libGL
* opengl kit gets libglapi for dispatch
* swrast will get libmesa
* swpipe will get libmesagallium + gallium drivers + llvm
This commit is contained in:
Alexander von Gluck IV
2012-12-21 19:23:39 -06:00
parent bc22b037c4
commit e685ddf799
5 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildFeatures
+1 -4
View File
@@ -250,12 +250,9 @@ if $(TARGET_ARCH) = x86 {
HAIKU_MESA_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_MESA_DIR) HAIKU_MESA_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_MESA_DIR)
: include/ : $(zipFile) : extracted-mesa ] ; : include/ : $(zipFile) : extracted-mesa ] ;
HAIKU_MESA_LIBS = [ ExtractArchive $(HAIKU_MESA_DIR) HAIKU_GLAPI_LIBS = [ ExtractArchive $(HAIKU_MESA_DIR)
: :
$(galliumObjects)
lib.haiku/libglapi.a lib.haiku/libglapi.a
$(glslObject)
lib.haiku/libmesa.a
: $(zipFile) : $(zipFile)
: extracted-mesa ] ; : extracted-mesa ] ;
src/add-ons/opengl/swpipe/Jamfile
+6 -3
View File
@@ -13,15 +13,18 @@ local sources =
GalliumFramebuffer.cpp GalliumFramebuffer.cpp
bitmap_wrapper.cpp ; bitmap_wrapper.cpp ;
local HAIKU_SWPIPE_DRIVER = $(HAIKU_MESA_DIR)/lib.haiku/libsoftpipe.a ;
if $(HAIKU_LLVM_PRESENT) { if $(HAIKU_LLVM_PRESENT) {
# TODO: Add LLVM OptionalBuildPackage # TODO: Add LLVM OptionalBuildPackage
SubDirC++Flags [ FDefines HAVE_LLVM=0x0302 ] ; SubDirC++Flags [ FDefines HAVE_LLVM=0x0302 ] ;
# TODO: This is a hack for now # TODO: This is a hack for now
SubDirSysHdrs /boot/common/include ; SubDirSysHdrs /boot/common/include ;
HAIKU_SWPIPE_DRIVER =
$(HAIKU_MESA_DIR)/lib.haiku/libllvmpipe.a ;
} }
UsePrivateHeaders interface ; UsePrivateHeaders interface ;
SubDirSysHdrs $(HAIKU_MESA_HEADERS) ; SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
Includes [ FGristFiles $(sources) ] : $(HAIKU_MESA_HEADERS_DEPENDENCY) ; Includes [ FGristFiles $(sources) ] : $(HAIKU_MESA_HEADERS_DEPENDENCY) ;
@@ -31,7 +34,7 @@ AddResources Software\ Renderer : SoftwareRenderer.rdef ;
Addon Software\ Renderer : Addon Software\ Renderer :
$(sources) $(sources)
: libGL.so : libGL.so
$(HAIKU_MESA_DIR)/lib.haiku/libgallium.a $(HAIKU_MESA_DIR)/lib.haiku/libmesagallium.a
$(HAIKU_MESA_DIR)/lib.haiku/libsoftpipe.a $(HAIKU_SWPIPE_DRIVER)
be translation $(TARGET_LIBSUPC++) be translation $(TARGET_LIBSUPC++)
; ;
src/add-ons/opengl/swrast/Jamfile
+4 -7
View File
@@ -35,15 +35,12 @@ UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa main ] ;
UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mapi ] ; UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mapi ] ;
UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mapi glapi ] ; UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mapi glapi ] ;
# For older versions of Mesa
UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa glapi ] ;
UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa tnl ] ;
UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa x86 ] ;
AddResources Software\ Rasterizer : MesaSoftwareRenderer.rdef ; AddResources Software\ Rasterizer : MesaSoftwareRenderer.rdef ;
Addon Software\ Rasterizer : Addon Software\ Rasterizer :
MesaSoftwareRenderer.cpp MesaSoftwareRenderer.cpp
: libGL.so be $(TARGET_LIBSUPC++) :
$(HAIKU_MESA_DIR)/lib.haiku/libmesa.a
$(HAIKU_MESA_DIR)/lib.haiku/libglsl.a
libGL.so be $(TARGET_LIBSUPC++)
; ;
src/add-ons/opengl/swrast_legacy/Jamfile
+3 -1
View File
@@ -48,5 +48,7 @@ AddResources Legacy\ Software\ Rasterizer : MesaSoftwareRenderer.rdef ;
Addon Legacy\ Software\ Rasterizer : Addon Legacy\ Software\ Rasterizer :
MesaSoftwareRenderer.cpp MesaSoftwareRenderer.cpp
: libGL.so be $(TARGET_LIBSUPC++) :
$(HAIKU_MESA_DIR)/lib.haiku/lib.haiku/libmesa.a
libGL.so be $(TARGET_LIBSUPC++)
; ;
src/kits/opengl/Jamfile
+2 -2
View File
@@ -46,8 +46,8 @@ SharedLibrary libGL.so : $(sources) :
# GLU # GLU
$(HAIKU_GLU_LIBS) $(HAIKU_GLU_LIBS)
# Mesa libraries (from Mesa optional package): # GLAPI Dispatch code (from Mesa buildpackage)
$(HAIKU_MESA_LIBS) $(HAIKU_GLAPI_LIBS)
# External libraries: # External libraries:
game # BWindowScreen needed by BGLScreen stub class game # BWindowScreen needed by BGLScreen stub class