Bug 1404536 - ESSL3 needs texture() not texture2D(). - r=snorp draft
authorJeff Gilbert <jgilbert@mozilla.com>
Thu, 19 Oct 2017 14:35:03 -0700
changeset 687232 20f893eea7c01dae451e6c5f1a348b54fc754799
parent 687231 81d67ce806ba4e96c738b7bbc48f74e5486c944d
child 687233 3e09dac63ef568d29262f39acaac66f502d8b02a
push id86443
push userbmo:jgilbert@mozilla.com
push dateThu, 26 Oct 2017 23:52:47 +0000
reviewerssnorp
bugs1404536
milestone58.0a1
Bug 1404536 - ESSL3 needs texture() not texture2D(). - r=snorp MozReview-Commit-ID: CJxOVbkItJX
gfx/gl/GLBlitHelper.cpp
--- a/gfx/gl/GLBlitHelper.cpp
+++ b/gfx/gl/GLBlitHelper.cpp
@@ -51,17 +51,21 @@ const char* const kFragHeader_Tex2DRect 
         #define TEXTURE texture                                              \n\
     #else                                                                    \n\
         #define TEXTURE texture2DRect                                        \n\
     #endif                                                                   \n\
 ";
 const char* const kFragHeader_TexExt = "\
     #extension GL_OES_EGL_image_external : require                           \n\
     #define SAMPLER samplerExternalOES                                       \n\
-    #define TEXTURE texture2D                                                \n\
+    #if __VERSION__ >= 130                                                   \n\
+        #define TEXTURE texture                                              \n\
+    #else                                                                    \n\
+        #define TEXTURE texture2D                                            \n\
+    #endif                                                                   \n\
 ";
 
 const char* const kFragBody_RGBA = "\
     VARYING vec2 vTexCoord0;                                                 \n\
     uniform SAMPLER uTex0;                                                   \n\
                                                                              \n\
     void main(void)                                                          \n\
     {                                                                        \n\