From 3a8aa31d88b171e4735cadfdaf8909b1ae62c719 Mon Sep 17 00:00:00 2001 From: Austin Eng Date: Fri, 17 May 2019 20:42:33 +0000 Subject: [PATCH] Rename .inl to .inc Bug: chromium:964411 Change-Id: Iff1ff8aadccd3e6ce6abefed983f23241dc19edf Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/7341 Commit-Queue: Austin Eng Commit-Queue: Corentin Wallez Reviewed-by: Corentin Wallez --- BUILD.gn | 6 +++--- examples/glTFViewer/{Camera.inl => Camera.inc} | 0 examples/glTFViewer/glTFViewer.cpp | 2 +- generator/main.py | 4 ++-- .../client/{ClientPrototypes.inl => ClientPrototypes.inc} | 0 .../server/{ServerPrototypes.inl => ServerPrototypes.inc} | 0 src/dawn_wire/client/Client.h | 2 +- src/dawn_wire/server/Server.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) rename examples/glTFViewer/{Camera.inl => Camera.inc} (100%) rename generator/templates/dawn_wire/client/{ClientPrototypes.inl => ClientPrototypes.inc} (100%) rename generator/templates/dawn_wire/server/{ServerPrototypes.inl => ServerPrototypes.inc} (100%) diff --git a/BUILD.gn b/BUILD.gn index 36e63015a1..fe7e68a2a9 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -404,11 +404,11 @@ dawn_generator("libdawn_wire_gen") { "dawn_wire/client/ApiProcs_autogen.h", "dawn_wire/client/ClientBase_autogen.h", "dawn_wire/client/ClientHandlers_autogen.cpp", - "dawn_wire/client/ClientPrototypes_autogen.inl", + "dawn_wire/client/ClientPrototypes_autogen.inc", "dawn_wire/server/ServerBase_autogen.h", "dawn_wire/server/ServerDoers_autogen.cpp", "dawn_wire/server/ServerHandlers_autogen.cpp", - "dawn_wire/server/ServerPrototypes_autogen.inl", + "dawn_wire/server/ServerPrototypes_autogen.inc", ] } @@ -764,7 +764,7 @@ if (dawn_standalone) { dawn_sample("glTFViewer") { sources = [ - "examples/glTFViewer/Camera.inl", + "examples/glTFViewer/Camera.inc", "examples/glTFViewer/glTFViewer.cpp", ] deps = [ diff --git a/examples/glTFViewer/Camera.inl b/examples/glTFViewer/Camera.inc similarity index 100% rename from examples/glTFViewer/Camera.inl rename to examples/glTFViewer/Camera.inc diff --git a/examples/glTFViewer/glTFViewer.cpp b/examples/glTFViewer/glTFViewer.cpp index aebf9431bc..5dc6d0900d 100644 --- a/examples/glTFViewer/glTFViewer.cpp +++ b/examples/glTFViewer/glTFViewer.cpp @@ -42,7 +42,7 @@ #include "GLFW/glfw3.h" -#include "Camera.inl" +#include "Camera.inc" namespace gl { enum { diff --git a/generator/main.py b/generator/main.py index 2d63c081e3..d83c10953c 100644 --- a/generator/main.py +++ b/generator/main.py @@ -398,11 +398,11 @@ def get_renders_for_targets(api_params, wire_json, targets): renders.append(FileRender('dawn_wire/client/ApiProcs.h', 'dawn_wire/client/ApiProcs_autogen.h', wire_params)) renders.append(FileRender('dawn_wire/client/ClientBase.h', 'dawn_wire/client/ClientBase_autogen.h', wire_params)) renders.append(FileRender('dawn_wire/client/ClientHandlers.cpp', 'dawn_wire/client/ClientHandlers_autogen.cpp', wire_params)) - renders.append(FileRender('dawn_wire/client/ClientPrototypes.inl', 'dawn_wire/client/ClientPrototypes_autogen.inl', wire_params)) + renders.append(FileRender('dawn_wire/client/ClientPrototypes.inc', 'dawn_wire/client/ClientPrototypes_autogen.inc', wire_params)) renders.append(FileRender('dawn_wire/server/ServerBase.h', 'dawn_wire/server/ServerBase_autogen.h', wire_params)) renders.append(FileRender('dawn_wire/server/ServerDoers.cpp', 'dawn_wire/server/ServerDoers_autogen.cpp', wire_params)) renders.append(FileRender('dawn_wire/server/ServerHandlers.cpp', 'dawn_wire/server/ServerHandlers_autogen.cpp', wire_params)) - renders.append(FileRender('dawn_wire/server/ServerPrototypes.inl', 'dawn_wire/server/ServerPrototypes_autogen.inl', wire_params)) + renders.append(FileRender('dawn_wire/server/ServerPrototypes.inc', 'dawn_wire/server/ServerPrototypes_autogen.inc', wire_params)) return renders diff --git a/generator/templates/dawn_wire/client/ClientPrototypes.inl b/generator/templates/dawn_wire/client/ClientPrototypes.inc similarity index 100% rename from generator/templates/dawn_wire/client/ClientPrototypes.inl rename to generator/templates/dawn_wire/client/ClientPrototypes.inc diff --git a/generator/templates/dawn_wire/server/ServerPrototypes.inl b/generator/templates/dawn_wire/server/ServerPrototypes.inc similarity index 100% rename from generator/templates/dawn_wire/server/ServerPrototypes.inl rename to generator/templates/dawn_wire/server/ServerPrototypes.inc diff --git a/src/dawn_wire/client/Client.h b/src/dawn_wire/client/Client.h index 5fd74ceb31..c7da67b8cd 100644 --- a/src/dawn_wire/client/Client.h +++ b/src/dawn_wire/client/Client.h @@ -43,7 +43,7 @@ namespace dawn_wire { namespace client { } private: -#include "dawn_wire/client/ClientPrototypes_autogen.inl" +#include "dawn_wire/client/ClientPrototypes_autogen.inc" Device* mDevice = nullptr; CommandSerializer* mSerializer = nullptr; diff --git a/src/dawn_wire/server/Server.h b/src/dawn_wire/server/Server.h index 66d652d8eb..28322c3d61 100644 --- a/src/dawn_wire/server/Server.h +++ b/src/dawn_wire/server/Server.h @@ -73,7 +73,7 @@ namespace dawn_wire { namespace server { void OnFenceCompletedValueUpdated(DawnFenceCompletionStatus status, FenceCompletionUserdata* userdata); -#include "dawn_wire/server/ServerPrototypes_autogen.inl" +#include "dawn_wire/server/ServerPrototypes_autogen.inc" CommandSerializer* mSerializer = nullptr; WireDeserializeAllocator mAllocator;