diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-20 11:47:27 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-20 11:47:27 +0200 |
| commit | 55c05b8a12944349b00053253d3a49b223a9f4de (patch) | |
| tree | ffa9a1d19efffd67daca5f1568fc2394fdbe0534 /mesalib/src/glsl | |
| parent | 7f669a708bd35bdf8e842f762ec68f9ad0ec0486 (diff) | |
| download | vcxsrv-55c05b8a12944349b00053253d3a49b223a9f4de.tar.gz vcxsrv-55c05b8a12944349b00053253d3a49b223a9f4de.tar.bz2 vcxsrv-55c05b8a12944349b00053253d3a49b223a9f4de.zip | |
fontconfig mesa pixman git update 20 Sep 2013
pixman commit aa5c45254eb60ce4c85a25b5343474fb160ffa7c
fontconfig commit 643f8088f0d51107e58d142df47124efec6afab1
mesa commit 1cc3b90d47f92aa0be2d914191fd2f46d2b127d7
Diffstat (limited to 'mesalib/src/glsl')
| -rw-r--r-- | mesalib/src/glsl/Android.gen.mk | 19 | ||||
| -rw-r--r-- | mesalib/src/glsl/builtin_functions.cpp | 3 | ||||
| -rw-r--r-- | mesalib/src/glsl/standalone_scaffolding.cpp | 2 |
3 files changed, 5 insertions, 19 deletions
diff --git a/mesalib/src/glsl/Android.gen.mk b/mesalib/src/glsl/Android.gen.mk index 2ed9fa64b..7ec56d4f2 100644 --- a/mesalib/src/glsl/Android.gen.mk +++ b/mesalib/src/glsl/Android.gen.mk @@ -35,10 +35,6 @@ sources := \ glcpp/glcpp-lex.c \ glcpp/glcpp-parse.c -ifneq ($(LOCAL_IS_HOST_MODULE),true) -sources += builtin_function.cpp -endif - LOCAL_SRC_FILES := $(filter-out $(sources), $(LOCAL_SRC_FILES)) LOCAL_C_INCLUDES += $(intermediates) $(intermediates)/glcpp $(MESA_TOP)/src/glsl/glcpp @@ -81,18 +77,3 @@ $(intermediates)/glcpp/glcpp-lex.c: $(LOCAL_PATH)/glcpp/glcpp-lex.l $(intermediates)/glcpp/glcpp-parse.c: $(LOCAL_PATH)/glcpp/glcpp-parse.y $(call glsl_local-y-to-c-and-h) - -BUILTIN_COMPILER := $(BUILD_OUT_EXECUTABLES)/mesa_builtin_compiler$(BUILD_EXECUTABLE_SUFFIX) - -builtin_function_deps := \ - $(LOCAL_PATH)/builtins/tools/generate_builtins.py \ - $(LOCAL_PATH)/builtins/tools/texture_builtins.py \ - $(BUILTIN_COMPILER) \ - $(wildcard $(LOCAL_PATH)/builtins/profiles/*) \ - $(wildcard $(LOCAL_PATH)/builtins/ir/*) - -$(intermediates)/builtin_function.cpp: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/builtins/tools/generate_builtins.py -$(intermediates)/builtin_function.cpp: $(builtin_function_deps) - @mkdir -p $(dir $@) - @echo "Gen GLSL: $(PRIVATE_MODULE) <= $(notdir $@)" - $(hide) $(PRIVATE_SCRIPT) $(BUILTIN_COMPILER) > $@ || rm -f $@ diff --git a/mesalib/src/glsl/builtin_functions.cpp b/mesalib/src/glsl/builtin_functions.cpp index 31f7489d1..96358a737 100644 --- a/mesalib/src/glsl/builtin_functions.cpp +++ b/mesalib/src/glsl/builtin_functions.cpp @@ -580,6 +580,9 @@ builtin_builder::release() { ralloc_free(mem_ctx); mem_ctx = NULL; + + ralloc_free(shader); + shader = NULL; } void diff --git a/mesalib/src/glsl/standalone_scaffolding.cpp b/mesalib/src/glsl/standalone_scaffolding.cpp index 11cd6cdc0..6dec205f7 100644 --- a/mesalib/src/glsl/standalone_scaffolding.cpp +++ b/mesalib/src/glsl/standalone_scaffolding.cpp @@ -116,11 +116,13 @@ void initialize_context_to_defaults(struct gl_context *ctx, gl_api api) ctx->Const.VertexProgram.MaxAttribs = 16; ctx->Const.VertexProgram.MaxUniformComponents = 512; + ctx->Const.VertexProgram.MaxOutputComponents = 32; ctx->Const.MaxVarying = 8; /* == gl_MaxVaryingFloats / 4 */ ctx->Const.VertexProgram.MaxTextureImageUnits = 0; ctx->Const.MaxCombinedTextureImageUnits = 2; ctx->Const.FragmentProgram.MaxTextureImageUnits = 2; ctx->Const.FragmentProgram.MaxUniformComponents = 64; + ctx->Const.FragmentProgram.MaxInputComponents = 32; ctx->Const.MaxDrawBuffers = 1; |