mesa: apply patches (fix #1193)

This commit is contained in:
Norman Feske 2014-06-27 14:03:50 +02:00
parent f3ae42275a
commit bb83c0d3da
4 changed files with 8 additions and 7 deletions

View File

@ -1 +1 @@
62ddafecf42585a5630d3b60ac6d058f5f8330b3
abe06d02df59ba0624e97c92a91ab2d9806d4889

View File

@ -6,6 +6,9 @@ URL(mesa) := ftp://ftp.freedesktop.org/pub/mesa/older-versions/7.x/$(VERSION)/Me
SHA(mesa) := 74e72b56c7ae779649c18867fe9e0865f3bfc057
DIR(mesa) := src/lib/mesa
PATCHES := src/lib/gallium/p_state_config.patch \
src/lib/egl/opengl_precision.patch
DIRS := include include/EGL
DIR_CONTENT(include) := $(addprefix src/lib/mesa/include/,GL KHR)
DIR_CONTENT(include/EGL) := $(addprefix src/lib/mesa/include/EGL/,egl.h eglext.h)

View File

@ -10,10 +10,8 @@ the compile errors and didn't seem to cause any problems so far.
src/mesa/shader/slang/slang_compile.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c
index ad86676..101623d 100644
--- a/src/mesa/shader/slang/slang_compile.c
+++ b/src/mesa/shader/slang/slang_compile.c
--- src/lib/mesa/src/mesa/shader/slang/slang_compile.c
--- src/lib/mesa/src/mesa/shader/slang/slang_compile.c
@@ -2571,7 +2571,7 @@ parse_code_unit(slang_parse_ctx * C, slang_code_unit * unit,
#if FEATURE_es2_glsl
o.allow_precision = GL_TRUE;

View File

@ -2,8 +2,8 @@ Reduce memory allocated in 'sp_context.c' used for caching. By default,
more than 100 MB of memory gets allocated via malloc. We override the
definitions in 'gallium/include/pipe/p_state.h' to reduce the footprint.
--- src/gallium/include/pipe/p_state.h 2010-04-05 18:05:15.000000000 +0200
+++ src/gallium/include/pipe/p_state.h 2010-08-07 22:45:24.000000000 +0200
--- src/lib/mesa/src/gallium/include/pipe/p_state.h
--- src/lib/mesa/src/gallium/include/pipe/p_state.h
@@ -56,10 +56,10 @@
*/
#define PIPE_MAX_ATTRIBS 32