Remove src/Device/Config.cpp Holds sw::Profiler that is entirely dead code. There's little here that looks worthy of keeping. Let's remove it. Bug: b/153462569 Change-Id: I4330781e8ba362461f164f0a52f764d4fe8f4dc4 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/43574 Reviewed-by: Nicolas Capens <nicolascapens@google.com> Kokoro-Result: kokoro <noreply+kokoro@google.com> Tested-by: Ben Clayton <bclayton@google.com>
diff --git a/src/Device/BUILD.gn b/src/Device/BUILD.gn index a6814b1..bee1966 100644 --- a/src/Device/BUILD.gn +++ b/src/Device/BUILD.gn
@@ -40,7 +40,6 @@ "BC_Decoder.cpp", "Blitter.cpp", "Clipper.cpp", - "Config.cpp", "Context.cpp", "ETC_Decoder.cpp", "PixelProcessor.cpp",
diff --git a/src/Device/Config.cpp b/src/Device/Config.cpp deleted file mode 100644 index 5a2de75..0000000 --- a/src/Device/Config.cpp +++ /dev/null
@@ -1,53 +0,0 @@ -// Copyright 2016 The SwiftShader Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "Config.hpp" - -#include "System/Timer.hpp" - -namespace sw { - -Profiler profiler; - -Profiler::Profiler() -{ - reset(); -} - -void Profiler::reset() -{ - framesSec = 0; - framesTotal = 0; - FPS = 0; -} - -void Profiler::nextFrame() -{ - static double fpsTime = sw::Timer::seconds(); - - double time = sw::Timer::seconds(); - double delta = time - fpsTime; - framesSec++; - - if(delta > 1.0) - { - FPS = framesSec / delta; - - fpsTime = time; - framesTotal += framesSec; - framesSec = 0; - } -} - -} // namespace sw \ No newline at end of file
diff --git a/src/Device/Config.hpp b/src/Device/Config.hpp index 1e4947f..2d232b1 100644 --- a/src/Device/Config.hpp +++ b/src/Device/Config.hpp
@@ -15,38 +15,10 @@ #ifndef sw_Config_hpp #define sw_Config_hpp -#include "System/Types.hpp" - namespace sw { enum { - PERF_PIXEL, - PERF_PIPE, - PERF_INTERP, - PERF_SHADER, - PERF_TEX, - PERF_ROP, - - PERF_TIMERS -}; - -struct Profiler -{ - Profiler(); - - void reset(); - void nextFrame(); - - int framesSec; - int framesTotal; - double FPS; -}; - -extern Profiler profiler; - -enum -{ OUTLINE_RESOLUTION = 8192, // Maximum vertical resolution of the render target MIPMAP_LEVELS = 14, MAX_UNIFORM_BLOCK_SIZE = 16384,