Neil Roberts
1b3a7ac0ab
gles2-context: Don't split the wrapper snippet into two
...
We don't need to split the wrapper snippet into two separate parts
because it should be ok to declare the flip uniform in the middle of
the shader as long as it is somewhere in the global scope. Therefore
we can just declare it right before the definition for the replacement
main function. This is important because we don't want to put anything
at the top of the application's shader in case it is using a
'#version' directive. In that case moving it to anything other than
the first line would break things.
This patch also adds a marker in a comment around the wrapper snippet
so that we can easily locate the snippet when glGetShaderSource is
called and remove it.
The wrapper for glGetAttachedShaders has been removed because there
are no longer any additional shaders attached to the program so we can
just let GL handle it directly.
Reviewed-by: Robert Bragg <robert@linux.intel.com>
(cherry picked from commit dbd92e24ae61dcbe7ef26f61c9117c5516a7fa87)
2012-09-17 23:06:21 +01:00
..
2012-08-29 15:01:31 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:38 +01:00
2012-09-17 23:06:20 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:45 +01:00
2011-09-09 15:06:31 +01:00
2012-09-17 23:06:20 +01:00
2012-08-06 14:27:45 +01:00
2011-05-06 12:12:08 +01:00
2011-09-09 15:06:31 +01:00
2012-08-06 14:27:39 +01:00
2012-09-17 23:06:20 +01:00
2012-08-06 14:27:44 +01:00
2012-08-06 14:27:39 +01:00
2011-05-16 14:31:31 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:43 +01:00
2012-08-06 14:27:40 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2012-08-15 17:14:25 +01:00
2012-08-06 18:50:22 +01:00
2012-09-17 23:06:20 +01:00
2012-08-06 18:50:22 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:39 +01:00
2012-09-17 23:06:20 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:40 +01:00
2012-08-06 14:27:40 +01:00
2011-12-06 18:51:57 +00:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 18:51:33 +01:00
2012-08-06 18:51:33 +01:00
2012-08-06 18:51:33 +01:00
2012-09-17 23:06:20 +01:00
2012-09-17 23:06:20 +01:00
2012-08-06 14:27:40 +01:00
2012-08-06 18:51:33 +01:00
2012-09-03 15:51:45 +01:00
2012-09-03 15:47:56 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:45 +01:00
2010-03-01 12:56:10 +00:00
2011-05-16 18:45:51 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 18:51:34 +01:00
2012-08-06 18:51:34 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 18:51:32 +01:00
2012-08-06 18:51:32 +01:00
2012-08-06 14:27:39 +01:00
2009-10-16 18:58:50 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:45 +01:00
2011-11-22 16:07:21 +00:00
2012-09-17 23:06:19 +01:00
2012-09-17 23:06:20 +01:00
2012-08-15 17:29:16 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:45 +01:00
2012-09-17 23:06:21 +01:00
2012-09-17 23:06:21 +01:00
2012-08-06 14:27:42 +01:00
2012-08-06 14:27:45 +01:00
2012-09-17 23:06:20 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 18:51:32 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:42 +01:00
2012-09-17 23:06:20 +01:00
2012-08-06 14:27:39 +01:00
2011-05-16 14:31:31 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:45 +01:00
2011-05-16 14:31:31 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:40 +01:00
2012-09-03 15:51:45 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:40 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:40 +01:00
2012-08-06 14:27:43 +01:00
2012-08-06 14:27:43 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:43 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 18:51:32 +01:00
2012-09-17 11:47:04 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2012-02-20 23:16:37 +00:00
2011-06-14 12:14:02 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 18:51:32 +01:00
2011-11-01 12:03:02 +00:00
2012-08-06 14:27:42 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 18:51:32 +01:00
2012-08-06 18:51:32 +01:00
2011-05-16 13:28:17 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:38 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:39 +01:00
2011-07-13 12:30:07 +01:00
2012-08-06 14:27:39 +01:00
2011-07-13 12:30:07 +01:00
2012-08-06 14:27:39 +01:00
2010-12-13 17:22:57 +00:00
2012-08-06 14:27:39 +01:00
2010-12-13 17:22:57 +00:00
2012-08-15 13:46:25 +01:00
2012-08-06 14:27:41 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:40 +01:00
2012-08-06 14:27:42 +01:00
2012-09-03 15:51:45 +01:00
2011-12-06 19:02:06 +00:00
2012-08-06 14:27:40 +01:00
2011-12-06 18:51:57 +00:00
2012-08-06 14:27:40 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:45 +01:00
2010-12-13 17:22:57 +00:00
2012-08-06 14:27:40 +01:00
2010-12-13 17:28:28 +00:00
2012-08-06 14:27:40 +01:00
2012-09-07 11:44:41 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:45 +01:00
2011-03-07 13:26:19 +00:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:45 +01:00
2011-11-01 12:02:59 +00:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:45 +01:00
2012-09-03 15:51:44 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2012-09-03 15:51:45 +01:00
2010-09-14 12:43:17 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2011-05-16 14:11:47 +01:00
2012-08-06 18:51:32 +01:00
2012-08-06 18:51:32 +01:00
2011-07-01 17:52:55 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:45 +01:00
2012-09-03 15:51:45 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:41 +01:00
2012-08-06 14:27:41 +01:00
2012-08-06 18:51:32 +01:00
2012-08-06 14:27:45 +01:00
2012-02-20 23:12:45 +00:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2012-01-27 17:18:32 +00:00
2012-09-17 23:06:20 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 18:51:33 +01:00
2012-01-27 17:18:32 +00:00
2012-09-17 23:06:20 +01:00
2012-08-06 14:27:39 +01:00
2012-09-17 23:06:20 +01:00
2012-08-06 18:51:33 +01:00
2012-08-06 14:27:39 +01:00
2012-09-17 23:06:20 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:44 +01:00
2012-09-17 23:06:20 +01:00
2012-08-06 14:27:39 +01:00
2012-09-17 23:06:20 +01:00
2012-08-06 14:27:39 +01:00
2012-09-17 23:06:20 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:45 +01:00
2012-08-14 18:55:42 +01:00
2012-08-14 18:55:42 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:45 +01:00
2012-09-03 15:48:05 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:45 +01:00
2012-03-20 14:26:44 +00:00
2012-08-06 14:27:45 +01:00
2012-08-06 18:51:34 +01:00
2011-06-30 14:33:13 +01:00
2012-08-06 14:27:45 +01:00
2011-06-30 14:34:33 +01:00
2012-02-20 23:12:45 +00:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:39 +01:00
2012-02-20 23:12:45 +00:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:42 +01:00
2012-08-06 14:27:42 +01:00
2012-08-17 01:20:13 +08:00
2012-09-03 15:51:45 +01:00
2012-08-06 14:27:39 +01:00