Backed out changeset 7d87fa0dc7ed (bug 1265112) for build bustage. r=backout

This commit is contained in:
Sebastian Hengst 2016-04-30 00:52:25 +02:00
parent 81f27811ea
commit 3787fb48fa
3 changed files with 0 additions and 31 deletions

View File

@ -156,7 +156,6 @@ static const char* const sExtensionNames[] = {
"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",
@ -1559,20 +1558,6 @@ GLContext::LoadMoreSymbols(const char* prefix, bool trygl)
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)) {

View File

@ -478,7 +478,6 @@ public:
NV_geometry_program4,
NV_half_float,
NV_instanced_arrays,
NV_texture_barrier,
NV_transform_feedback,
NV_transform_feedback2,
OES_EGL_image,
@ -2880,17 +2879,6 @@ public:
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,

View File

@ -690,10 +690,6 @@ struct GLContextSymbols
// APPLE_framebuffer_multisample
typedef void (GLAPIENTRY * PFNRESOLVEMULTISAMPLEFRAMEBUFFERAPPLE) (void);
PFNRESOLVEMULTISAMPLEFRAMEBUFFERAPPLE fResolveMultisampleFramebufferAPPLE;
// NV_texture_barrier
typedef void (GLAPIENTRY * PFNTEXTUREBARRIERPROC) (void);
PFNTEXTUREBARRIERPROC fTextureBarrier;
};
} // namespace gl