Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(704)

Unified Diff: media-libs/mesa/files/7.9-can_inline.patch

Issue 5925002: Switch to Mesa 7.9. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/chromiumos-overlay.git@master
Patch Set: Switch to Mesa 7.9 version 2. Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media-libs/mesa/files/7.9-can_inline.patch
diff --git a/media-libs/mesa/files/7.9-can_inline.patch b/media-libs/mesa/files/7.9-can_inline.patch
new file mode 100644
index 0000000000000000000000000000000000000000..3d300c836d64b0620a0e7b3f61cf5ef724e1da0c
--- /dev/null
+++ b/media-libs/mesa/files/7.9-can_inline.patch
@@ -0,0 +1,30 @@
+From e8a24c65bc06a2a098c05728df0da1e5ed61b1de Mon Sep 17 00:00:00 2001
+From: Kenneth Graunke <kenneth@whitecape.org>
+Date: Thu, 25 Nov 2010 08:09:43 +0000
+Subject: glsl: Don't inline function prototypes.
+
+Currently, the standalone compiler tries to do function inlining before
+linking shaders (including linking against the built-in functions).
+This resulted in the built-in function _prototypes_ being inlined rather
+than the actual function definition.
+
+This is only known to fix a bug in the standalone compiler; most
+programs should be unaffected. Still, it seems like a good idea.
+
+NOTE: This is a candidate for the 7.9 branch.
+---
+diff --git a/src/glsl/ir_function_can_inline.cpp b/src/glsl/ir_function_can_inline.cpp
+index f29f277..c367c30 100644
+--- a/src/glsl/ir_function_can_inline.cpp
++++ b/src/glsl/ir_function_can_inline.cpp
+@@ -60,6 +60,8 @@ can_inline(ir_call *call)
+ {
+ ir_function_can_inline_visitor v;
+ const ir_function_signature *callee = call->get_callee();
++ if (!callee->is_defined)
++ return false;
+
+ v.run((exec_list *) &callee->body);
+
+--
+cgit v0.8.3-6-g21f6
« no previous file with comments | « media-libs/mesa/files/7.9-add-lower-pass-discards.patch ('k') | media-libs/mesa/files/7.9-conditional-discards.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698