From bec3facc5e6a7335f82774d63960178b64597d05 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 23 Jan 2012 13:45:06 -0600 Subject: [PATCH] mesa: Use latest Mesa optional package * Use non-debug version which is a *lot* smaller * Represents bug fixes to Mesa under Haiku, x86 assembly + sse is now used with swrast. * Remove state.h requirement as I can't find anything that actually uses it. --- build/jam/OptionalBuildFeatures | 4 ++-- .../opengl/mesa_software_renderer/MesaSoftwareRenderer.cpp | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures index 27697da31f..41d5e4e922 100644 --- a/build/jam/OptionalBuildFeatures +++ b/build/jam/OptionalBuildFeatures @@ -177,8 +177,8 @@ if $(TARGET_ARCH) = x86 { local galliumObjects ; local zipFile ; if $(HAIKU_GCC_VERSION[1]) >= 4 { - #HAIKU_MESA_FILE = mesa-8.0dev-x86-gcc4-2012-01-17.zip ; - HAIKU_MESA_FILE = mesa-8.0devdbg-x86-gcc4-2012-01-17.zip ; + HAIKU_MESA_FILE = mesa-8.0dev-x86-gcc4-2012-01-23.zip ; + #HAIKU_MESA_FILE = mesa-8.0devdbg-x86-gcc4-2012-01-23.zip ; glslObject = lib.haiku/libglsl.a ; galliumObjects = lib.haiku/libgallium.a ; } else { diff --git a/src/add-ons/opengl/mesa_software_renderer/MesaSoftwareRenderer.cpp b/src/add-ons/opengl/mesa_software_renderer/MesaSoftwareRenderer.cpp index 1b8e560231..6a3e0c892f 100644 --- a/src/add-ons/opengl/mesa_software_renderer/MesaSoftwareRenderer.cpp +++ b/src/add-ons/opengl/mesa_software_renderer/MesaSoftwareRenderer.cpp @@ -35,7 +35,6 @@ extern "C" { #include "main/formats.h" #include "main/framebuffer.h" #include "main/renderbuffer.h" -#include "main/state.h" #include "swrast/swrast.h" #if __GNUC__ > 2 #include "swrast/s_renderbuffer.h"