Backed out changeset 7d87fa0dc7ed (bug 1265112) for build bustage. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sat, 30 Apr 2016 00:52:25 +0200
changeset 295584 99d3b89fb9552b518906f7753e1d0ed42233c83d
parent 295583 1f97dbd1e199c8dc8b6ea350ae96f4b2cea416fb
child 295585 03af61c547ddad9a95f9dfd2bdbc5ce867badf35
push id19015
push usercbook@mozilla.com
push dateMon, 02 May 2016 09:39:23 +0000
treeherderfx-team@2080375bc69d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1265112
milestone49.0a1
backs out7d87fa0dc7edf93fb51253f287fb6709a029fb6d
Backed out changeset 7d87fa0dc7ed (bug 1265112) for build bustage. r=backout
gfx/gl/GLContext.cpp
gfx/gl/GLContext.h
gfx/gl/GLContextSymbols.h
--- a/gfx/gl/GLContext.cpp
+++ b/gfx/gl/GLContext.cpp
@@ -151,17 +151,16 @@ static const char* const sExtensionNames
     "GL_IMG_texture_npot",
     "GL_KHR_debug",
     "GL_NV_draw_instanced",
     "GL_NV_fence",
     "GL_NV_framebuffer_blit",
     "GL_NV_geometry_program4",
     "GL_NV_half_float",
     "GL_NV_instanced_arrays",
-    "GL_NV_texture_barrier",
     "GL_NV_transform_feedback",
     "GL_NV_transform_feedback2",
     "GL_OES_EGL_image",
     "GL_OES_EGL_image_external",
     "GL_OES_EGL_sync",
     "GL_OES_compressed_ETC1_RGB8_texture",
     "GL_OES_depth24",
     "GL_OES_depth32",
@@ -1554,30 +1553,16 @@ GLContext::LoadMoreSymbols(const char* p
             { (PRFuncPtr*) &mSymbols.fSetFence,     { "SetFenceNV",     nullptr } },
             { (PRFuncPtr*) &mSymbols.fTestFence,    { "TestFenceNV",    nullptr } },
             { (PRFuncPtr*) &mSymbols.fFinishFence,  { "FinishFenceNV",  nullptr } },
             { (PRFuncPtr*) &mSymbols.fIsFence,      { "IsFenceNV",      nullptr } },
             { (PRFuncPtr*) &mSymbols.fGetFenceiv,   { "GetFenceivNV",   nullptr } },
             END_SYMBOLS
         };
         fnLoadForExt(symbols, NV_fence);
-                ClearSymbols(extSymbols);
-            }
-        }
-
-        if (IsExtensionSupported(NV_texture_barrier)) {
-            SymLoadStruct extSymbols[] = {
-                { (PRFuncPtr*) &mSymbols.fTextureBarrier, { "TextureBarrierNV", nullptr } },
-                END_SYMBOLS
-            };
-
-            if (!LoadSymbols(&extSymbols[0], trygl, prefix)) {
-                NS_ERROR("GL supports NV_texture_barrier without supplying its functions.");
-
-                MarkExtensionUnsupported(NV_texture_barrier);
     }
 
     if (IsSupported(GLFeature::read_buffer)) {
         const SymLoadStruct symbols[] = {
             { (PRFuncPtr*) &mSymbols.fReadBuffer, { "ReadBuffer", nullptr } },
             END_SYMBOLS
         };
         fnLoadForFeature(symbols, GLFeature::read_buffer);
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -473,17 +473,16 @@ public:
         IMG_texture_npot,
         KHR_debug,
         NV_draw_instanced,
         NV_fence,
         NV_framebuffer_blit,
         NV_geometry_program4,
         NV_half_float,
         NV_instanced_arrays,
-        NV_texture_barrier,
         NV_transform_feedback,
         NV_transform_feedback2,
         OES_EGL_image,
         OES_EGL_image_external,
         OES_EGL_sync,
         OES_compressed_ETC1_RGB8_texture,
         OES_depth24,
         OES_depth32,
@@ -2875,27 +2874,16 @@ public:
     void fGetFenceiv(GLuint fence, GLenum pname, GLint* params)
     {
         ASSERT_SYMBOL_PRESENT(fGetFenceiv);
         BEFORE_GL_CALL;
         mSymbols.fGetFenceiv(fence, pname, params);
         AFTER_GL_CALL;
     }
 
-// -----------------------------------------------------------------------------
-// Extension NV_texture_barrier
-public:
-    void fTextureBarrier()
-    {
-        ASSERT_SYMBOL_PRESENT(fTextureBarrier);
-        BEFORE_GL_CALL;
-        mSymbols.fTextureBarrier();
-        AFTER_GL_CALL;
-    }
-
 // Core GL & Extension ARB_copy_buffer
 public:
     void fCopyBufferSubData(GLenum readtarget, GLenum writetarget,
                             GLintptr readoffset, GLintptr writeoffset,
                             GLsizeiptr size)
     {
         BEFORE_GL_CALL;
         ASSERT_SYMBOL_PRESENT(fCopyBufferSubData);
--- a/gfx/gl/GLContextSymbols.h
+++ b/gfx/gl/GLContextSymbols.h
@@ -685,18 +685,14 @@ struct GLContextSymbols
 
     // get_string_indexed
     typedef const GLubyte* (GLAPIENTRY * PFNGLGETSTRINGIPROC)(GLenum name, GLuint index);
     PFNGLGETSTRINGIPROC fGetStringi;
 
     // APPLE_framebuffer_multisample
     typedef void (GLAPIENTRY * PFNRESOLVEMULTISAMPLEFRAMEBUFFERAPPLE) (void);
     PFNRESOLVEMULTISAMPLEFRAMEBUFFERAPPLE fResolveMultisampleFramebufferAPPLE;
-
-    // NV_texture_barrier
-    typedef void (GLAPIENTRY * PFNTEXTUREBARRIERPROC) (void);
-    PFNTEXTUREBARRIERPROC fTextureBarrier;
 };
 
 } // namespace gl
 } // namespace mozilla
 
 #endif /* GLCONTEXTSYMBOLS_H_ */