Neil Roberts
2ae352b0a6
Fix point sprite coordinates in shaders on GLES2
...
When using the GLES2 driver with a pipeline layer that has point
sprite coordinates enabled it extracts the texture coordinates from
the gl_PointCoord builtin instead of cogl_tex_coord_in[*].
gl_PointCoord is not quite the same as the regular texture coordinates
because it is only a vec2 instead of a vec4. This used to work ok
because either set of texture coordinates would always immediately be
accessed using a swizzle of '.st' so it would effectively be converted
to a vec2 anyway. However since the snippet hook for texture lookups
was added the texture coordinates are now passed to a function to
perform the actual lookup instead. This function always takes a vec4
so the shader would not compile. This patch fixes it to construct a
vec4 from gl_PointCoord by setting the third and fourth components to
0.0 and 1.0.
Reviewed-by: Robert Bragg <robert@linux.intel.com>
(cherry picked from commit cb3409b23caf324a548f82cfb88acc684cc71930)
2012-08-06 18:51:31 +01:00
..
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:38 +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
2011-09-09 15:06:31 +01:00
2012-08-06 14:27:39 +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-08-06 14:27:39 +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-06 18:50:22 +01:00
2012-08-06 18:50:22 +01:00
2012-08-06 18:50:22 +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-08-06 14:27:41 +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
2011-08-12 15:28:42 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:42 +01:00
2012-08-06 14:27:42 +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
2012-08-06 14:27:43 +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
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 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
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-08-06 14:27:42 +01:00
2012-08-06 18:51:31 +01:00
2012-08-06 14:27:43 +01:00
2012-08-06 14:27:45 +01: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-06 14:27:42 +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:42 +01:00
2012-08-06 14:27:42 +01:00
2012-08-06 14:27:39 +01:00
2010-06-04 14:44:15 +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-08-06 14:27:40 +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 14:27:41 +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: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 14:27:39 +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 14:27:39 +01:00
2012-08-06 14:27:45 +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-06 18:51:31 +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-08-06 14:27:40 +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-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-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-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:39 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +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 14:27:39 +01:00
2012-08-06 14:27:45 +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-08-06 14:27: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 14:27:44 +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-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-01-27 17:18:32 +00:00
2012-08-06 14:27:44 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27: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:45 +01:00
2012-08-06 14:27:44 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 14:27:44 +01:00
2012-08-06 14:27:39 +01:00
2012-08-06 18:50:22 +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:43 +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: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-03-20 14:26:44 +00: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-06 14:27:42 +01:00
2012-08-06 14:27:45 +01:00
2012-08-06 14:27:39 +01:00