Bug 1510467 - Mark gfx/gl/GLConsts.h as generated in .clang-format-ignore. r=eakhgari
authorJeff Gilbert <jgilbert@mozilla.com>
Tue, 27 Nov 2018 18:04:17 -0800
changeset 448525 97a4811843233628012bd1188b7b66843303eaee
parent 448524 9468e111ca989158c3d48e447756da6a57e184a4
child 448526 69b08ee5925dac595180a813dcf959929198699f
push id110215
push userjgilbert@mozilla.com
push dateWed, 28 Nov 2018 20:43:47 +0000
treeherdermozilla-inbound@97a481184323 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerseakhgari
bugs1510467
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1510467 - Mark gfx/gl/GLConsts.h as generated in .clang-format-ignore. r=eakhgari s/off/on once in GLContext.cpp.
.clang-format-ignore
gfx/gl/GLConsts.h
gfx/gl/GLContext.cpp
gfx/gl/GLParseRegistryXML.py
--- a/.clang-format-ignore
+++ b/.clang-format-ignore
@@ -39,16 +39,17 @@ widget/tests/.*
 xpcom/glue/tests/.*
 xpcom/tests/.*
 
 # Generated by protobuf
 .*/.*.pb.h
 .*/.*.pb.cc
 
 # Autogenerated file
+gfx/gl/GLConsts.h
 media/mp4parse-rust/mp4parse.h
 
 # Generated from ./tools/rewriting/ThirdPartyPaths.txt
 # awk '{print ""$1".*"}' ./tools/rewriting/ThirdPartyPaths.txt
 browser/components/translation/cld2/.*
 browser/extensions/mortar/ppapi/.*
 db/sqlite3/src/.*
 devtools/client/sourceeditor/codemirror/.*
--- a/gfx/gl/GLConsts.h
+++ b/gfx/gl/GLConsts.h
@@ -1,17 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef GLCONSTS_H_
 #define GLCONSTS_H_
 
-// clang-format off
-
 /**
  * GENERATED FILE, DO NOT MODIFY DIRECTLY.
  * This is a file generated directly from the official OpenGL registry
  * xml available http://www.opengl.org/registry/#specfiles.
  *
  * To generate this file, see tutorial in 'GLParseRegistryXML.py'.
  */
 
@@ -6996,11 +6994,9 @@
 #define LOCAL_WGL_VIDEO_OUT_COLOR_NV                         0x20C3
 #define LOCAL_WGL_VIDEO_OUT_DEPTH_NV                         0x20C5
 #define LOCAL_WGL_VIDEO_OUT_FIELD_1                          0x20C9
 #define LOCAL_WGL_VIDEO_OUT_FIELD_2                          0x20CA
 #define LOCAL_WGL_VIDEO_OUT_FRAME                            0x20C8
 #define LOCAL_WGL_VIDEO_OUT_STACKED_FIELDS_1_2               0x20CB
 #define LOCAL_WGL_VIDEO_OUT_STACKED_FIELDS_2_1               0x20CC
 
-// clang-format on
-
 #endif // GLCONSTS_H_
--- a/gfx/gl/GLContext.cpp
+++ b/gfx/gl/GLContext.cpp
@@ -1501,17 +1501,17 @@ GLContext::LoadMoreSymbols(const char* p
             { (PRFuncPtr*) &mSymbols.fFinishFence,  { "FinishFenceNV",  nullptr } },
             { (PRFuncPtr*) &mSymbols.fIsFence,      { "IsFenceNV",      nullptr } },
             { (PRFuncPtr*) &mSymbols.fGetFenceiv,   { "GetFenceivNV",   nullptr } },
             END_SYMBOLS
         };
         fnLoadForExt(symbols, NV_fence);
     }
 
-// clang-format off
+// clang-format on
 
     if (IsExtensionSupported(NV_texture_barrier)) {
         const SymLoadStruct symbols[] = {
             { (PRFuncPtr*) &mSymbols.fTextureBarrier, { "TextureBarrierNV", nullptr } },
             END_SYMBOLS
         };
         fnLoadForExt(symbols, NV_texture_barrier);
     }
--- a/gfx/gl/GLParseRegistryXML.py
+++ b/gfx/gl/GLParseRegistryXML.py
@@ -50,18 +50,16 @@ class GLConstHeader:
         self.write([
             '/* This Source Code Form is subject to the terms of the Mozilla Public',
             ' * License, v. 2.0. If a copy of the MPL was not distributed with this',
             ' * file, You can obtain one at http://mozilla.org/MPL/2.0/. */',
             '',
             '#ifndef GLCONSTS_H_',
             '#define GLCONSTS_H_',
             '',
-            '// clang-format off',
-            '',
             '/**',
             ' * GENERATED FILE, DO NOT MODIFY DIRECTLY.',
             ' * This is a file generated directly from the official OpenGL registry',
             ' * xml available http://www.opengl.org/registry/#specfiles.',
             ' *',
             ' * To generate this file, see tutorial in \'GLParseRegistryXML.py\'.',
             ' */',
             ''
@@ -86,18 +84,16 @@ class GLConstHeader:
 
     def formatLibEnd(self, lib):
         # lib would be 'GL', 'EGL', 'GLX' or 'WGL'
         self.write(2)
 
     def formatFileEnd(self):
         self.write([
             '',
-            '// clang-format on',
-            '',
             '#endif // GLCONSTS_H_'
         ])
 
 
 ################################################################################
 # underground code
 
 def getScriptDir():