diff options
| author | spycrab <spycrab@users.noreply.github.com> | 2018-04-12 14:18:04 +0200 |
|---|---|---|
| committer | spycrab <spycrab@users.noreply.github.com> | 2018-04-12 21:28:39 +0200 |
| commit | 40bb9974f21878e64fb03d70e717cb996bf13a29 (patch) | |
| tree | 1d8a9e7eea10820e5d645ad5028e506836b856de /Source/Core | |
| parent | d27e85e9d70dfb41a5b8880fd3375a0ac9574f5d (diff) | |
Reformat all the things!
Diffstat (limited to 'Source/Core')
178 files changed, 1888 insertions, 991 deletions
diff --git a/Source/Core/AudioCommon/AlsaSoundStream.cpp b/Source/Core/AudioCommon/AlsaSoundStream.cpp index fad5dde8b0..3d20331abd 100644 --- a/Source/Core/AudioCommon/AlsaSoundStream.cpp +++ b/Source/Core/AudioCommon/AlsaSoundStream.cpp @@ -186,8 +186,9 @@ bool AlsaSound::AlsaInit() // it is probably a bad idea to try to send more than one buffer of data if ((unsigned int)frames_to_deliver > buffer_size) frames_to_deliver = buffer_size; - NOTICE_LOG(AUDIO, "ALSA gave us a %ld sample \"hardware\" buffer with %d periods. Will send %d " - "samples per fragments.", + NOTICE_LOG(AUDIO, + "ALSA gave us a %ld sample \"hardware\" buffer with %d periods. Will send %d " + "samples per fragments.", buffer_size, periods, frames_to_deliver); snd_pcm_sw_params_alloca(&swparams); diff --git a/Source/Core/AudioCommon/AlsaSoundStream.h b/Source/Core/AudioCommon/AlsaSoundStream.h index 7bb71531ef..8cfde375d3 100644 --- a/Source/Core/AudioCommon/AlsaSoundStream.h +++ b/Source/Core/AudioCommon/AlsaSoundStream.h @@ -29,6 +29,7 @@ public: bool SetRunning(bool running) override; static bool isValid() { return true; } + private: // maximum number of frames the buffer can hold static constexpr size_t BUFFER_SIZE_MAX = 8192; diff --git a/Source/Core/AudioCommon/Mixer.h b/Source/Core/AudioCommon/Mixer.h index 7359ab85e8..e2545d6be1 100644 --- a/Source/Core/AudioCommon/Mixer.h +++ b/Source/Core/AudioCommon/Mixer.h @@ -44,6 +44,7 @@ public: float GetCurrentSpeed() const { return m_speed.load(); } void UpdateSpeed(float val) { m_speed.store(val); } + private: static constexpr u32 MAX_SAMPLES = 1024 * 4; // 128 ms static constexpr u32 INDEX_MASK = MAX_SAMPLES * 2 - 1; diff --git a/Source/Core/AudioCommon/OpenSLESStream.h b/Source/Core/AudioCommon/OpenSLESStream.h index fb300d1614..237501c54c 100644 --- a/Source/Core/AudioCommon/OpenSLESStream.h +++ b/Source/Core/AudioCommon/OpenSLESStream.h @@ -17,6 +17,7 @@ public: bool Init() override; bool SetRunning(bool running) override { return running; } static bool isValid() { return true; } + private: std::thread thread; Common::Event soundSyncEvent; diff --git a/Source/Core/AudioCommon/WaveFile.h b/Source/Core/AudioCommon/WaveFile.h index 45d074ace3..bd34046878 100644 --- a/Source/Core/AudioCommon/WaveFile.h +++ b/Source/Core/AudioCommon/WaveFile.h @@ -37,6 +37,7 @@ public: void SetSkipSilence(bool skip) { skip_silence = skip; } void AddStereoSamplesBE(const short* sample_data, u32 count, int sample_rate); // big endian u32 GetAudioSize() const { return audio_size; } + private: static constexpr size_t BUFFER_SIZE = 32 * 1024; diff --git a/Source/Core/Common/Analytics.h b/Source/Core/Common/Analytics.h index f4269d0c67..6015d1d6f3 100644 --- a/Source/Core/Common/Analytics.h +++ b/Source/Core/Common/Analytics.h @@ -148,6 +148,7 @@ public: // For convenience. void Send(AnalyticsReportBuilder& report) { Send(std::move(report)); } + protected: void ThreadProc(); diff --git a/Source/Core/Common/Arm64Emitter.cpp b/Source/Core/Common/Arm64Emitter.cpp index 2ff15df5c6..ff8009c587 100644 --- a/Source/Core/Common/Arm64Emitter.cpp +++ b/Source/Core/Common/Arm64Emitter.cpp @@ -201,8 +201,12 @@ bool IsImmLogical(uint64_t value, unsigned int width, unsigned int* n, unsigned // (1 + 2^d + 2^(2d) + ...), i.e. 0x0001000100010001 or similar. These can // be derived using a table lookup on CLZ(d). static const std::array<uint64_t, 6> multipliers = {{ - 0x0000000000000001UL, 0x0000000100000001UL, 0x0001000100010001UL, 0x0101010101010101UL, - 0x1111111111111111UL, 0x5555555555555555UL, + 0x0000000000000001UL, + 0x0000000100000001UL, + 0x0001000100010001UL, + 0x0101010101010101UL, + 0x1111111111111111UL, + 0x5555555555555555UL, }}; int multiplier_idx = CountLeadingZeros(d, kXRegSizeInBits) - 57; diff --git a/Source/Core/Common/BitField.h b/Source/Core/Common/BitField.h index 6866282298..108921bdf0 100644 --- a/Source/Core/Common/BitField.h +++ b/Source/Core/Common/BitField.h @@ -147,6 +147,7 @@ public: constexpr operator T() const { return Value(); } constexpr std::size_t StartBit() const { return position; } constexpr std::size_t NumBits() const { return bits; } + private: // StorageType is T for non-enum types and the underlying type of T if // T is an enumeration. Note that T is wrapped within an enable_if in the diff --git a/Source/Core/Common/BitSet.h b/Source/Core/Common/BitSet.h index e43ecf9bc7..f8506e7c89 100644 --- a/Source/Core/Common/BitSet.h +++ b/Source/Core/Common/BitSet.h @@ -164,6 +164,7 @@ public: constexpr int operator*() const { return m_bit; } constexpr bool operator==(Iterator other) const { return m_bit == other.m_bit; } constexpr bool operator!=(Iterator other) const { return m_bit != other.m_bit; } + private: IntTy m_val; int m_bit; diff --git a/Source/Core/Common/BlockingLoop.h b/Source/Core/Common/BlockingLoop.h index 269297367c..7f6c42ca70 100644 --- a/Source/Core/Common/BlockingLoop.h +++ b/Source/Core/Common/BlockingLoop.h @@ -230,6 +230,7 @@ public: // This function should be triggered regularly over time so // that we will fall back from the busy loop to sleeping. void AllowSleep() { m_may_sleep.Set(); } + private: std::mutex m_wait_lock; std::mutex m_prepare_lock; diff --git a/Source/Core/Common/CommonFuncs.cpp b/Source/Core/Common/CommonFuncs.cpp index 86b9c93e40..7b109e81c5 100644 --- a/Source/Core/Common/CommonFuncs.cpp +++ b/Source/Core/Common/CommonFuncs.cpp @@ -22,12 +22,12 @@ std::string LastStrerrorString() { char error_message[BUFFER_SIZE]; -// There are two variants of strerror_r. The XSI version stores the message to the passed-in -// buffer and returns an int (0 on success). The GNU version returns a pointer to the message, -// which might have been stored in the passed-in buffer or might be a static string. + // There are two variants of strerror_r. The XSI version stores the message to the passed-in + // buffer and returns an int (0 on success). The GNU version returns a pointer to the message, + // which might have been stored in the passed-in buffer or might be a static string. -// We check defines in order to figure out variant is in use, and we store the returned value -// to a variable so that we'll get a compile-time check that our assumption was correct. + // We check defines in order to figure out variant is in use, and we store the returned value + // to a variable so that we'll get a compile-time check that our assumption was correct. #if defined(__GLIBC__) && (_GNU_SOURCE || (_POSIX_C_SOURCE < 200112L && _XOPEN_SOURCE < 600)) const char* str = strerror_r(errno, error_message, BUFFER_SIZE); diff --git a/Source/Core/Common/CompatPatches.cpp b/Source/Core/Common/CompatPatches.cpp index f835ac2279..b2bc839be3 100644 --- a/Source/Core/Common/CompatPatches.cpp +++ b/Source/Core/Common/CompatPatches.cpp @@ -203,8 +203,7 @@ static bool GetModuleVersion(const wchar_t* name, Version* version) void CompatPatchesInstall(LdrWatcher* watcher) { - watcher->Install({{L"EZFRD64.dll", L"811EZFRD64.DLL"}, - [](const LdrDllLoadEvent& event) { + watcher->Install({{L"EZFRD64.dll", L"811EZFRD64.DLL"}, [](const LdrDllLoadEvent& event) { // *EZFRD64 is incldued in software packages for cheapo third-party gamepads // (and gamepad adapters). The module cannot handle its heap being above 4GB, // which tends to happen very often on modern Windows. @@ -214,8 +213,7 @@ void CompatPatchesInstall(LdrWatcher* watcher) auto patcher = ImportPatcher(event.base_address); patcher.PatchIAT("kernel32.dll", "HeapCreate", HeapCreateLow4GB); }}); - watcher->Install({{L"ucrtbase.dll"}, - [](const LdrDllLoadEvent& event) { + watcher->Install({{L"ucrtbase.dll"}, [](const LdrDllLoadEvent& event) { // ucrtbase implements caching between fseek/fread, old versions have a bug // such that some reads return incorrect data. This causes noticable bugs // in dolphin since we use these APIs for reading game images. diff --git a/Source/Core/Common/Config/Enums.h b/Source/Core/Common/Config/Enums.h index a5b62f812d..f35653ddff 100644 --- a/Source/Core/Common/Config/Enums.h +++ b/Source/Core/Common/Config/Enums.h @@ -34,7 +34,12 @@ enum class System }; constexpr std::array<LayerType, 7> SEARCH_ORDER{{ - LayerType::CurrentRun, LayerType::CommandLine, LayerType::Movie, LayerType::Netplay, - LayerType::LocalGame, LayerType::GlobalGame, LayerType::Base, + LayerType::CurrentRun, + LayerType::CommandLine, + LayerType::Movie, + LayerType::Netplay, + LayerType::LocalGame, + LayerType::GlobalGame, + LayerType::Base, }}; } diff --git a/Source/Core/Common/Config/Layer.h b/Source/Core/Common/Config/Layer.h index 8e56ae308a..c8373c5bce 100644 --- a/Source/Core/Common/Config/Layer.h +++ b/Source/Core/Common/Config/Layer.h @@ -69,6 +69,7 @@ public: Section(iterator begin_, iterator end_) : m_begin(begin_), m_end(end_) {} iterator begin() const { return m_begin; } iterator end() const { return m_end; } + private: iterator m_begin; iterator m_end; @@ -81,6 +82,7 @@ public: ConstSection(iterator begin_, iterator end_) : m_begin(begin_), m_end(end_) {} iterator begin() const { return m_begin; } iterator end() const { return m_end; } + private: iterator m_begin; iterator m_end; diff --git a/Source/Core/Common/DebugInterface.h b/Source/Core/Common/DebugInterface.h index d4459f0272..9b66f30a8e 100644 --- a/Source/Core/Common/DebugInterface.h +++ b/Source/Core/Common/DebugInterface.h @@ -12,6 +12,7 @@ class DebugInterface { protected: virtual ~DebugInterface() {} + public: virtual std::string Disassemble(unsigned int /*address*/) { return "NODEBUGGER"; } virtual std::string GetRawMemoryString(int /*memory*/, unsigned int /*address*/) diff --git a/Source/Core/Common/FixedSizeQueue.h b/Source/Core/Common/FixedSizeQueue.h index b8fb345fb1..267b3d8c4b 100644 --- a/Source/Core/Common/FixedSizeQueue.h +++ b/Source/Core/Common/FixedSizeQueue.h @@ -51,6 +51,7 @@ public: T& front() { return storage[head]; } const T& front() const { return storage[head]; } size_t size() const { return count; } + private: std::array<T, N> storage; int head = 0; diff --git a/Source/Core/Common/Flag.h b/Source/Core/Common/Flag.h index 31573aaced..44dc25a4cd 100644 --- a/Source/Core/Common/Flag.h +++ b/Source/Core/Common/Flag.h @@ -38,6 +38,7 @@ public: } bool TestAndClear() { return TestAndSet(false); } + private: std::atomic_bool m_val; }; diff --git a/Source/Core/Common/GL/GLExtensions/GLExtensions.cpp b/Source/Core/Common/GL/GLExtensions/GLExtensions.cpp index f326e46365..9252a7bed3 100644 --- a/Source/Core/Common/GL/GLExtensions/GLExtensions.cpp +++ b/Source/Core/Common/GL/GLExtensions/GLExtensions.cpp @@ -1041,301 +1041,566 @@ struct GLFunc const GLFunc gl_function_array[] = { // gl_1_1 - GLFUNC_ALWAYS_REQUIRED(glClearIndex), GLFUNC_ALWAYS_REQUIRED(glIndexMask), - GLFUNC_ALWAYS_REQUIRED(glAlphaFunc), GLFUNC_ALWAYS_REQUIRED(glLogicOp), - GLFUNC_ALWAYS_REQUIRED(glPointSize), GLFUNC_ALWAYS_REQUIRED(glLineStipple), - GLFUNC_ALWAYS_REQUIRED(glPolygonMode), GLFUNC_ALWAYS_REQUIRED(glPolygonStipple), - GLFUNC_ALWAYS_REQUIRED(glGetPolygonStipple), GLFUNC_ALWAYS_REQUIRED(glEdgeFlag), - GLFUNC_ALWAYS_REQUIRED(glEdgeFlagv), GLFUNC_ALWAYS_REQUIRED(glClipPlane), - GLFUNC_ALWAYS_REQUIRED(glGetClipPlane), GLFUNC_ALWAYS_REQUIRED(glDrawBuffer), - GLFUNC_ALWAYS_REQUIRED(glEnableClientState), GLFUNC_ALWAYS_REQUIRED(glDisableClientState), - GLFUNC_ALWAYS_REQUIRED(glGetDoublev), GLFUNC_ALWAYS_REQUIRED(glPushAttrib), - GLFUNC_ALWAYS_REQUIRED(glPopAttrib), GLFUNC_ALWAYS_REQUIRED(glPushClientAttrib), - GLFUNC_ALWAYS_REQUIRED(glPopClientAttrib), GLFUNC_ALWAYS_REQUIRED(glRenderMode), - GLFUNC_ALWAYS_REQUIRED(glClearDepth), GLFUNC_ALWAYS_REQUIRED(glDepthRange), - GLFUNC_ALWAYS_REQUIRED(glClearAccum), GLFUNC_ALWAYS_REQUIRED(glAccum), - GLFUNC_ALWAYS_REQUIRED(glMatrixMode), GLFUNC_ALWAYS_REQUIRED(glOrtho), - GLFUNC_ALWAYS_REQUIRED(glFrustum), GLFUNC_ALWAYS_REQUIRED(glPushMatrix), - GLFUNC_ALWAYS_REQUIRED(glPopMatrix), GLFUNC_ALWAYS_REQUIRED(glLoadIdentity), - GLFUNC_ALWAYS_REQUIRED(glLoadMatrixd), GLFUNC_ALWAYS_REQUIRED(glLoadMatrixf), - GLFUNC_ALWAYS_REQUIRED(glMultMatrixd), GLFUNC_ALWAYS_REQUIRED(glMultMatrixf), - GLFUNC_ALWAYS_REQUIRED(glRotated), GLFUNC_ALWAYS_REQUIRED(glRotatef), - GLFUNC_ALWAYS_REQUIRED(glScaled), GLFUNC_ALWAYS_REQUIRED(glScalef), - GLFUNC_ALWAYS_REQUIRED(glTranslated), GLFUNC_ALWAYS_REQUIRED(glTranslatef), - GLFUNC_ALWAYS_REQUIRED(glIsList), GLFUNC_ALWAYS_REQUIRED(glDeleteLists), - GLFUNC_ALWAYS_REQUIRED(glGenLists), GLFUNC_ALWAYS_REQUIRED(glNewList), - GLFUNC_ALWAYS_REQUIRED(glEndList), GLFUNC_ALWAYS_REQUIRED(glCallList), - GLFUNC_ALWAYS_REQUIRED(glCallLists), GLFUNC_ALWAYS_REQUIRED(glListBase), - GLFUNC_ALWAYS_REQUIRED(glBegin), GLFUNC_ALWAYS_REQUIRED(glEnd), - GLFUNC_ALWAYS_REQUIRED(glVertex2d), GLFUNC_ALWAYS_REQUIRED(glVertex2f), - GLFUNC_ALWAYS_REQUIRED(glVertex2i), GLFUNC_ALWAYS_REQUIRED(glVertex2s), - GLFUNC_ALWAYS_REQUIRED(glVertex3d), GLFUNC_ALWAYS_REQUIRED(glVertex3f), - GLFUNC_ALWAYS_REQUIRED(glVertex3i), GLFUNC_ALWAYS_REQUIRED(glVertex3s), - GLFUNC_ALWAYS_REQUIRED(glVertex4d), GLFUNC_ALWAYS_REQUIRED(glVertex4f), - GLFUNC_ALWAYS_REQUIRED(glVertex4i), GLFUNC_ALWAYS_REQUIRED(glVertex4s), - GLFUNC_ALWAYS_REQUIRED(glVertex2dv), GLFUNC_ALWAYS_REQUIRED(glVertex2fv), - GLFUNC_ALWAYS_REQUIRED(glVertex2iv), GLFUNC_ALWAYS_REQUIRED(glVertex2sv), - GLFUNC_ALWAYS_REQUIRED(glVertex3dv), GLFUNC_ALWAYS_REQUIRED(glVertex3fv), - GLFUNC_ALWAYS_REQUIRED(glVertex3iv), GLFUNC_ALWAYS_REQUIRED(glVertex3sv), - GLFUNC_ALWAYS_REQUIRED(glVertex4dv), GLFUNC_ALWAYS_REQUIRED(glVertex4fv), - GLFUNC_ALWAYS_REQUIRED(glVertex4iv), GLFUNC_ALWAYS_REQUIRED(glVertex4sv), - GLFUNC_ALWAYS_REQUIRED(glNormal3b), GLFUNC_ALWAYS_REQUIRED(glNormal3d), - GLFUNC_ALWAYS_REQUIRED(glNormal3f), GLFUNC_ALWAYS_REQUIRED(glNormal3i), - GLFUNC_ALWAYS_REQUIRED(glNormal3s), GLFUNC_ALWAYS_REQUIRED(glNormal3bv), - GLFUNC_ALWAYS_REQUIRED(glNormal3dv), GLFUNC_ALWAYS_REQUIRED(glNormal3fv), - GLFUNC_ALWAYS_REQUIRED(glNormal3iv), GLFUNC_ALWAYS_REQUIRED(glNormal3sv), - GLFUNC_ALWAYS_REQUIRED(glIndexd), GLFUNC_ALWAYS_REQUIRED(glIndexf), - GLFUNC_ALWAYS_REQUIRED(glIndexi), GLFUNC_ALWAYS_REQUIRED(glIndexs), - GLFUNC_ALWAYS_REQUIRED(glIndexub), GLFUNC_ALWAYS_REQUIRED(glIndexdv), - GLFUNC_ALWAYS_REQUIRED(glIndexfv), GLFUNC_ALWAYS_REQUIRED(glIndexiv), - GLFUNC_ALWAYS_REQUIRED(glIndexsv), GLFUNC_ALWAYS_REQUIRED(glIndexubv), - GLFUNC_ALWAYS_REQUIRED(glColor3b), GLFUNC_ALWAYS_REQUIRED(glColor3d), - GLFUNC_ALWAYS_REQUIRED(glColor3f), GLFUNC_ALWAYS_REQUIRED(glColor3i), - GLFUNC_ALWAYS_REQUIRED(glColor3s), GLFUNC_ALWAYS_REQUIRED(glColor3ub), - GLFUNC_ALWAYS_REQUIRED(glColor3ui), GLFUNC_ALWAYS_REQUIRED(glColor3us), - GLFUNC_ALWAYS_REQUIRED(glColor4b), GLFUNC_ALWAYS_REQUIRED(glColor4d), - GLFUNC_ALWAYS_REQUIRED(glColor4f), GLFUNC_ALWAYS_REQUIRED(glColor4i), - GLFUNC_ALWAYS_REQUIRED(glColor4s), GLFUNC_ALWAYS_REQUIRED(glColor4ub), - GLFUNC_ALWAYS_REQUIRED(glColor4ui), GLFUNC_ALWAYS_REQUIRED(glColor4us), - GLFUNC_ALWAYS_REQUIRED(glColor3bv), GLFUNC_ALWAYS_REQUIRED(glColor3dv), - GLFUNC_ALWAYS_REQUIRED(glColor3fv), GLFUNC_ALWAYS_REQUIRED(glColor3iv), - GLFUNC_ALWAYS_REQUIRED(glColor3sv), GLFUNC_ALWAYS_REQUIRED(glColor3ubv), - GLFUNC_ALWAYS_REQUIRED(glColor3uiv), GLFUNC_ALWAYS_REQUIRED(glColor3usv), - GLFUNC_ALWAYS_REQUIRED(glColor4bv), GLFUNC_ALWAYS_REQUIRED(glColor4dv), - GLFUNC_ALWAYS_REQUIRED(glColor4fv), GLFUNC_ALWAYS_REQUIRED(glColor4iv), - GLFUNC_ALWAYS_REQUIRED(glColor4sv), GLFUNC_ALWAYS_REQUIRED(glColor4ubv), - GLFUNC_ALWAYS_REQUIRED(glColor4uiv), GLFUNC_ALWAYS_REQUIRED(glColor4usv), - GLFUNC_ALWAYS_REQUIRED(glTexCoord1d), GLFUNC_ALWAYS_REQUIRED(glTexCoord1f), - GLFUNC_ALWAYS_REQUIRED(glTexCoord1i), GLFUNC_ALWAYS_REQUIRED(glTexCoord1s), - GLFUNC_ALWAYS_REQUIRED(glTexCoord2d), GLFUNC_ALWAYS_REQUIRED(glTexCoord2f), - GLFUNC_ALWAYS_REQUIRED(glTexCoord2i), GLFUNC_ALWAYS_REQUIRED(glTexCoord2s), - GLFUNC_ALWAYS_REQUIRED(glTexCoord3d), GLFUNC_ALWAYS_REQUIRED(glTexCoord3f), - GLFUNC_ALWAYS_REQUIRED(glTexCoord3i), GLFUNC_ALWAYS_REQUIRED(glTexCoord3s), - GLFUNC_ALWAYS_REQUIRED(glTexCoord4d), GLFUNC_ALWAYS_REQUIRED(glTexCoord4f), - GLFUNC_ALWAYS_REQUIRED(glTexCoord4i), GLFUNC_ALWAYS_REQUIRED(glTexCoord4s), - GLFUNC_ALWAYS_REQUIRED(glTexCoord1dv), GLFUNC_ALWAYS_REQUIRED(glTexCoord1fv), - GLFUNC_ALWAYS_REQUIRED(glTexCoord1iv), GLFUNC_ALWAYS_REQUIRED(glTexCoord1sv), - GLFUNC_ALWAYS_REQUIRED(glTexCoord2dv), GLFUNC_ALWAYS_REQUIRED(glTexCoord2fv), - GLFUNC_ALWAYS_REQUIRED(glTexCoord2iv), GLFUNC_ALWAYS_REQUIRED(glTexCoord2sv), - GLFUNC_ALWAYS_REQUIRED(glTexCoord3dv), GLFUNC_ALWAYS_REQUIRED(glTexCoord3fv), - GLFUNC_ALWAYS_REQUIRED(glTexCoord3iv), GLFUNC_ALWAYS_REQUIRED(glTexCoord3sv), - GLFUNC_ALWAYS_REQUIRED(glTexCoord4dv), GLFUNC_ALWAYS_REQUIRED(glTexCoord4fv), - GLFUNC_ALWAYS_REQUIRED(glTexCoord4iv), GLFUNC_ALWAYS_REQUIRED(glTexCoord4sv), - GLFUNC_ALWAYS_REQUIRED(glRasterPos2d), GLFUNC_ALWAYS_REQUIRED(glRasterPos2f), - GLFUNC_ALWAYS_REQUIRED(glRasterPos2i), GLFUNC_ALWAYS_REQUIRED(glRasterPos2s), - GLFUNC_ALWAYS_REQUIRED(glRasterPos3d), GLFUNC_ALWAYS_REQUIRED(glRasterPos3f), - GLFUNC_ALWAYS_REQUIRED(glRasterPos3i), GLFUNC_ALWAYS_REQUIRED(glRasterPos3s), - GLFUNC_ALWAYS_REQUIRED(glRasterPos4d), GLFUNC_ALWAYS_REQUIRED(glRasterPos4f), - GLFUNC_ALWAYS_REQUIRED(glRasterPos4i), GLFUNC_ALWAYS_REQUIRED(glRasterPos4s), - GLFUNC_ALWAYS_REQUIRED(glRasterPos2dv), GLFUNC_ALWAYS_REQUIRED(glRasterPos2fv), - GLFUNC_ALWAYS_REQUIRED(glRasterPos2iv), GLFUNC_ALWAYS_REQUIRED(glRasterPos2sv), - GLFUNC_ALWAYS_REQUIRED(glRasterPos3dv), GLFUNC_ALWAYS_REQUIRED(glRasterPos3fv), - GLFUNC_ALWAYS_REQUIRED(glRasterPos3iv), GLFUNC_ALWAYS_REQUIRED(glRasterPos3sv), - GLFUNC_ALWAYS_REQUIRED(glRasterPos4dv), GLFUNC_ALWAYS_REQUIRED(glRasterPos4fv), - GLFUNC_ALWAYS_REQUIRED(glRasterPos4iv), GLFUNC_ALWAYS_REQUIRED(glRasterPos4sv), - GLFUNC_ALWAYS_REQUIRED(glRectd), GLFUNC_ALWAYS_REQUIRED(glRectf), - GLFUNC_ALWAYS_REQUIRED(glRecti), GLFUNC_ALWAYS_REQUIRED(glRects), - GLFUNC_ALWAYS_REQUIRED(glRectdv), GLFUNC_ALWAYS_REQUIRED(glRectfv), - GLFUNC_ALWAYS_REQUIRED(glRectiv), GLFUNC_ALWAYS_REQUIRED(glRectsv), - GLFUNC_ALWAYS_REQUIRED(glVertexPointer), GLFUNC_ALWAYS_REQUIRED(glNormalPointer), - GLFUNC_ALWAYS_REQUIRED(glColorPointer), GLFUNC_ALWAYS_REQUIRED(glIndexPointer), - GLFUNC_ALWAYS_REQUIRED(glTexCoordPointer), GLFUNC_ALWAYS_REQUIRED(glEdgeFlagPointer), - GLFUNC_ALWAYS_REQUIRED(glArrayElement), GLFUNC_ALWAYS_REQUIRED(glInterleavedArrays), - GLFUNC_ALWAYS_REQUIRED(glShadeModel), GLFUNC_ALWAYS_REQUIRED(glLightf), - GLFUNC_ALWAYS_REQUIRED(glLighti), GLFUNC_ALWAYS_REQUIRED(glLightfv), - GLFUNC_ALWAYS_REQUIRED(glLightiv), GLFUNC_ALWAYS_REQUIRED(glGetLightfv), - GLFUNC_ALWAYS_REQUIRED(glGetLightiv), GLFUNC_ALWAYS_REQUIRED(glLightModelf), - GLFUNC_ALWAYS_REQUIRED(glLightModeli), GLFUNC_ALWAYS_REQUIRED(glLightModelfv), - GLFUNC_ALWAYS_REQUIRED(glLightModeliv), GLFUNC_ALWAYS_REQUIRED(glMaterialf), - GLFUNC_ALWAYS_REQUIRED(glMateriali), GLFUNC_ALWAYS_REQUIRED(glMaterialfv), - GLFUNC_ALWAYS_REQUIRED(glMaterialiv), GLFUNC_ALWAYS_REQUIRED(glGetMaterialfv), - GLFUNC_ALWAYS_REQUIRED(glGetMaterialiv), GLFUNC_ALWAYS_REQUIRED(glColorMaterial), - GLFUNC_ALWAYS_REQUIRED(glPixelZoom), GLFUNC_ALWAYS_REQUIRED(glPixelStoref), - GLFUNC_ALWAYS_REQUIRED(glPixelTransferf), GLFUNC_ALWAYS_REQUIRED(glPixelTransferi), - GLFUNC_ALWAYS_REQUIRED(glPixelMapfv), GLFUNC_ALWAYS_REQUIRED(glPixelMapuiv), - GLFUNC_ALWAYS_REQUIRED(glPixelMapusv), GLFUNC_ALWAYS_REQUIRED(glGetPixelMapfv), - GLFUNC_ALWAYS_REQUIRED(glGetPixelMapuiv), GLFUNC_ALWAYS_REQUIRED(glGetPixelMapusv), - GLFUNC_ALWAYS_REQUIRED(glBitmap), GLFUNC_ALWAYS_REQUIRED(glDrawPixels), - GLFUNC_ALWAYS_REQUIRED(glCopyPixels), GLFUNC_ALWAYS_REQUIRED(glTexGend), - GLFUNC_ALWAYS_REQUIRED(glTexGenf), GLFUNC_ALWAYS_REQUIRED(glTexGeni), - GLFUNC_ALWAYS_REQUIRED(glTexGendv), GLFUNC_ALWAYS_REQUIRED(glTexGenfv), - GLFUNC_ALWAYS_REQUIRED(glTexGeniv), GLFUNC_ALWAYS_REQUIRED(glGetTexGendv), - GLFUNC_ALWAYS_REQUIRED(glGetTexGenfv), GLFUNC_ALWAYS_REQUIRED(glGetTexGeniv), - GLFUNC_ALWAYS_REQUIRED(glTexEnvf), GLFUNC_ALWAYS_REQUIRED(glTexEnvi), - GLFUNC_ALWAYS_REQUIRED(glTexEnvfv), GLFUNC_ALWAYS_REQUIRED(glTexEnviv), - GLFUNC_ALWAYS_REQUIRED(glGetTexEnvfv), GLFUNC_ALWAYS_REQUIRED(glGetTexEnviv), + GLFUNC_ALWAYS_REQUIRED(glClearIndex), + GLFUNC_ALWAYS_REQUIRED(glIndexMask), + GLFUNC_ALWAYS_REQUIRED(glAlphaFunc), + GLFUNC_ALWAYS_REQUIRED(glLogicOp), + GLFUNC_ALWAYS_REQUIRED(glPointSize), + GLFUNC_ALWAYS_REQUIRED(glLineStipple), + GLFUNC_ALWAYS_REQUIRED(glPolygonMode), + GLFUNC_ALWAYS_REQUIRED(glPolygonStipple), + GLFUNC_ALWAYS_REQUIRED(glGetPolygonStipple), + GLFUNC_ALWAYS_REQUIRED(glEdgeFlag), + GLFUNC_ALWAYS_REQUIRED(glEdgeFlagv), + GLFUNC_ALWAYS_REQUIRED(glClipPlane), + GLFUNC_ALWAYS_REQUIRED(glGetClipPlane), + GLFUNC_ALWAYS_REQUIRED(glDrawBuffer), + GLFUNC_ALWAYS_REQUIRED(glEnableClientState), + GLFUNC_ALWAYS_REQUIRED(glDisableClientState), + GLFUNC_ALWAYS_REQUIRED(glGetDoublev), + GLFUNC_ALWAYS_REQUIRED(glPushAttrib), + GLFUNC_ALWAYS_REQUIRED(glPopAttrib), + GLFUNC_ALWAYS_REQUIRED(glPushClientAttrib), + GLFUNC_ALWAYS_REQUIRED(glPopClientAttrib), + GLFUNC_ALWAYS_REQUIRED(glRenderMode), + GLFUNC_ALWAYS_REQUIRED(glClearDepth), + GLFUNC_ALWAYS_REQUIRED(glDepthRange), + GLFUNC_ALWAYS_REQUIRED(glClearAccum), + GLFUNC_ALWAYS_REQUIRED(glAccum), + GLFUNC_ALWAYS_REQUIRED(glMatrixMode), + GLFUNC_ALWAYS_REQUIRED(glOrtho), + GLFUNC_ALWAYS_REQUIRED(glFrustum), + GLFUNC_ALWAYS_REQUIRED(glPushMatrix), + GLFUNC_ALWAYS_REQUIRED(glPopMatrix), + GLFUNC_ALWAYS_REQUIRED(glLoadIdentity), + GLFUNC_ALWAYS_REQUIRED(glLoadMatrixd), + GLFUNC_ALWAYS_REQUIRED(glLoadMatrixf), + GLFUNC_ALWAYS_REQUIRED(glMultMatrixd), + GLFUNC_ALWAYS_REQUIRED(glMultMatrixf), + GLFUNC_ALWAYS_REQUIRED(glRotated), + GLFUNC_ALWAYS_REQUIRED(glRotatef), + GLFUNC_ALWAYS_REQUIRED(glScaled), + GLFUNC_ALWAYS_REQUIRED(glScalef), + GLFUNC_ALWAYS_REQUIRED(glTranslated), + GLFUNC_ALWAYS_REQUIRED(glTranslatef), + GLFUNC_ALWAYS_REQUIRED(glIsList), + GLFUNC_ALWAYS_REQUIRED(glDeleteLists), + GLFUNC_ALWAYS_REQUIRED(glGenLists), + GLFUNC_ALWAYS_REQUIRED(glNewList), + GLFUNC_ALWAYS_REQUIRED(glEndList), + GLFUNC_ALWAYS_REQUIRED(glCallList), + GLFUNC_ALWAYS_REQUIRED(glCallLists), + GLFUNC_ALWAYS_REQUIRED(glListBase), + GLFUNC_ALWAYS_REQUIRED(glBegin), + GLFUNC_ALWAYS_REQUIRED(glEnd), + GLFUNC_ALWAYS_REQUIRED(glVertex2d), + GLFUNC_ALWAYS_REQUIRED(glVertex2f), + GLFUNC_ALWAYS_REQUIRED(glVertex2i), + GLFUNC_ALWAYS_REQUIRED(glVertex2s), + GLFUNC_ALWAYS_REQUIRED(glVertex3d), + GLFUNC_ALWAYS_REQUIRED(glVertex3f), + GLFUNC_ALWAYS_REQUIRED(glVertex3i), + GLFUNC_ALWAYS_REQUIRED(glVertex3s), + GLFUNC_ALWAYS_REQUIRED(glVertex4d), + GLFUNC_ALWAYS_REQUIRED(glVertex4f), + GLFUNC_ALWAYS_REQUIRED(glVertex4i), + GLFUNC_ALWAYS_REQUIRED(glVertex4s), + GLFUNC_ALWAYS_REQUIRED(glVertex2dv), + GLFUNC_ALWAYS_REQUIRED(glVertex2fv), + GLFUNC_ALWAYS_REQUIRED(glVertex2iv), + GLFUNC_ALWAYS_REQUIRED(glVertex2sv), + GLFUNC_ALWAYS_REQUIRED(glVertex3dv), + GLFUNC_ALWAYS_REQUIRED(glVertex3fv), + GLFUNC_ALWAYS_REQUIRED(glVertex3iv), + GLFUNC_ALWAYS_REQUIRED(glVertex3sv), + GLFUNC_ALWAYS_REQUIRED(glVertex4dv), + GLFUNC_ALWAYS_REQUIRED(glVertex4fv), + GLFUNC_ALWAYS_REQUIRED(glVertex4iv), + GLFUNC_ALWAYS_REQUIRED(glVertex4sv), + GLFUNC_ALWAYS_REQUIRED(glNormal3b), + GLFUNC_ALWAYS_REQUIRED(glNormal3d), + GLFUNC_ALWAYS_REQUIRED(glNormal3f), + GLFUNC_ALWAYS_REQUIRED(glNormal3i), + GLFUNC_ALWAYS_REQUIRED(glNormal3s), + GLFUNC_ALWAYS_REQUIRED(glNormal3bv), + GLFUNC_ALWAYS_REQUIRED(glNormal3dv), + GLFUNC_ALWAYS_REQUIRED(glNormal3fv), + GLFUNC_ALWAYS_REQUIRED(glNormal3iv), + GLFUNC_ALWAYS_REQUIRED(glNormal3sv), + GLFUNC_ALWAYS_REQUIRED(glIndexd), + GLFUNC_ALWAYS_REQUIRED(glIndexf), + GLFUNC_ALWAYS_REQUIRED(glIndexi), + GLFUNC_ALWAYS_REQUIRED(glIndexs), + GLFUNC_ALWAYS_REQUIRED(glIndexub), + GLFUNC_ALWAYS_REQUIRED(glIndexdv), + GLFUNC_ALWAYS_REQUIRED(glIndexfv), + GLFUNC_ALWAYS_REQUIRED(glIndexiv), + GLFUNC_ALWAYS_REQUIRED(glIndexsv), + GLFUNC_ALWAYS_REQUIRED(glIndexubv), + GLFUNC_ALWAYS_REQUIRED(glColor3b), + GLFUNC_ALWAYS_REQUIRED(glColor3d), + GLFUNC_ALWAYS_REQUIRED(glColor3f), + GLFUNC_ALWAYS_REQUIRED(glColor3i), + GLFUNC_ALWAYS_REQUIRED(glColor3s), + GLFUNC_ALWAYS_REQUIRED(glColor3ub), + GLFUNC_ALWAYS_REQUIRED(glColor3ui), + GLFUNC_ALWAYS_REQUIRED(glColor3us), + GLFUNC_ALWAYS_REQUIRED(glColor4b), + GLFUNC_ALWAYS_REQUIRED(glColor4d), + GLFUNC_ALWAYS_REQUIRED(glColor4f), + GLFUNC_ALWAYS_REQUIRED(glColor4i), + GLFUNC_ALWAYS_REQUIRED(glColor4s), + GLFUNC_ALWAYS_REQUIRED(glColor4ub), + GLFUNC_ALWAYS_REQUIRED(glColor4ui), + GLFUNC_ALWAYS_REQUIRED(glColor4us), + GLFUNC_ALWAYS_REQUIRED(glColor3bv), + GLFUNC_ALWAYS_REQUIRED(glColor3dv), + GLFUNC_ALWAYS_REQUIRED(glColor3fv), + GLFUNC_ALWAYS_REQUIRED(glColor3iv), + GLFUNC_ALWAYS_REQUIRED(glColor3sv), + GLFUNC_ALWAYS_REQUIRED(glColor3ubv), + GLFUNC_ALWAYS_REQUIRED(glColor3uiv), + GLFUNC_ALWAYS_REQUIRED(glColor3usv), + GLFUNC_ALWAYS_REQUIRED(glColor4bv), + GLFUNC_ALWAYS_REQUIRED(glColor4dv), + GLFUNC_ALWAYS_REQUIRED(glColor4fv), + GLFUNC_ALWAYS_REQUIRED(glColor4iv), + GLFUNC_ALWAYS_REQUIRED(glColor4sv), + GLFUNC_ALWAYS_REQUIRED(glColor4ubv), + GLFUNC_ALWAYS_REQUIRED(glColor4uiv), + GLFUNC_ALWAYS_REQUIRED(glColor4usv), + GLFUNC_ALWAYS_REQUIRED(glTexCoord1d), + GLFUNC_ALWAYS_REQUIRED(glTexCoord1f), + GLFUNC_ALWAYS_REQUIRED(glTexCoord1i), + GLFUNC_ALWAYS_REQUIRED(glTexCoord1s), + GLFUNC_ALWAYS_REQUIRED(glTexCoord2d), + GLFUNC_ALWAYS_REQUIRED(glTexCoord2f), + GLFUNC_ALWAYS_REQUIRED(glTexCoord2i), + GLFUNC_ALWAYS_REQUIRED(glTexCoord2s), + GLFUNC_ALWAYS_REQUIRED(glTexCoord3d), + GLFUNC_ALWAYS_REQUIRED(glTexCoord3f), + GLFUNC_ALWAYS_REQUIRED(glTexCoord3i), + GLFUNC_ALWAYS_REQUIRED(glTexCoord3s), + GLFUNC_ALWAYS_REQUIRED(glTexCoord4d), + GLFUNC_ALWAYS_REQUIRED(glTexCoord4f), + GLFUNC_ALWAYS_REQUIRED(glTexCoord4i), + GLFUNC_ALWAYS_REQUIRED(glTexCoord4s), + GLFUNC_ALWAYS_REQUIRED(glTexCoord1dv), + GLFUNC_ALWAYS_REQUIRED(glTexCoord1fv), + GLFUNC_ALWAYS_REQUIRED(glTexCoord1iv), + GLFUNC_ALWAYS_REQUIRED(glTexCoord1sv), + GLFUNC_ALWAYS_REQUIRED(glTexCoord2dv), + GLFUNC_ALWAYS_REQUIRED(glTexCoord2fv), + GLFUNC_ALWAYS_REQUIRED(glTexCoord2iv), + GLFUNC_ALWAYS_REQUIRED(glTexCoord2sv), + GLFUNC_ALWAYS_REQUIRED(glTexCoord3dv), + GLFUNC_ALWAYS_REQUIRED(glTexCoord3fv), + GLFUNC_ALWAYS_REQUIRED(glTexCoord3iv), + GLFUNC_ALWAYS_REQUIRED(glTexCoord3sv), + GLFUNC_ALWAYS_REQUIRED(glTexCoord4dv), + GLFUNC_ALWAYS_REQUIRED(glTexCoord4fv), + GLFUNC_ALWAYS_REQUIRED(glTexCoord4iv), + GLFUNC_ALWAYS_REQUIRED(glTexCoord4sv), + GLFUNC_ALWAYS_REQUIRED(glRasterPos2d), + GLFUNC_ALWAYS_REQUIRED(glRasterPos2f), + GLFUNC_ALWAYS_REQUIRED(glRasterPos2i), + GLFUNC_ALWAYS_REQUIRED(glRasterPos2s), + GLFUNC_ALWAYS_REQUIRED(glRasterPos3d), + GLFUNC_ALWAYS_REQUIRED(glRasterPos3f), + GLFUNC_ALWAYS_REQUIRED(glRasterPos3i), + GLFUNC_ALWAYS_REQUIRED(glRasterPos3s), + GLFUNC_ALWAYS_REQUIRED(glRasterPos4d), + GLFUNC_ALWAYS_REQUIRED(glRasterPos4f), + GLFUNC_ALWAYS_REQUIRED(glRasterPos4i), + GLFUNC_ALWAYS_REQUIRED(glRasterPos4s), + GLFUNC_ALWAYS_REQUIRED(glRasterPos2dv), + GLFUNC_ALWAYS_REQUIRED(glRasterPos2fv), + GLFUNC_ALWAYS_REQUIRED(glRasterPos2iv), + GLFUNC_ALWAYS_REQUIRED(glRasterPos2sv), + GLFUNC_ALWAYS_REQUIRED(glRasterPos3dv), + GLFUNC_ALWAYS_REQUIRED(glRasterPos3fv), + GLFUNC_ALWAYS_REQUIRED(glRasterPos3iv), + GLFUNC_ALWAYS_REQUIRED(glRasterPos3sv), + GLFUNC_ALWAYS_REQUIRED(glRasterPos4dv), + GLFUNC_ALWAYS_REQUIRED(glRasterPos4fv), + GLFUNC_ALWAYS_REQUIRED(glRasterPos4iv), + GLFUNC_ALWAYS_REQUIRED(glRasterPos4sv), + GLFUNC_ALWAYS_REQUIRED(glRectd), + GLFUNC_ALWAYS_REQUIRED(glRectf), + GLFUNC_ALWAYS_REQUIRED(glRecti), + GLFUNC_ALWAYS_REQUIRED(glRects), + GLFUNC_ALWAYS_REQUIRED(glRectdv), + GLFUNC_ALWAYS_REQUIRED(glRectfv), + GLFUNC_ALWAYS_REQUIRED(glRectiv), + GLFUNC_ALWAYS_REQUIRED(glRectsv), + GLFUNC_ALWAYS_REQUIRED(glVertexPointer), + GLFUNC_ALWAYS_REQUIRED(glNormalPointer), + GLFUNC_ALWAYS_REQUIRED(glColorPointer), + GLFUNC_ALWAYS_REQUIRED(glIndexPointer), + GLFUNC_ALWAYS_REQUIRED(glTexCoordPointer), + GLFUNC_ALWAYS_REQUIRED(glEdgeFlagPointer), + GLFUNC_ALWAYS_REQUIRED(glArrayElement), + GLFUNC_ALWAYS_REQUIRED(glInterleavedArrays), + GLFUNC_ALWAYS_REQUIRED(glShadeModel), + GLFUNC_ALWAYS_REQUIRED(glLightf), + GLFUNC_ALWAYS_REQUIRED(glLighti), + GLFUNC_ALWAYS_REQUIRED(glLightfv), + GLFUNC_ALWAYS_REQUIRED(glLightiv), + GLFUNC_ALWAYS_REQUIRED(glGetLightfv), + GLFUNC_ALWAYS_REQUIRED(glGetLightiv), + GLFUNC_ALWAYS_REQUIRED(glLightModelf), + GLFUNC_ALWAYS_REQUIRED(glLightModeli), + GLFUNC_ALWAYS_REQUIRED(glLightModelfv), + GLFUNC_ALWAYS_REQUIRED(glLightModeliv), + GLFUNC_ALWAYS_REQUIRED(glMaterialf), + GLFUNC_ALWAYS_REQUIRED(glMateriali), + GLFUNC_ALWAYS_REQUIRED(glMaterialfv), + GLFUNC_ALWAYS_REQUIRED(glMaterialiv), + GLFUNC_ALWAYS_REQUIRED(glGetMaterialfv), + GLFUNC_ALWAYS_REQUIRED(glGetMaterialiv), + GLFUNC_ALWAYS_REQUIRED(glColorMaterial), + GLFUNC_ALWAYS_REQUIRED(glPixelZoom), + GLFUNC_ALWAYS_REQUIRED(glPixelStoref), + GLFUNC_ALWAYS_REQUIRED(glPixelTransferf), + GLFUNC_ALWAYS_REQUIRED(glPixelTransferi), + GLFUNC_ALWAYS_REQUIRED(glPixelMapfv), + GLFUNC_ALWAYS_REQUIRED(glPixelMapuiv), + GLFUNC_ALWAYS_REQUIRED(glPixelMapusv), + GLFUNC_ALWAYS_REQUIRED(glGetPixelMapfv), + GLFUNC_ALWAYS_REQUIRED(glGetPixelMapuiv), + GLFUNC_ALWAYS_REQUIRED(glGetPixelMapusv), + GLFUNC_ALWAYS_REQUIRED(glBitmap), + GLFUNC_ALWAYS_REQUIRED(glDrawPixels), + GLFUNC_ALWAYS_REQUIRED(glCopyPixels), + GLFUNC_ALWAYS_REQUIRED(glTexGend), + GLFUNC_ALWAYS_REQUIRED(glTexGenf), + GLFUNC_ALWAYS_REQUIRED(glTexGeni), + GLFUNC_ALWAYS_REQUIRED(glTexGendv), + GLFUNC_ALWAYS_REQUIRED(glTexGenfv), + GLFUNC_ALWAYS_REQUIRED(glTexGeniv), + GLFUNC_ALWAYS_REQUIRED(glGetTexGendv), + GLFUNC_ALWAYS_REQUIRED(glGetTexGenfv), + GLFUNC_ALWAYS_REQUIRED(glGetTexGeniv), + GLFUNC_ALWAYS_REQUIRED(glTexEnvf), + GLFUNC_ALWAYS_REQUIRED(glTexEnvi), + GLFUNC_ALWAYS_REQUIRED(glTexEnvfv), + GLFUNC_ALWAYS_REQUIRED(glTexEnviv), + GLFUNC_ALWAYS_REQUIRED(glGetTexEnvfv), + GLFUNC_ALWAYS_REQUIRED(glGetTexEnviv), GLFUNC_ALWAYS_REQUIRED(glGetTexLevelParameterfv), - GLFUNC_ALWAYS_REQUIRED(glGetTexLevelParameteriv), GLFUNC_ALWAYS_REQUIRED(glTexImage1D), - GLFUNC_ALWAYS_REQUIRED(glGetTexImage), GLFUNC_ALWAYS_REQUIRED(glPrioritizeTextures), - GLFUNC_ALWAYS_REQUIRED(glAreTexturesResident), GLFUNC_ALWAYS_REQUIRED(glTexSubImage1D), - GLFUNC_ALWAYS_REQUIRED(glCopyTexImage1D), GLFUNC_ALWAYS_REQUIRED(glCopyTexSubImage1D), - GLFUNC_ALWAYS_REQUIRED(glMap1d), GLFUNC_ALWAYS_REQUIRED(glMap1f), - GLFUNC_ALWAYS_REQUIRED(glMap2d), GLFUNC_ALWAYS_REQUIRED(glMap2f), - GLFUNC_ALWAYS_REQUIRED(glGetMapdv), GLFUNC_ALWAYS_REQUIRED(glGetMapfv), - GLFUNC_ALWAYS_REQUIRED(glGetMapiv), GLFUNC_ALWAYS_REQUIRED(glEvalCoord1d), - GLFUNC_ALWAYS_REQUIRED(glEvalCoord1f), GLFUNC_ALWAYS_REQUIRED(glEvalCoord1dv), - GLFUNC_ALWAYS_REQUIRED(glEvalCoord1fv), GLFUNC_ALWAYS_REQUIRED(glEvalCoord2d), - GLFUNC_ALWAYS_REQUIRED(glEvalCoord2f), GLFUNC_ALWAYS_REQUIRED(glEvalCoord2dv), - GLFUNC_ALWAYS_REQUIRED(glEvalCoord2fv), GLFUNC_ALWAYS_REQUIRED(glMapGrid1d), - GLFUNC_ALWAYS_REQUIRED(glMapGrid1f), GLFUNC_ALWAYS_REQUIRED(glMapGrid2d), - GLFUNC_ALWAYS_REQUIRED(glMapGrid2f), GLFUNC_ALWAYS_REQUIRED(glEvalPoint1), - GLFUNC_ALWAYS_REQUIRED(glEvalPoint2), GLFUNC_ALWAYS_REQUIRED(glEvalMesh1), - GLFUNC_ALWAYS_REQUIRED(glEvalMesh2), GLFUNC_ALWAYS_REQUIRED(glFogf), - GLFUNC_ALWAYS_REQUIRED(glFogi), GLFUNC_ALWAYS_REQUIRED(glFogfv), - GLFUNC_ALWAYS_REQUIRED(glFogiv), GLFUNC_ALWAYS_REQUIRED(glFeedbackBuffer), - GLFUNC_ALWAYS_REQUIRED(glPassThrough), GLFUNC_ALWAYS_REQUIRED(glSelectBuffer), - GLFUNC_ALWAYS_REQUIRED(glInitNames), GLFUNC_ALWAYS_REQUIRED(glLoadName), - GLFUNC_ALWAYS_REQUIRED(glPushName), GLFUNC_ALWAYS_REQUIRED(glPopName), - GL_ES_FUNC_ALWAYS_REQUIRED(glTexImage2D), GL_ES_FUNC_ALWAYS_REQUIRED(glClearColor), - GL_ES_FUNC_ALWAYS_REQUIRED(glClear), GL_ES_FUNC_ALWAYS_REQUIRED(glColorMask), - GL_ES_FUNC_ALWAYS_REQUIRED(glBlendFunc), GL_ES_FUNC_ALWAYS_REQUIRED(glCullFace), - GL_ES_FUNC_ALWAYS_REQUIRED(glFrontFace), GL_ES_FUNC_ALWAYS_REQUIRED(glLineWidth), - GL_ES_FUNC_ALWAYS_REQUIRED(glPolygonOffset), GL_ES_FUNC_ALWAYS_REQUIRED(glScissor), - GL_ES_FUNC_ALWAYS_REQUIRED(glEnable), GL_ES_FUNC_ALWAYS_REQUIRED(glDisable), - GL_ES_FUNC_ALWAYS_REQUIRED(glIsEnabled), GL_ES_FUNC_ALWAYS_REQUIRED(glGetBooleanv), - GL_ES_FUNC_ALWAYS_REQUIRED(glGetFloatv), GL_ES_FUNC_ALWAYS_REQUIRED(glFinish), - GL_ES_FUNC_ALWAYS_REQUIRED(glFlush), GL_ES_FUNC_ALWAYS_REQUIRED(glHint), - GL_ES_FUNC_ALWAYS_REQUIRED(glDepthFunc), GL_ES_FUNC_ALWAYS_REQUIRED(glDepthMask), - GL_ES_FUNC_ALWAYS_REQUIRED(glViewport), GL_ES_FUNC_ALWAYS_REQUIRED(glDrawArrays), - GL_ES_FUNC_ALWAYS_REQUIRED(glDrawElements), GL_ES_FUNC_ALWAYS_REQUIRED(glPixelStorei), - GL_ES_FUNC_ALWAYS_REQUIRED(glReadPixels), GL_ES_FUNC_ALWAYS_REQUIRED(glStencilFunc), - GL_ES_FUNC_ALWAYS_REQUIRED(glStencilMask), GL_ES_FUNC_ALWAYS_REQUIRED(glStencilOp), - GL_ES_FUNC_ALWAYS_REQUIRED(glClearStencil), GL_ES_FUNC_ALWAYS_REQUIRED(glTexParameterf), - GL_ES_FUNC_ALWAYS_REQUIRED(glTexParameteri), GL_ES_FUNC_ALWAYS_REQUIRED(glTexParameterfv), - GL_ES_FUNC_ALWAYS_REQUIRED(glTexParameteriv), GL_ES_FUNC_ALWAYS_REQUIRED(glGetTexParameterfv), - GL_ES_FUNC_ALWAYS_REQUIRED(glGetTexParameteriv), GL_ES_FUNC_ALWAYS_REQUIRED(glGenTextures), - GL_ES_FUNC_ALWAYS_REQUIRED(glDeleteTextures), GL_ES_FUNC_ALWAYS_REQUIRED(glBindTexture), - GL_ES_FUNC_ALWAYS_REQUIRED(glIsTexture), GL_ES_FUNC_ALWAYS_REQUIRED(glTexSubImage2D), - GL_ES_FUNC_ALWAYS_REQUIRED(glCopyTexImage2D), GL_ES_FUNC_ALWAYS_REQUIRED(glCopyTexSubImage2D), - GL_ES3_FUNC_ALWAYS_REQUIRED(glReadBuffer), GL_ES32_FUNC_ALWAYS_REQUIRED(glGetPointerv), + GLFUNC_ALWAYS_REQUIRED(glGetTexLevelParameteriv), + GLFUNC_ALWAYS_REQUIRED(glTexImage1D), + GLFUNC_ALWAYS_REQUIRED(glGetTexImage), + GLFUNC_ALWAYS_REQUIRED(glPrioritizeTextures), + GLFUNC_ALWAYS_REQUIRED(glAreTexturesResident), + GLFUNC_ALWAYS_REQUIRED(glTexSubImage1D), + GLFUNC_ALWAYS_REQUIRED(glCopyTexImage1D), + GLFUNC_ALWAYS_REQUIRED(glCopyTexSubImage1D), + GLFUNC_ALWAYS_REQUIRED(glMap1d), + GLFUNC_ALWAYS_REQUIRED(glMap1f), + GLFUNC_ALWAYS_REQUIRED(glMap2d), + GLFUNC_ALWAYS_REQUIRED(glMap2f), + GLFUNC_ALWAYS_REQUIRED(glGetMapdv), + GLFUNC_ALWAYS_REQUIRED(glGetMapfv), + GLFUNC_ALWAYS_REQUIRED(glGetMapiv), + GLFUNC_ALWAYS_REQUIRED(glEvalCoord1d), + GLFUNC_ALWAYS_REQUIRED(glEvalCoord1f), + GLFUNC_ALWAYS_REQUIRED(glEvalCoord1dv), + GLFUNC_ALWAYS_REQUIRED(glEvalCoord1fv), + GLFUNC_ALWAYS_REQUIRED(glEvalCoord2d), + GLFUNC_ALWAYS_REQUIRED(glEvalCoord2f), + GLFUNC_ALWAYS_REQUIRED(glEvalCoord2dv), + GLFUNC_ALWAYS_REQUIRED(glEvalCoord2fv), + GLFUNC_ALWAYS_REQUIRED(glMapGrid1d), + GLFUNC_ALWAYS_REQUIRED(glMapGrid1f), + GLFUNC_ALWAYS_REQUIRED(glMapGrid2d), + GLFUNC_ALWAYS_REQUIRED(glMapGrid2f), + GLFUNC_ALWAYS_REQUIRED(glEvalPoint1), + GLFUNC_ALWAYS_REQUIRED(glEvalPoint2), + GLFUNC_ALWAYS_REQUIRED(glEvalMesh1), + GLFUNC_ALWAYS_REQUIRED(glEvalMesh2), + GLFUNC_ALWAYS_REQUIRED(glFogf), + GLFUNC_ALWAYS_REQUIRED(glFogi), + GLFUNC_ALWAYS_REQUIRED(glFogfv), + GLFUNC_ALWAYS_REQUIRED(glFogiv), + GLFUNC_ALWAYS_REQUIRED(glFeedbackBuffer), + GLFUNC_ALWAYS_REQUIRED(glPassThrough), + GLFUNC_ALWAYS_REQUIRED(glSelectBuffer), + GLFUNC_ALWAYS_REQUIRED(glInitNames), + GLFUNC_ALWAYS_REQUIRED(glLoadName), + GLFUNC_ALWAYS_REQUIRED(glPushName), + GLFUNC_ALWAYS_REQUIRED(glPopName), + GL_ES_FUNC_ALWAYS_REQUIRED(glTexImage2D), + GL_ES_FUNC_ALWAYS_REQUIRED(glClearColor), + GL_ES_FUNC_ALWAYS_REQUIRED(glClear), + GL_ES_FUNC_ALWAYS_REQUIRED(glColorMask), + GL_ES_FUNC_ALWAYS_REQUIRED(glBlendFunc), + GL_ES_FUNC_ALWAYS_REQUIRED(glCullFace), + GL_ES_FUNC_ALWAYS_REQUIRED(glFrontFace), + GL_ES_FUNC_ALWAYS_REQUIRED(glLineWidth), + GL_ES_FUNC_ALWAYS_REQUIRED(glPolygonOffset), + GL_ES_FUNC_ALWAYS_REQUIRED(glScissor), + GL_ES_FUNC_ALWAYS_REQUIRED(glEnable), + GL_ES_FUNC_ALWAYS_REQUIRED(glDisable), + GL_ES_FUNC_ALWAYS_REQUIRED(glIsEnabled), + GL_ES_FUNC_ALWAYS_REQUIRED(glGetBooleanv), + GL_ES_FUNC_ALWAYS_REQUIRED(glGetFloatv), + GL_ES_FUNC_ALWAYS_REQUIRED(glFinish), + GL_ES_FUNC_ALWAYS_REQUIRED(glFlush), + GL_ES_FUNC_ALWAYS_REQUIRED(glHint), + GL_ES_FUNC_ALWAYS_REQUIRED(glDepthFunc), + GL_ES_FUNC_ALWAYS_REQUIRED(glDepthMask), + GL_ES_FUNC_ALWAYS_REQUIRED(glViewport), + GL_ES_FUNC_ALWAYS_REQUIRED(glDrawArrays), + GL_ES_FUNC_ALWAYS_REQUIRED(glDrawElements), + GL_ES_FUNC_ALWAYS_REQUIRED(glPixelStorei), + GL_ES_FUNC_ALWAYS_REQUIRED(glReadPixels), + GL_ES_FUNC_ALWAYS_REQUIRED(glStencilFunc), + GL_ES_FUNC_ALWAYS_REQUIRED(glStencilMask), + GL_ES_FUNC_ALWAYS_REQUIRED(glStencilOp), + GL_ES_FUNC_ALWAYS_REQUIRED(glClearStencil), + GL_ES_FUNC_ALWAYS_REQUIRED(glTexParameterf), + GL_ES_FUNC_ALWAYS_REQUIRED(glTexParameteri), + GL_ES_FUNC_ALWAYS_REQUIRED(glTexParameterfv), + GL_ES_FUNC_ALWAYS_REQUIRED(glTexParameteriv), + GL_ES_FUNC_ALWAYS_REQUIRED(glGetTexParameterfv), + GL_ES_FUNC_ALWAYS_REQUIRED(glGetTexParameteriv), + GL_ES_FUNC_ALWAYS_REQUIRED(glGenTextures), + GL_ES_FUNC_ALWAYS_REQUIRED(glDeleteTextures), + GL_ES_FUNC_ALWAYS_REQUIRED(glBindTexture), + GL_ES_FUNC_ALWAYS_REQUIRED(glIsTexture), + GL_ES_FUNC_ALWAYS_REQUIRED(glTexSubImage2D), + GL_ES_FUNC_ALWAYS_REQUIRED(glCopyTexImage2D), + GL_ES_FUNC_ALWAYS_REQUIRED(glCopyTexSubImage2D), + GL_ES3_FUNC_ALWAYS_REQUIRED(glReadBuffer), + GL_ES32_FUNC_ALWAYS_REQUIRED(glGetPointerv), // gl_1_2 GL_ES3_FUNC_ALWAYS_REQUIRED(glCopyTexSubImage3D), - GL_ES3_FUNC_ALWAYS_REQUIRED(glDrawRangeElements), GL_ES3_FUNC_ALWAYS_REQUIRED(glTexImage3D), + GL_ES3_FUNC_ALWAYS_REQUIRED(glDrawRangeElements), + GL_ES3_FUNC_ALWAYS_REQUIRED(glTexImage3D), GL_ES3_FUNC_ALWAYS_REQUIRED(glTexSubImage3D), // gl_1_3 - GLFUNC_ALWAYS_REQUIRED(glClientActiveTexture), GLFUNC_ALWAYS_REQUIRED(glCompressedTexImage1D), + GLFUNC_ALWAYS_REQUIRED(glClientActiveTexture), + GLFUNC_ALWAYS_REQUIRED(glCompressedTexImage1D), GLFUNC_ALWAYS_REQUIRED(glCompressedTexSubImage1D), - GLFUNC_ALWAYS_REQUIRED(glGetCompressedTexImage), GLFUNC_ALWAYS_REQUIRED(glLoadTransposeMatrixd), - GLFUNC_ALWAYS_REQUIRED(glLoadTransposeMatrixf), GLFUNC_ALWAYS_REQUIRED(glMultTransposeMatrixd), - GLFUNC_ALWAYS_REQUIRED(glMultTransposeMatrixf), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1d), - GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1dv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1f), - GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1fv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1i), - GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1iv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1s), - GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1sv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2d), - GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2dv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2f), - GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2fv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2i), - GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2iv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2s), - GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2sv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3d), - GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3dv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3f), - GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3fv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3i), - GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3iv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3s), - GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3sv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4d), - GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4dv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4f), - GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4fv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4i), - GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4iv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4s), - GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4sv), GL_ES_FUNC_ALWAYS_REQUIRED(glSampleCoverage), - GL_ES_FUNC_ALWAYS_REQUIRED(glActiveTexture), GL_ES_FUNC_ALWAYS_REQUIRED(glCompressedTexImage2D), + GLFUNC_ALWAYS_REQUIRED(glGetCompressedTexImage), + GLFUNC_ALWAYS_REQUIRED(glLoadTransposeMatrixd), + GLFUNC_ALWAYS_REQUIRED(glLoadTransposeMatrixf), + GLFUNC_ALWAYS_REQUIRED(glMultTransposeMatrixd), + GLFUNC_ALWAYS_REQUIRED(glMultTransposeMatrixf), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1d), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1dv), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1f), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1fv), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1i), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1iv), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1s), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1sv), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2d), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2dv), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2f), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2fv), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2i), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2iv), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2s), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2sv), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3d), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3dv), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3f), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3fv), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3i), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3iv), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3s), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3sv), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4d), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4dv), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4f), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4fv), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4i), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4iv), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4s), + GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4sv), + GL_ES_FUNC_ALWAYS_REQUIRED(glSampleCoverage), + GL_ES_FUNC_ALWAYS_REQUIRED(glActiveTexture), + GL_ES_FUNC_ALWAYS_REQUIRED(glCompressedTexImage2D), GL_ES_FUNC_ALWAYS_REQUIRED(glCompressedTexSubImage2D), GL_ES3_FUNC_ALWAYS_REQUIRED(glCompressedTexImage3D), GL_ES3_FUNC_ALWAYS_REQUIRED(glCompressedTexSubImage3D), // gl_1_4 - GLFUNC_ALWAYS_REQUIRED(glFogCoordPointer), GLFUNC_ALWAYS_REQUIRED(glFogCoordd), - GLFUNC_ALWAYS_REQUIRED(glFogCoorddv), GLFUNC_ALWAYS_REQUIRED(glFogCoordf), - GLFUNC_ALWAYS_REQUIRED(glFogCoordfv), GLFUNC_ALWAYS_REQUIRED(glMultiDrawArrays), - GLFUNC_ALWAYS_REQUIRED(glMultiDrawElements), GLFUNC_ALWAYS_REQUIRED(glPointParameterf), - GLFUNC_ALWAYS_REQUIRED(glPointParameterfv), GLFUNC_ALWAYS_REQUIRED(glPointParameteri), - GLFUNC_ALWAYS_REQUIRED(glPointParameteriv), GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3b), - GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3bv), GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3d), - GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3dv), GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3f), - GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3fv), GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3i), - GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3iv), GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3s), - GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3sv), GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3ub), - GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3ubv), GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3ui), - GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3uiv), GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3us), - GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3usv), GLFUNC_ALWAYS_REQUIRED(glSecondaryColorPointer), - GLFUNC_ALWAYS_REQUIRED(glWindowPos2d), GLFUNC_ALWAYS_REQUIRED(glWindowPos2dv), - GLFUNC_ALWAYS_REQUIRED(glWindowPos2f), GLFUNC_ALWAYS_REQUIRED(glWindowPos2fv), - GLFUNC_ALWAYS_REQUIRED(glWindowPos2i), GLFUNC_ALWAYS_REQUIRED(glWindowPos2iv), - GLFUNC_ALWAYS_REQUIRED(glWindowPos2s), GLFUNC_ALWAYS_REQUIRED(glWindowPos2sv), - GLFUNC_ALWAYS_REQUIRED(glWindowPos3d), GLFUNC_ALWAYS_REQUIRED(glWindowPos3dv), - GLFUNC_ALWAYS_REQUIRED(glWindowPos3f), GLFUNC_ALWAYS_REQUIRED(glWindowPos3fv), - GLFUNC_ALWAYS_REQUIRED(glWindowPos3i), GLFUNC_ALWAYS_REQUIRED(glWindowPos3iv), - GLFUNC_ALWAYS_REQUIRED(glWindowPos3s), GLFUNC_ALWAYS_REQUIRED(glWindowPos3sv), - GL_ES_FUNC_ALWAYS_REQUIRED(glBlendColor), GL_ES_FUNC_ALWAYS_REQUIRED(glBlendEquation), + GLFUNC_ALWAYS_REQUIRED(glFogCoordPointer), + GLFUNC_ALWAYS_REQUIRED(glFogCoordd), + GLFUNC_ALWAYS_REQUIRED(glFogCoorddv), + GLFUNC_ALWAYS_REQUIRED(glFogCoordf), + GLFUNC_ALWAYS_REQUIRED(glFogCoordfv), + GLFUNC_ALWAYS_REQUIRED(glMultiDrawArrays), + GLFUNC_ALWAYS_REQUIRED(glMultiDrawElements), + GLFUNC_ALWAYS_REQUIRED(glPointParameterf), + GLFUNC_ALWAYS_REQUIRED(glPointParameterfv), + GLFUNC_ALWAYS_REQUIRED(glPointParameteri), + GLFUNC_ALWAYS_REQUIRED(glPointParameteriv), + GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3b), + GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3bv), + GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3d), + GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3dv), + GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3f), + GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3fv), + GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3i), + GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3iv), + GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3s), + GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3sv), + GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3ub), + GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3ubv), + GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3ui), + GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3uiv), + GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3us), + GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3usv), + GLFUNC_ALWAYS_REQUIRED(glSecondaryColorPointer), + GLFUNC_ALWAYS_REQUIRED(glWindowPos2d), + GLFUNC_ALWAYS_REQUIRED(glWindowPos2dv), + GLFUNC_ALWAYS_REQUIRED(glWindowPos2f), + GLFUNC_ALWAYS_REQUIRED(glWindowPos2fv), + GLFUNC_ALWAYS_REQUIRED(glWindowPos2i), + GLFUNC_ALWAYS_REQUIRED(glWindowPos2iv), + GLFUNC_ALWAYS_REQUIRED(glWindowPos2s), + GLFUNC_ALWAYS_REQUIRED(glWindowPos2sv), + GLFUNC_ALWAYS_REQUIRED(glWindowPos3d), + GLFUNC_ALWAYS_REQUIRED(glWindowPos3dv), + GLFUNC_ALWAYS_REQUIRED(glWindowPos3f), + GLFUNC_ALWAYS_REQUIRED(glWindowPos3fv), + GLFUNC_ALWAYS_REQUIRED(glWindowPos3i), + GLFUNC_ALWAYS_REQUIRED(glWindowPos3iv), + GLFUNC_ALWAYS_REQUIRED(glWindowPos3s), + GLFUNC_ALWAYS_REQUIRED(glWindowPos3sv), + GL_ES_FUNC_ALWAYS_REQUIRED(glBlendColor), + GL_ES_FUNC_ALWAYS_REQUIRED(glBlendEquation), GL_ES_FUNC_ALWAYS_REQUIRED(glBlendFuncSeparate), // gl_1_5 - GLFUNC_ALWAYS_REQUIRED(glGetBufferSubData), GLFUNC_ALWAYS_REQUIRED(glGetQueryObjectiv), - GLFUNC_ALWAYS_REQUIRED(glMapBuffer), GL_ES_FUNC_ALWAYS_REQUIRED(glBindBuffer), - GL_ES_FUNC_ALWAYS_REQUIRED(glBufferData), GL_ES_FUNC_ALWAYS_REQUIRED(glBufferSubData), - GL_ES_FUNC_ALWAYS_REQUIRED(glDeleteBuffers), GL_ES_FUNC_ALWAYS_REQUIRED(glGenBuffers), - GL_ES_FUNC_ALWAYS_REQUIRED(glGetBufferParameteriv), GL_ES_FUNC_ALWAYS_REQUIRED(glIsBuffer), - GL_ES3_FUNC_ALWAYS_REQUIRED(glBeginQuery), GL_ES3_FUNC_ALWAYS_REQUIRED(glDeleteQueries), - GL_ES3_FUNC_ALWAYS_REQUIRED(glEndQuery), GL_ES3_FUNC_ALWAYS_REQUIRED(glGenQueries), - GL_ES3_FUNC_ALWAYS_REQUIRED(glIsQuery), GL_ES3_FUNC_ALWAYS_REQUIRED(glGetQueryiv), + GLFUNC_ALWAYS_REQUIRED(glGetBufferSubData), + GLFUNC_ALWAYS_REQUIRED(glGetQueryObjectiv), + GLFUNC_ALWAYS_REQUIRED(glMapBuffer), + GL_ES_FUNC_ALWAYS_REQUIRED(glBindBuffer), + GL_ES_FUNC_ALWAYS_REQUIRED(glBufferData), + GL_ES_FUNC_ALWAYS_REQUIRED(glBufferSubData), + GL_ES_FUNC_ALWAYS_REQUIRED(glDeleteBuffers), + GL_ES_FUNC_ALWAYS_REQUIRED(glGenBuffers), + GL_ES_FUNC_ALWAYS_REQUIRED(glGetBufferParameteriv), + GL_ES_FUNC_ALWAYS_REQUIRED(glIsBuffer), + GL_ES3_FUNC_ALWAYS_REQUIRED(glBeginQuery), + GL_ES3_FUNC_ALWAYS_REQUIRED(glDeleteQueries), + GL_ES3_FUNC_ALWAYS_REQUIRED(glEndQuery), + GL_ES3_FUNC_ALWAYS_REQUIRED(glGenQueries), + GL_ES3_FUNC_ALWAYS_REQUIRED(glIsQuery), + GL_ES3_FUNC_ALWAYS_REQUIRED(glGetQueryiv), GL_ES3_FUNC_ALWAYS_REQUIRED(glGetQueryObjectuiv), - GL_ES3_FUNC_ALWAYS_REQUIRED(glGetBufferPointerv), GL_ES3_FUNC_ALWAYS_REQUIRED(glUnmapBuffer), + GL_ES3_FUNC_ALWAYS_REQUIRED(glGetBufferPointerv), + GL_ES3_FUNC_ALWAYS_REQUIRED(glUnmapBuffer), // gl_2_0 - GLFUNC_ALWAYS_REQUIRED(glGetVertexAttribdv), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib1d), - GLFUNC_ALWAYS_REQUIRED(glVertexAttrib1dv), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib1s), - GLFUNC_ALWAYS_REQUIRED(glVertexAttrib1sv), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib2d), - GLFUNC_ALWAYS_REQUIRED(glVertexAttrib2dv), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib2s), - GLFUNC_ALWAYS_REQUIRED(glVertexAttrib2sv), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib3d), - GLFUNC_ALWAYS_REQUIRED(glVertexAttrib3dv), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib3s), - GLFUNC_ALWAYS_REQUIRED(glVertexAttrib3sv), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nbv), - GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Niv), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nsv), - GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nub), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nubv), - GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nuiv), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nusv), - GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4bv), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4d), - GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4dv), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4iv), - GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4s), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4sv), - GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4ubv), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4uiv), - GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4usv), GL_ES_FUNC_ALWAYS_REQUIRED(glAttachShader), + GLFUNC_ALWAYS_REQUIRED(glGetVertexAttribdv), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib1d), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib1dv), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib1s), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib1sv), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib2d), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib2dv), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib2s), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib2sv), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib3d), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib3dv), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib3s), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib3sv), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nbv), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Niv), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nsv), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nub), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nubv), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nuiv), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nusv), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4bv), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4d), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4dv), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4iv), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4s), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4sv), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4ubv), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4uiv), + GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4usv), + GL_ES_FUNC_ALWAYS_REQUIRED(glAttachShader), GL_ES_FUNC_ALWAYS_REQUIRED(glBindAttribLocation), GL_ES_FUNC_ALWAYS_REQUIRED(glBlendEquationSeparate), - GL_ES_FUNC_ALWAYS_REQUIRED(glCompileShader), GL_ES_FUNC_ALWAYS_REQUIRED(glCreateProgram), - GL_ES_FUNC_ALWAYS_REQUIRED(glCreateShader), GL_ES_FUNC_ALWAYS_REQUIRED(glDeleteProgram), - GL_ES_FUNC_ALWAYS_REQUIRED(glDeleteShader), GL_ES_FUNC_ALWAYS_REQUIRED(glDetachShader), + GL_ES_FUNC_ALWAYS_REQUIRED(glCompileShader), + GL_ES_FUNC_ALWAYS_REQUIRED(glCreateProgram), + GL_ES_FUNC_ALWAYS_REQUIRED(glCreateShader), + GL_ES_FUNC_ALWAYS_REQUIRED(glDeleteProgram), + GL_ES_FUNC_ALWAYS_REQUIRED(glDeleteShader), + GL_ES_FUNC_ALWAYS_REQUIRED(glDetachShader), GL_ES_FUNC_ALWAYS_REQUIRED(glDisableVertexAttribArray), GL_ES_FUNC_ALWAYS_REQUIRED(glEnableVertexAttribArray), - GL_ES_FUNC_ALWAYS_REQUIRED(glGetActiveAttrib), GL_ES_FUNC_ALWAYS_REQUIRED(glGetActiveUniform), + GL_ES_FUNC_ALWAYS_REQUIRED(glGetActiveAttrib), + GL_ES_FUNC_ALWAYS_REQUIRED(glGetActiveUniform), GL_ES_FUNC_ALWAYS_REQUIRED(glGetAttachedShaders), GL_ES_FUNC_ALWAYS_REQUIRED(glGetAttribLocation), - GL_ES_FUNC_ALWAYS_REQUIRED(glGetProgramInfoLog), GL_ES_FUNC_ALWAYS_REQUIRED(glGetProgramiv), - GL_ES_FUNC_ALWAYS_REQUIRED(glGetShaderInfoLog), GL_ES_FUNC_ALWAYS_REQUIRED(glGetShaderSource), - GL_ES_FUNC_ALWAYS_REQUIRED(glGetShaderiv), GL_ES_FUNC_ALWAYS_REQUIRED(glGetUniformLocation), - GL_ES_FUNC_ALWAYS_REQUIRED(glGetUniformfv), GL_ES_FUNC_ALWAYS_REQUIRED(glGetUniformiv), + GL_ES_FUNC_ALWAYS_REQUIRED(glGetProgramInfoLog), + GL_ES_FUNC_ALWAYS_REQUIRED(glGetProgramiv), + GL_ES_FUNC_ALWAYS_REQUIRED(glGetShaderInfoLog), + GL_ES_FUNC_ALWAYS_REQUIRED(glGetShaderSource), + GL_ES_FUNC_ALWAYS_REQUIRED(glGetShaderiv), + GL_ES_FUNC_ALWAYS_REQUIRED(glGetUniformLocation), + GL_ES_FUNC_ALWAYS_REQUIRED(glGetUniformfv), + GL_ES_FUNC_ALWAYS_REQUIRED(glGetUniformiv), GL_ES_FUNC_ALWAYS_REQUIRED(glGetVertexAttribPointerv), GL_ES_FUNC_ALWAYS_REQUIRED(glGetVertexAttribfv), - GL_ES_FUNC_ALWAYS_REQUIRED(glGetVertexAttribiv), GL_ES_FUNC_ALWAYS_REQUIRED(glIsProgram), - GL_ES_FUNC_ALWAYS_REQUIRED(glIsShader), GL_ES_FUNC_ALWAYS_REQUIRED(glLinkProgram), - GL_ES_FUNC_ALWAYS_REQUIRED(glShaderSource), GL_ES_FUNC_ALWAYS_REQUIRED(glStencilFuncSeparate), + GL_ES_FUNC_ALWAYS_REQUIRED(glGetVertexAttribiv), + GL_ES_FUNC_ALWAYS_REQUIRED(glIsProgram), + GL_ES_FUNC_ALWAYS_REQUIRED(glIsShader), + GL_ES_FUNC_ALWAYS_REQUIRED(glLinkProgram), + GL_ES_FUNC_ALWAYS_REQUIRED(glShaderSource), + GL_ES_FUNC_ALWAYS_REQUIRED(glStencilFuncSeparate), GL_ES_FUNC_ALWAYS_REQUIRED(glStencilMaskSeparate), - GL_ES_FUNC_ALWAYS_REQUIRED(glStencilOpSeparate), GL_ES_FUNC_ALWAYS_REQUIRED(glUniform1f), - GL_ES_FUNC_ALWAYS_REQUIRED(glUniform1fv), GL_ES_FUNC_ALWAYS_REQUIRED(glUniform1i), - GL_ES_FUNC_ALWAYS_REQUIRED(glUniform1iv), GL_ES_FUNC_ALWAYS_REQUIRED(glUniform2f), - GL_ES_FUNC_ALWAYS_REQUIRED(glUniform2fv), GL_ES_FUNC_ALWAYS_REQUIRED(glUniform2i), - GL_ES_FUNC_ALWAYS_REQUIRED(glUniform2iv), GL_ES_FUNC_ALWAYS_REQUIRED(glUniform3f), - GL_ES_FUNC_ALWAYS_REQUIRED(glUniform3fv), GL_ES_FUNC_ALWAYS_REQUIRED(glUniform3i), - GL_ES_FUNC_ALWAYS_REQUIRED(glUniform3iv), GL_ES_FUNC_ALWAYS_REQUIRED(glUniform4f), - GL_ES_FUNC_ALWAYS_REQUIRED(glUniform4fv), GL_ES_FUNC_ALWAYS_REQUIRED(glUniform4i), - GL_ES_FUNC_ALWAYS_REQUIRED(glUniform4iv), GL_ES_FUNC_ALWAYS_REQUIRED(glUniformMatrix2fv), - GL_ES_FUNC_ALWAYS_REQUIRED(glUniformMatrix3fv), GL_ES_FUNC_ALWAYS_REQUIRED(glUniformMatrix4fv), - GL_ES_FUNC_ALWAYS_REQUIRED(glUseProgram), GL_ES_FUNC_ALWAYS_REQUIRED(glValidateProgram), - GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib1f), GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib1fv), - GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib2f), GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib2fv), - GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib3f), GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib3fv), - GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib4f), GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib4fv), - GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttribPointer), GL_ES3_FUNC_ALWAYS_REQUIRED(glDrawBuffers), + GL_ES_FUNC_ALWAYS_REQUIRED(glStencilOpSeparate), + GL_ES_FUNC_ALWAYS_REQUIRED(glUniform1f), + GL_ES_FUNC_ALWAYS_REQUIRED(glUniform1fv), + GL_ES_FUNC_ALWAYS_REQUIRED(glUniform1i), + GL_ES_FUNC_ALWAYS_REQUIRED(glUniform1iv), + GL_ES_FUNC_ALWAYS_REQUIRED(glUniform2f), + GL_ES_FUNC_ALWAYS_REQUIRED(glUniform2fv), + GL_ES_FUNC_ALWAYS_REQUIRED(glUniform2i), + GL_ES_FUNC_ALWAYS_REQUIRED(glUniform2iv), + GL_ES_FUNC_ALWAYS_REQUIRED(glUniform3f), + GL_ES_FUNC_ALWAYS_REQUIRED(glUniform3fv), + GL_ES_FUNC_ALWAYS_REQUIRED(glUniform3i), + GL_ES_FUNC_ALWAYS_REQUIRED(glUniform3iv), + GL_ES_FUNC_ALWAYS_REQUIRED(glUniform4f), + GL_ES_FUNC_ALWAYS_REQUIRED(glUniform4fv), + GL_ES_FUNC_ALWAYS_REQUIRED(glUniform4i), + GL_ES_FUNC_ALWAYS_REQUIRED(glUniform4iv), + GL_ES_FUNC_ALWAYS_REQUIRED(glUniformMatrix2fv), + GL_ES_FUNC_ALWAYS_REQUIRED(glUniformMatrix3fv), + GL_ES_FUNC_ALWAYS_REQUIRED(glUniformMatrix4fv), + GL_ES_FUNC_ALWAYS_REQUIRED(glUseProgram), + GL_ES_FUNC_ALWAYS_REQUIRED(glValidateProgram), + GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib1f), + GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib1fv), + GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib2f), + GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib2fv), + GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib3f), + GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib3fv), + GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib4f), + GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib4fv), + GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttribPointer), + GL_ES3_FUNC_ALWAYS_REQUIRED(glDrawBuffers), // gl_2_1 - GLFUNC_ALWAYS_REQUIRED(glUniformMatrix2x3fv), GLFUNC_ALWAYS_REQUIRED(glUniformMatrix2x4fv), - GLFUNC_ALWAYS_REQUIRED(glUniformMatrix3x2fv), GLFUNC_ALWAYS_REQUIRED(glUniformMatrix3x4fv), - GLFUNC_ALWAYS_REQUIRED(glUniformMatrix4x2fv), GLFUNC_ALWAYS_REQUIRED(glUniformMatrix4x3fv), + GLFUNC_ALWAYS_REQUIRED(glUniformMatrix2x3fv), + GLFUNC_ALWAYS_REQUIRED(glUniformMatrix2x4fv), + GLFUNC_ALWAYS_REQUIRED(glUniformMatrix3x2fv), + GLFUNC_ALWAYS_REQUIRED(glUniformMatrix3x4fv), + GLFUNC_ALWAYS_REQUIRED(glUniformMatrix4x2fv), + GLFUNC_ALWAYS_REQUIRED(glUniformMatrix4x3fv), // gl_3_0 GLFUNC_REQUIRES(glBeginConditionalRender, "VERSION_3_0"), @@ -1412,8 +1677,10 @@ const GLFunc gl_function_array[] = { GLFUNC_REQUIRES(glGetInternalformativ, "VERSION_4_2"), GLFUNC_REQUIRES(glGetActiveAtomicCounterBufferiv, "VERSION_4_2"), GLFUNC_REQUIRES(glBindImageTexture, "VERSION_4_2"), - GLFUNC_REQUIRES(glMemoryBarrier, "VERSION_4_2"), GLFUNC_REQUIRES(glTexStorage1D, "VERSION_4_2"), - GLFUNC_REQUIRES(glTexStorage2D, "VERSION_4_2"), GLFUNC_REQUIRES(glTexStorage3D, "VERSION_4_2"), + GLFUNC_REQUIRES(glMemoryBarrier, "VERSION_4_2"), + GLFUNC_REQUIRES(glTexStorage1D, "VERSION_4_2"), + GLFUNC_REQUIRES(glTexStorage2D, "VERSION_4_2"), + GLFUNC_REQUIRES(glTexStorage3D, "VERSION_4_2"), GLFUNC_REQUIRES(glDrawTransformFeedbackInstanced, "VERSION_4_2"), GLFUNC_REQUIRES(glDrawTransformFeedbackStreamInstanced, "VERSION_4_2"), @@ -1456,7 +1723,8 @@ const GLFunc gl_function_array[] = { GLFUNC_REQUIRES(glDebugMessageCallback, "VERSION_4_3"), GLFUNC_REQUIRES(glGetDebugMessageLog, "VERSION_4_3"), GLFUNC_REQUIRES(glPushDebugGroup, "VERSION_4_3"), - GLFUNC_REQUIRES(glPopDebugGroup, "VERSION_4_3"), GLFUNC_REQUIRES(glObjectLabel, "VERSION_4_3"), + GLFUNC_REQUIRES(glPopDebugGroup, "VERSION_4_3"), + GLFUNC_REQUIRES(glObjectLabel, "VERSION_4_3"), GLFUNC_REQUIRES(glGetObjectLabel, "VERSION_4_3"), GLFUNC_REQUIRES(glObjectPtrLabel, "VERSION_4_3"), GLFUNC_REQUIRES(glGetObjectPtrLabel, "VERSION_4_3"), @@ -1467,7 +1735,8 @@ const GLFunc gl_function_array[] = { GLFUNC_REQUIRES(glClearTexSubImage, "VERSION_4_4"), GLFUNC_REQUIRES(glBindBuffersBase, "VERSION_4_4"), GLFUNC_REQUIRES(glBindBuffersRange, "VERSION_4_4"), - GLFUNC_REQUIRES(glBindTextures, "VERSION_4_4"), GLFUNC_REQUIRES(glBindSamplers, "VERSION_4_4"), + GLFUNC_REQUIRES(glBindTextures, "VERSION_4_4"), + GLFUNC_REQUIRES(glBindSamplers, "VERSION_4_4"), GLFUNC_REQUIRES(glBindImageTextures, "VERSION_4_4"), GLFUNC_REQUIRES(glBindVertexBuffers, "VERSION_4_4"), @@ -1574,7 +1843,8 @@ const GLFunc gl_function_array[] = { GLFUNC_REQUIRES(glGetTextureSubImage, "VERSION_4_5"), GLFUNC_REQUIRES(glGetCompressedTextureSubImage, "VERSION_4_5"), GLFUNC_REQUIRES(glGetGraphicsResetStatus, "VERSION_4_5"), - GLFUNC_REQUIRES(glReadnPixels, "VERSION_4_5"), GLFUNC_REQUIRES(glTextureBarrier, "VERSION_4_5"), + GLFUNC_REQUIRES(glReadnPixels, "VERSION_4_5"), + GLFUNC_REQUIRES(glTextureBarrier, "VERSION_4_5"), // AMD's video driver is trash and doesn't expose these function pointers // Remove them for now until they learn how to implement the spec properly. // GLFUNC_REQUIRES(glGetnCompressedTexImage, "VERSION_4_5"), @@ -2082,8 +2352,11 @@ static void InitExtensionList() { // Can't add NV_primitive_restart since function name changed std::string gl310exts[] = { - "GL_ARB_draw_instanced", "GL_ARB_copy_buffer", "GL_ARB_texture_buffer_object", - "GL_ARB_texture_rectangle", "GL_ARB_uniform_buffer_object", + "GL_ARB_draw_instanced", + "GL_ARB_copy_buffer", + "GL_ARB_texture_buffer_object", + "GL_ARB_texture_rectangle", + "GL_ARB_uniform_buffer_object", //"GL_NV_primitive_restart", "VERSION_3_1", }; @@ -2095,9 +2368,14 @@ static void InitExtensionList() // Quite a lot of these had their names changed when merged in to core // Disable the ones that have std::string gl300exts[] = { - "GL_ARB_map_buffer_range", "GL_ARB_color_buffer_float", "GL_ARB_texture_float", - "GL_ARB_half_float_pixel", "GL_ARB_framebuffer_object", "GL_ARB_texture_float", - "GL_ARB_vertex_array_object", "GL_ARB_depth_buffer_float", + "GL_ARB_map_buffer_range", + "GL_ARB_color_buffer_float", + "GL_ARB_texture_float", + "GL_ARB_half_float_pixel", + "GL_ARB_framebuffer_object", + "GL_ARB_texture_float", + "GL_ARB_vertex_array_object", + "GL_ARB_depth_buffer_float", //"GL_EXT_texture_integer", //"GL_EXT_gpu_shader4", //"GL_APPLE_flush_buffer_range", diff --git a/Source/Core/Common/GL/GLInterface/EGL.cpp b/Source/Core/Common/GL/GLInterface/EGL.cpp index cb767bd2a4..e71b365928 100644 --- a/Source/Core/Common/GL/GLInterface/EGL.cpp +++ b/Source/Core/Common/GL/GLInterface/EGL.cpp @@ -53,7 +53,8 @@ void cInterfaceEGL::DetectMode() EGLint num_configs; bool supportsGL = false, supportsGLES2 = false, supportsGLES3 = false; std::array<int, 3> renderable_types{{ - EGL_OPENGL_BIT, (1 << 6), /* EGL_OPENGL_ES3_BIT_KHR */ + EGL_OPENGL_BIT, + (1 << 6), /* EGL_OPENGL_ES3_BIT_KHR */ EGL_OPENGL_ES2_BIT, }}; @@ -237,7 +238,13 @@ bool cInterfaceEGL::Create(void* window_handle, bool stereo, bool core) if (supports_core_profile && core && s_opengl_mode == GLInterfaceMode::MODE_OPENGL) { std::array<std::pair<int, int>, 7> versions_to_try = {{ - {4, 5}, {4, 4}, {4, 3}, {4, 2}, {4, 1}, {4, 0}, {3, 3}, + {4, 5}, + {4, 4}, + {4, 3}, + {4, 2}, + {4, 1}, + {4, 0}, + {3, 3}, }}; for (const auto& version : versions_to_try) diff --git a/Source/Core/Common/GL/GLInterface/EGL.h b/Source/Core/Common/GL/GLInterface/EGL.h index 16a716e3c2..79c623c942 100644 --- a/Source/Core/Common/GL/GLInterface/EGL.h +++ b/Source/Core/Common/GL/GLInterface/EGL.h @@ -35,6 +35,7 @@ protected: return (EGLNativeWindowType)EGL_DEFAULT_DISPLAY; } virtual void ShutdownPlatform() {} + public: void Swap() override; void SwapInterval(int interval) override; diff --git a/Source/Core/Common/GL/GLInterface/WGL.cpp b/Source/Core/Common/GL/GLInterface/WGL.cpp index 4d4647e838..7758168de5 100644 --- a/Source/Core/Common/GL/GLInterface/WGL.cpp +++ b/Source/Core/Common/GL/GLInterface/WGL.cpp @@ -230,17 +230,26 @@ bool cInterfaceWGL::Create(void* window_handle, bool stereo, bool core) PFD_TYPE_RGBA, // Request An RGBA Format 32, // Select Our Color Depth 0, - 0, 0, 0, 0, 0, // Color Bits Ignored - 0, // 8bit Alpha Buffer - 0, // Shift Bit Ignored - 0, // No Accumulation Buffer - 0, 0, 0, 0, // Accumulation Bits Ignored + 0, + 0, + 0, + 0, + 0, // Color Bits Ignored + 0, // 8bit Alpha Buffer + 0, // Shift Bit Ignored + 0, // No Accumulation Buffer + 0, + 0, + 0, + 0, // Accumulation Bits Ignored 0, // 0Bit Z-Buffer (Depth Buffer) 0, // 0bit Stencil Buffer 0, // No Auxiliary Buffer PFD_MAIN_PLANE, // Main Drawing Layer 0, // Reserved - 0, 0, 0 // Layer Masks Ignored + 0, + 0, + 0 // Layer Masks Ignored }; m_dc = GetDC(m_window_handle); @@ -358,22 +367,22 @@ HGLRC cInterfaceWGL::CreateCoreContext(HDC dc, HGLRC share_context) for (const auto& version : try_versions) { // Construct list of attributes. Prefer a forward-compatible, core context. - std::array<int, 5 * 2> attribs = { - WGL_CONTEXT_PROFILE_MASK_ARB, - WGL_CONTEXT_CORE_PROFILE_BIT_ARB, + std::array<int, 5 * 2> attribs = {WGL_CONTEXT_PROFILE_MASK_ARB, + WGL_CONTEXT_CORE_PROFILE_BIT_ARB, #ifdef _DEBUG - WGL_CONTEXT_FLAGS_ARB, - WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB | WGL_CONTEXT_DEBUG_BIT_ARB, + WGL_CONTEXT_FLAGS_ARB, + WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB | + WGL_CONTEXT_DEBUG_BIT_ARB, #else - WGL_CONTEXT_FLAGS_ARB, - WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB, + WGL_CONTEXT_FLAGS_ARB, + WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB, #endif - WGL_CONTEXT_MAJOR_VERSION_ARB, - version.first, - WGL_CONTEXT_MINOR_VERSION_ARB, - version.second, - 0, - 0}; + WGL_CONTEXT_MAJOR_VERSION_ARB, + version.first, + WGL_CONTEXT_MINOR_VERSION_ARB, + version.second, + 0, + 0}; // Attempt creating this context. HGLRC core_context = wglCreateContextAttribsARB(dc, nullptr, attribs.data()); diff --git a/Source/Core/Common/GekkoDisassembler.cpp b/Source/Core/Common/GekkoDisassembler.cpp index 3fab6c86b6..e1681d4170 100644 --- a/Source/Core/Common/GekkoDisassembler.cpp +++ b/Source/Core/Common/GekkoDisassembler.cpp @@ -967,7 +967,7 @@ void GekkoDisassembler::mtfsb(u32 in, int n) } } -// Paired instructions + // Paired instructions #define RA ((inst >> 16) & 0x1f) #define RB ((inst >> 11) & 0x1f) diff --git a/Source/Core/Common/IniFile.h b/Source/Core/Common/IniFile.h index faff71164f..697e700e7e 100644 --- a/Source/Core/Common/IniFile.h +++ b/Source/Core/Common/IniFile.h @@ -76,6 +76,7 @@ public: const std::string& GetName() const { return name; } const SectionMap& GetValues() const { return values; } bool HasLines() const { return !m_lines.empty(); } + protected: std::string name; @@ -142,6 +143,7 @@ public: static void ParseLine(const std::string& line, std::string* keyOut, std::string* valueOut); const std::list<Section>& GetSections() const { return sections; } + private: std::list<Section> sections; diff --git a/Source/Core/Common/Intrinsics.h b/Source/Core/Common/Intrinsics.h index 3e3fdb5d29..7e9ca57c76 100644 --- a/Source/Core/Common/Intrinsics.h +++ b/Source/Core/Common/Intrinsics.h @@ -25,7 +25,7 @@ * When building with -march=native, or enabling the instruction sets in the compile flags, permit * usage of the instrinsics without any function attributes. If the command-line architecture does * not support this instruction set, enable it via function targeting. -*/ + */ #include <x86intrin.h> #ifndef __SSE4_2__ diff --git a/Source/Core/Common/Lazy.h b/Source/Core/Common/Lazy.h index f19d5187cb..3e9a79147a 100644 --- a/Source/Core/Common/Lazy.h +++ b/Source/Core/Common/Lazy.h @@ -35,6 +35,7 @@ public: const T* operator->() const { return ComputeValue(); } T& operator*() { return *ComputeValue(); } T* operator->() { return ComputeValue(); } + private: T* ComputeValue() const { diff --git a/Source/Core/Common/Logging/LogManager.cpp b/Source/Core/Common/Logging/LogManager.cpp index 7d910b3a8b..cd66d23944 100644 --- a/Source/Core/Common/Logging/LogManager.cpp +++ b/Source/Core/Common/Logging/LogManager.cpp @@ -48,6 +48,7 @@ public: bool IsValid() const { return m_logfile.good(); } bool IsEnabled() const { return m_enable; } void SetEnable(bool enable) { m_enable = enable; } + private: std::mutex m_log_lock; std::ofstream m_logfile; diff --git a/Source/Core/Common/Profiler.h b/Source/Core/Common/Profiler.h index bbf4af7f9e..7e0dcb85bd 100644 --- a/Source/Core/Common/Profiler.h +++ b/Source/Core/Common/Profiler.h @@ -51,6 +51,7 @@ class ProfilerExecuter public: ProfilerExecuter(Profiler* _p) : m_p(_p) { m_p->Start(); } ~ProfilerExecuter() { m_p->Stop(); } + private: Profiler* m_p; }; diff --git a/Source/Core/Common/QoSSession.h b/Source/Core/Common/QoSSession.h index 0f54e1d3d7..c29aab9f5f 100644 --- a/Source/Core/Common/QoSSession.h +++ b/Source/Core/Common/QoSSession.h @@ -27,6 +27,7 @@ public: QoSSession& operator=(QoSSession&& session); QoSSession(QoSSession&& session) { *this = std::move(session); } bool Successful() const { return m_success; } + private: #if defined(_WIN32) void* m_qos_handle = nullptr; diff --git a/Source/Core/Common/Result.h b/Source/Core/Common/Result.h index 2c4f47b3d7..6419c43168 100644 --- a/Source/Core/Common/Result.h +++ b/Source/Core/Common/Result.h @@ -24,6 +24,7 @@ public: const T* operator->() const { return &std::get<T>(m_variant); } T& operator*() { return std::get<T>(m_variant); } T* operator->() { return &std::get<T>(m_variant); } + private: std::variant<ResultCode, T> m_variant; }; diff --git a/Source/Core/Common/SDCardUtil.cpp b/Source/Core/Common/SDCardUtil.cpp index 77c4f00316..3c0d4e6733 100644 --- a/Source/Core/Common/SDCardUtil.cpp +++ b/Source/Core/Common/SDCardUtil.cpp @@ -233,17 +233,17 @@ bool SDCardCreate(u64 disk_size /*in MB*/, const std::string& filename) } /* Here's the layout: - * - * boot_sector - * fsinfo_sector - * empty - * backup boot sector - * backup fsinfo sector - * RESERVED_SECTORS - 4 empty sectors (if backup sectors), or RESERVED_SECTORS - 2 (if no backup) - * first fat - * second fat - * zero sectors - */ + * + * boot_sector + * fsinfo_sector + * empty + * backup boot sector + * backup fsinfo sector + * RESERVED_SECTORS - 4 empty sectors (if backup sectors), or RESERVED_SECTORS - 2 (if no backup) + * first fat + * second fat + * zero sectors + */ if (write_sector(f, s_boot_sector)) goto FailWrite; diff --git a/Source/Core/Common/Semaphore.h b/Source/Core/Common/Semaphore.h index 1d1810a5f0..0c48d2fb4d 100644 --- a/Source/Core/Common/Semaphore.h +++ b/Source/Core/Common/Semaphore.h @@ -24,6 +24,7 @@ public: ~Semaphore() { CloseHandle(m_handle); } void Wait() { WaitForSingleObject(m_handle, INFINITE); } void Post() { ReleaseSemaphore(m_handle, 1, nullptr); } + private: HANDLE m_handle; }; @@ -42,6 +43,7 @@ public: ~Semaphore() { sem_destroy(&m_handle); } void Wait() { sem_wait(&m_handle); } void Post() { sem_post(&m_handle); } + private: sem_t m_handle; }; diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index 4216d0f6f6..cc1ffaa949 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -307,7 +307,7 @@ bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _ #ifdef _WIN32 ":" #endif - ); + ); if (std::string::npos == dir_end) dir_end = 0; else diff --git a/Source/Core/Common/x64Emitter.cpp b/Source/Core/Common/x64Emitter.cpp index 2bbd0a5990..70111ab710 100644 --- a/Source/Core/Common/x64Emitter.cpp +++ b/Source/Core/Common/x64Emitter.cpp @@ -248,7 +248,7 @@ void OpArg::WriteRest(XEmitter* emit, int extraBytes, X64Reg _operandReg, bool warn_64bit_offset) const { if (_operandReg == INVALID_REG) - _operandReg = (X64Reg) this->operandReg; + _operandReg = (X64Reg)this->operandReg; int mod = 0; int ireg = indexReg; bool SIB = false; diff --git a/Source/Core/Core/Boot/DolReader.h b/Source/Core/Core/Boot/DolReader.h index 38f6616ccb..e8a05f771c 100644 --- a/Source/Core/Core/Boot/DolReader.h +++ b/Source/Core/Core/Boot/DolReader.h @@ -28,6 +28,7 @@ public: u32 GetEntryPoint() const override { return m_dolheader.entryPoint; } bool LoadIntoMemory(bool only_in_mem1 = false) const override; bool LoadSymbols() const override { return false; } + private: enum { diff --git a/Source/Core/Core/Boot/ElfReader.h b/Source/Core/Core/Boot/ElfReader.h index d9ffa78345..5d0cfc353a 100644 --- a/Source/Core/Core/Boot/ElfReader.h +++ b/Source/Core/Core/Boot/ElfReader.h @@ -63,6 +63,7 @@ public: SectionID GetSectionByName(const char* name, int firstSection = 0) const; //-1 for not found bool DidRelocate() const { return bRelocate; } + private: void Initialize(u8* bytes); diff --git a/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp b/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp index a4bf157df9..7b92427749 100644 --- a/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp +++ b/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp @@ -23,57 +23,89 @@ bool IsSettingSaveable(const Config::ConfigLocation& config_location) const static std::vector<Config::ConfigLocation> s_setting_saveable{ // Graphics.Hardware - Config::GFX_VSYNC.location, Config::GFX_ADAPTER.location, + Config::GFX_VSYNC.location, + Config::GFX_ADAPTER.location, // Graphics.Settings - Config::GFX_WIDESCREEN_HACK.location, Config::GFX_ASPECT_RATIO.location, - Config::GFX_CROP.location, Config::GFX_SAFE_TEXTURE_CACHE_COLOR_SAMPLES.location, - Config::GFX_SHOW_FPS.location, Config::GFX_SHOW_NETPLAY_PING.location, - Config::GFX_SHOW_NETPLAY_MESSAGES.location, Config::GFX_LOG_RENDER_TIME_TO_FILE.location, - Config::GFX_OVERLAY_STATS.location, Config::GFX_OVERLAY_PROJ_STATS.location, - Config::GFX_DUMP_TEXTURES.location, Config::GFX_HIRES_TEXTURES.location, - Config::GFX_CACHE_HIRES_TEXTURES.location, Config::GFX_DUMP_EFB_TARGET.location, - Config::GFX_DUMP_FRAMES_AS_IMAGES.location, Config::GFX_FREE_LOOK.location, - Config::GFX_USE_FFV1.location, Config::GFX_DUMP_FORMAT.location, - Config::GFX_DUMP_CODEC.location, Config::GFX_DUMP_ENCODER.location, - Config::GFX_DUMP_PATH.location, Config::GFX_BITRATE_KBPS.location, + Config::GFX_WIDESCREEN_HACK.location, + Config::GFX_ASPECT_RATIO.location, + Config::GFX_CROP.location, + Config::GFX_SAFE_TEXTURE_CACHE_COLOR_SAMPLES.location, + Config::GFX_SHOW_FPS.location, + Config::GFX_SHOW_NETPLAY_PING.location, + Config::GFX_SHOW_NETPLAY_MESSAGES.location, + Config::GFX_LOG_RENDER_TIME_TO_FILE.location, + Config::GFX_OVERLAY_STATS.location, + Config::GFX_OVERLAY_PROJ_STATS.location, + Config::GFX_DUMP_TEXTURES.location, + Config::GFX_HIRES_TEXTURES.location, + Config::GFX_CACHE_HIRES_TEXTURES.location, + Config::GFX_DUMP_EFB_TARGET.location, + Config::GFX_DUMP_FRAMES_AS_IMAGES.location, + Config::GFX_FREE_LOOK.location, + Config::GFX_USE_FFV1.location, + Config::GFX_DUMP_FORMAT.location, + Config::GFX_DUMP_CODEC.location, + Config::GFX_DUMP_ENCODER.location, + Config::GFX_DUMP_PATH.location, + Config::GFX_BITRATE_KBPS.location, Config::GFX_INTERNAL_RESOLUTION_FRAME_DUMPS.location, - Config::GFX_ENABLE_GPU_TEXTURE_DECODING.location, Config::GFX_ENABLE_PIXEL_LIGHTING.location, - Config::GFX_FAST_DEPTH_CALC.location, Config::GFX_MSAA.location, Config::GFX_SSAA.location, - Config::GFX_EFB_SCALE.location, Config::GFX_TEXFMT_OVERLAY_ENABLE.location, - Config::GFX_TEXFMT_OVERLAY_CENTER.location, Config::GFX_ENABLE_WIREFRAME.location, - Config::GFX_DISABLE_FOG.location, Config::GFX_BORDERLESS_FULLSCREEN.location, - Config::GFX_ENABLE_VALIDATION_LAYER.location, Config::GFX_BACKEND_MULTITHREADING.location, - Config::GFX_COMMAND_BUFFER_EXECUTE_INTERVAL.location, Config::GFX_SHADER_CACHE.location, + Config::GFX_ENABLE_GPU_TEXTURE_DECODING.location, + Config::GFX_ENABLE_PIXEL_LIGHTING.location, + Config::GFX_FAST_DEPTH_CALC.location, + Config::GFX_MSAA.location, + Config::GFX_SSAA.location, + Config::GFX_EFB_SCALE.location, + Config::GFX_TEXFMT_OVERLAY_ENABLE.location, + Config::GFX_TEXFMT_OVERLAY_CENTER.location, + Config::GFX_ENABLE_WIREFRAME.location, + Config::GFX_DISABLE_FOG.location, + Config::GFX_BORDERLESS_FULLSCREEN.location, + Config::GFX_ENABLE_VALIDATION_LAYER.location, + Config::GFX_BACKEND_MULTITHREADING.location, + Config::GFX_COMMAND_BUFFER_EXECUTE_INTERVAL.location, + Config::GFX_SHADER_CACHE.location, Config::GFX_WAIT_FOR_SHADERS_BEFORE_STARTING.location, - Config::GFX_SHADER_COMPILATION_MODE.location, Config::GFX_SHADER_COMPILER_THREADS.location, + Config::GFX_SHADER_COMPILATION_MODE.location, + Config::GFX_SHADER_COMPILER_THREADS.location, Config::GFX_SHADER_PRECOMPILER_THREADS.location, - Config::GFX_SW_ZCOMPLOC.location, Config::GFX_SW_ZFREEZE.location, - Config::GFX_SW_DUMP_OBJECTS.location, Config::GFX_SW_DUMP_TEV_STAGES.location, - Config::GFX_SW_DUMP_TEV_TEX_FETCHES.location, Config::GFX_SW_DRAW_START.location, + Config::GFX_SW_ZCOMPLOC.location, + Config::GFX_SW_ZFREEZE.location, + Config::GFX_SW_DUMP_OBJECTS.location, + Config::GFX_SW_DUMP_TEV_STAGES.location, + Config::GFX_SW_DUMP_TEV_TEX_FETCHES.location, + Config::GFX_SW_DRAW_START.location, Config::GFX_SW_DRAW_END.location, // Graphics.Enhancements - Config::GFX_ENHANCE_FORCE_FILTERING.location, Config::GFX_ENHANCE_MAX_ANISOTROPY.location, - Config::GFX_ENHANCE_POST_SHADER.location, Config::GFX_ENHANCE_FORCE_TRUE_COLOR.location, + Config::GFX_ENHANCE_FORCE_FILTERING.location, + Config::GFX_ENHANCE_MAX_ANISOTROPY.location, + Config::GFX_ENHANCE_POST_SHADER.location, + Config::GFX_ENHANCE_FORCE_TRUE_COLOR.location, // Graphics.Stereoscopy - Config::GFX_STEREO_MODE.location, Config::GFX_STEREO_DEPTH.location, - Config::GFX_STEREO_CONVERGENCE_PERCENTAGE.location, Config::GFX_STEREO_SWAP_EYES.location, - Config::GFX_STEREO_CONVERGENCE.location, Config::GFX_STEREO_EFB_MONO_DEPTH.location, + Config::GFX_STEREO_MODE.location, + Config::GFX_STEREO_DEPTH.location, + Config::GFX_STEREO_CONVERGENCE_PERCENTAGE.location, + Config::GFX_STEREO_SWAP_EYES.location, + Config::GFX_STEREO_CONVERGENCE.location, + Config::GFX_STEREO_EFB_MONO_DEPTH.location, Config::GFX_STEREO_DEPTH_PERCENTAGE.location, // Graphics.Hacks - Config::GFX_HACK_EFB_ACCESS_ENABLE.location, Config::GFX_HACK_BBOX_ENABLE.location, + Config::GFX_HACK_EFB_ACCESS_ENABLE.location, + Config::GFX_HACK_BBOX_ENABLE.location, Config::GFX_HACK_BBOX_PREFER_STENCIL_IMPLEMENTATION.location, - Config::GFX_HACK_FORCE_PROGRESSIVE.location, Config::GFX_HACK_SKIP_EFB_COPY_TO_RAM.location, + Config::GFX_HACK_FORCE_PROGRESSIVE.location, + Config::GFX_HACK_SKIP_EFB_COPY_TO_RAM.location, Config::GFX_HACK_SKIP_XFB_COPY_TO_RAM.location, - Config::GFX_HACK_DISABLE_COPY_TO_VRAM.location, Config::GFX_HACK_IMMEDIATE_XFB.location, + Config::GFX_HACK_DISABLE_COPY_TO_VRAM.location, + Config::GFX_HACK_IMMEDIATE_XFB.location, Config::GFX_HACK_COPY_EFB_SCALED.location, Config::GFX_HACK_EFB_EMULATE_FORMAT_CHANGES.location, Config::GFX_HACK_VERTEX_ROUDING.location, diff --git a/Source/Core/Core/CoreTiming.cpp b/Source/Core/Core/CoreTiming.cpp index c462789b67..018f1410cb 100644 --- a/Source/Core/Core/CoreTiming.cpp +++ b/Source/Core/Core/CoreTiming.cpp @@ -260,8 +260,9 @@ void ScheduleEvent(s64 cycles_into_future, EventType* event_type, u64 userdata, { if (Core::WantsDeterminism()) { - ERROR_LOG(POWERPC, "Someone scheduled an off-thread \"%s\" event while netplay or " - "movie play/record was active. This is likely to cause a desync.", + ERROR_LOG(POWERPC, + "Someone scheduled an off-thread \"%s\" event while netplay or " + "movie play/record was active. This is likely to cause a desync.", event_type->name->c_str()); } diff --git a/Source/Core/Core/DSP/DSPAssembler.cpp b/Source/Core/Core/DSP/DSPAssembler.cpp index d4c8f45667..e6b8106b9f 100644 --- a/Source/Core/Core/DSP/DSPAssembler.cpp +++ b/Source/Core/Core/DSP/DSPAssembler.cpp @@ -524,8 +524,9 @@ bool DSPAssembler::VerifyParams(const DSPOPCTemplate* opc, param_t* par, size_t if (par[i].val >= 0x1e && par[i].val <= 0x1f) { fprintf(stderr, "%i : %s ", code_line, cur_line.c_str()); - fprintf(stderr, "WARNING: $ACM%d register used instead of $ACC%d register Line: %d " - "Param: %zu Ext: %d\n", + fprintf(stderr, + "WARNING: $ACM%d register used instead of $ACC%d register Line: %d " + "Param: %zu Ext: %d\n", (par[i].val & 1), (par[i].val & 1), code_line, current_param, static_cast<int>(type)); } diff --git a/Source/Core/Core/DSP/DSPAssembler.h b/Source/Core/Core/DSP/DSPAssembler.h index 0ea0a413a2..8e2d0664f1 100644 --- a/Source/Core/Core/DSP/DSPAssembler.h +++ b/Source/Core/Core/DSP/DSPAssembler.h @@ -63,6 +63,7 @@ public: std::string GetErrorString() const { return last_error_str; } AssemblerError GetError() const { return last_error; } + private: struct param_t { diff --git a/Source/Core/Core/DSP/DSPBreakpoints.h b/Source/Core/Core/DSP/DSPBreakpoints.h index 059fd5c246..6e0c4b8c2d 100644 --- a/Source/Core/Core/DSP/DSPBreakpoints.h +++ b/Source/Core/Core/DSP/DSPBreakpoints.h @@ -43,6 +43,7 @@ public: void Clear() { memset(b, 0, sizeof(b)); } void DeleteByAddress(u32 addr) { b[addr] = 0; } + private: u8 b[65536]; }; diff --git a/Source/Core/Core/GeckoCode.cpp b/Source/Core/Core/GeckoCode.cpp index 66e5a0c8c6..c66d779156 100644 --- a/Source/Core/Core/GeckoCode.cpp +++ b/Source/Core/Core/GeckoCode.cpp @@ -139,8 +139,9 @@ static Installation InstallCodeHandlerLocked() // If the code is not going to fit in the space we have left then we have to skip it if (next_address + active_code.codes.size() * CODE_SIZE > end_address) { - NOTICE_LOG(ACTIONREPLAY, "Too many GeckoCodes! Ran out of storage space in Game RAM. Could " - "not write: \"%s\". Need %zu bytes, only %u remain.", + NOTICE_LOG(ACTIONREPLAY, + "Too many GeckoCodes! Ran out of storage space in Game RAM. Could " + "not write: \"%s\". Need %zu bytes, only %u remain.", active_code.name.c_str(), active_code.codes.size() * CODE_SIZE, end_address - next_address); continue; @@ -238,8 +239,9 @@ void RunCodeHandler() PowerPC::HostWrite_U64(riPS0(i), SP + 24 + 2 * i * sizeof(u64)); PowerPC::HostWrite_U64(riPS1(i), SP + 24 + (2 * i + 1) * sizeof(u64)); } - DEBUG_LOG(ACTIONREPLAY, "GeckoCodes: Initiating phantom branch-and-link. " - "PC = 0x%08X, SP = 0x%08X, SFP = 0x%08X", + DEBUG_LOG(ACTIONREPLAY, + "GeckoCodes: Initiating phantom branch-and-link. " + "PC = 0x%08X, SP = 0x%08X, SFP = 0x%08X", PC, SP, SFP); LR = HLE_TRAMPOLINE_ADDRESS; PC = NPC = ENTRY_POINT; diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp index 74a61073ef..5abca20d98 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp @@ -117,8 +117,8 @@ void AXUCode::HandleCommandList() switch (cmd) { - // Some of these commands are unknown, or unused in this AX HLE. - // We still need to skip their arguments using "curr_idx += N". + // Some of these commands are unknown, or unused in this AX HLE. + // We still need to skip their arguments using "curr_idx += N". case CMD_SETUP: addr_hi = m_cmdlist[curr_idx++]; diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h b/Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h index f061848fac..e56f001c68 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h @@ -460,8 +460,8 @@ void ProcessVoice(PB_TYPE& pb, const AXBuffers& buffers, u16 count, AXMixControl pb.lpf.yn1 = LowPassFilter(samples, count, pb.lpf.yn1, pb.lpf.a0, pb.lpf.b0); } -// Mix LRS, AUXA and AUXB depending on mixer_control -// TODO: Handle DPL2 on AUXB. + // Mix LRS, AUXA and AUXB depending on mixer_control + // TODO: Handle DPL2 on AUXB. #define MIX_ON(C) (0 != (mctrl & MIX_##C)) #define RAMP_ON(C) (0 != (mctrl & MIX_##C##_RAMP)) diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp index 4c77f35224..2429b648d1 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp @@ -59,8 +59,8 @@ void AXWiiUCode::HandleCommandList() { switch (cmd) { - // Some of these commands are unknown, or unused in this AX HLE. - // We still need to skip their arguments using "curr_idx += N". + // Some of these commands are unknown, or unused in this AX HLE. + // We still need to skip their arguments using "curr_idx += N". case CMD_SETUP_OLD: addr_hi = m_cmdlist[curr_idx++]; @@ -156,8 +156,8 @@ void AXWiiUCode::HandleCommandList() { switch (cmd) { - // Some of these commands are unknown, or unused in this AX HLE. - // We still need to skip their arguments using "curr_idx += N". + // Some of these commands are unknown, or unused in this AX HLE. + // We still need to skip their arguments using "curr_idx += N". case CMD_SETUP: addr_hi = m_cmdlist[curr_idx++]; diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp index 230d8900ff..72a3f86b3c 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp @@ -66,8 +66,9 @@ void ProcessGBACrypto(u32 address) HLEMemory_Write_U32(dest_addr + 4, t3); // Done! - DEBUG_LOG(DSPHLE, "\n%08x -> challenge: %08x, len: %08x, dest_addr: %08x, " - "palette: %08x, speed: %08x key: %08x, auth_code: %08x", + DEBUG_LOG(DSPHLE, + "\n%08x -> challenge: %08x, len: %08x, dest_addr: %08x, " + "palette: %08x, speed: %08x key: %08x, auth_code: %08x", address, challenge, length, dest_addr, logo_palette, logo_speed_32, key, t3); } diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h index 07dc0f3e1d..88594296dd 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h @@ -51,6 +51,7 @@ public: virtual void DoState(PointerWrap& p) { DoStateShared(p); } static u32 GetCRC(UCodeInterface* ucode) { return ucode ? ucode->m_crc : UCODE_NULL; } + protected: void PrepareBootUCode(u32 mail); diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp index 0ad5d6a318..4dc60770a5 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp @@ -1035,10 +1035,15 @@ void ZeldaAudioRenderer::ApplyReverb(bool post_rendering) // Each of the 4 RPBs maps to one of these buffers. MixingBuffer* reverb_buffers[4] = { - &m_buf_unk0_reverb, &m_buf_unk1_reverb, &m_buf_front_left_reverb, &m_buf_front_right_reverb, + &m_buf_unk0_reverb, + &m_buf_unk1_reverb, + &m_buf_front_left_reverb, + &m_buf_front_right_reverb, }; std::array<s16, 8>* last8_samples_buffers[4] = { - &m_buf_unk0_reverb_last8, &m_buf_unk1_reverb_last8, &m_buf_front_left_reverb_last8, + &m_buf_unk0_reverb_last8, + &m_buf_unk1_reverb_last8, + &m_buf_front_left_reverb_last8, &m_buf_front_right_reverb_last8, }; diff --git a/Source/Core/Core/HW/DVD/DVDInterface.cpp b/Source/Core/Core/HW/DVD/DVDInterface.cpp index c5cdf54753..54469fee68 100644 --- a/Source/Core/Core/HW/DVD/DVDInterface.cpp +++ b/Source/Core/Core/HW/DVD/DVDInterface.cpp @@ -318,8 +318,9 @@ static u32 AdvanceDTK(u32 maximum_samples, u32* samples_to_process) { if (s_audio_position >= s_current_start + s_current_length) { - DEBUG_LOG(DVDINTERFACE, "AdvanceDTK: NextStart=%08" PRIx64 ", NextLength=%08x, " - "CurrentStart=%08" PRIx64 ", CurrentLength=%08x, AudioPos=%08" PRIx64, + DEBUG_LOG(DVDINTERFACE, + "AdvanceDTK: NextStart=%08" PRIx64 ", NextLength=%08x, " + "CurrentStart=%08" PRIx64 ", CurrentLength=%08x, AudioPos=%08" PRIx64, s_next_start, s_next_length, s_current_start, s_current_length, s_audio_position); s_audio_position = s_next_start; @@ -825,8 +826,9 @@ void ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, u32 output_addr { u64 iDVDOffset = (u64)command_1 << 2; - INFO_LOG(DVDINTERFACE, "Read: DVDOffset=%08" PRIx64 - ", DMABuffer = %08x, SrcLength = %08x, DMALength = %08x", + INFO_LOG(DVDINTERFACE, + "Read: DVDOffset=%08" PRIx64 + ", DMABuffer = %08x, SrcLength = %08x, DMALength = %08x", iDVDOffset, output_address, command_2, output_length); command_handled_by_thread = @@ -948,9 +950,10 @@ void ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, u32 output_addr switch (command_0 >> 16 & 0xFF) { case 0x00: // Returns streaming status - INFO_LOG(DVDINTERFACE, "(Audio): Stream Status: Request Audio status " - "AudioPos:%08" PRIx64 "/%08" PRIx64 " " - "CurrentStart:%08" PRIx64 " CurrentLength:%08x", + INFO_LOG(DVDINTERFACE, + "(Audio): Stream Status: Request Audio status " + "AudioPos:%08" PRIx64 "/%08" PRIx64 " " + "CurrentStart:%08" PRIx64 " CurrentLength:%08x", s_audio_position, s_current_start + s_current_length, s_current_start, s_current_length); WriteImmediate(s_stream ? 1 : 0, output_address, reply_to_ios); @@ -1295,8 +1298,9 @@ void ScheduleReads(u64 offset, u32 length, const DiscIO::Partition& partition, u s_read_buffer_end_offset - s_read_buffer_start_offset, wii_disc)); } - DEBUG_LOG(DVDINTERFACE, "Schedule reads: ECC blocks unbuffered=%d, buffered=%d, " - "ticks=%" PRId64 ", time=%" PRId64 " us", + DEBUG_LOG(DVDINTERFACE, + "Schedule reads: ECC blocks unbuffered=%d, buffered=%d, " + "ticks=%" PRId64 ", time=%" PRId64 " us", unbuffered_blocks, buffered_blocks, ticks_until_completion, ticks_until_completion * 1000000 / SystemTimers::GetTicksPerSecond()); } diff --git a/Source/Core/Core/HW/DVD/DVDThread.cpp b/Source/Core/Core/HW/DVD/DVDThread.cpp index 762b07c01d..3198d120c5 100644 --- a/Source/Core/Core/HW/DVD/DVDThread.cpp +++ b/Source/Core/Core/HW/DVD/DVDThread.cpp @@ -311,9 +311,10 @@ static void FinishRead(u64 id, s64 cycles_late) const ReadRequest& request = result.first; const std::vector<u8>& buffer = result.second; - DEBUG_LOG(DVDINTERFACE, "Disc has been read. Real time: %" PRIu64 " us. " - "Real time including delay: %" PRIu64 " us. " - "Emulated time including delay: %" PRIu64 " us.", + DEBUG_LOG(DVDINTERFACE, + "Disc has been read. Real time: %" PRIu64 " us. " + "Real time including delay: %" PRIu64 " us. " + "Emulated time including delay: %" PRIu64 " us.", request.realtime_done_us - request.realtime_started_us, Common::Timer::GetTimeUs() - request.realtime_started_us, (CoreTiming::GetTicks() - request.time_started_ticks) / diff --git a/Source/Core/Core/HW/GCMemcard/GCMemcard.h b/Source/Core/Core/HW/GCMemcard/GCMemcard.h index 1e7bea5027..54247316dc 100644 --- a/Source/Core/Core/HW/GCMemcard/GCMemcard.h +++ b/Source/Core/Core/HW/GCMemcard/GCMemcard.h @@ -81,6 +81,7 @@ public: virtual void DoState(PointerWrap& p) = 0; u32 GetCardId() const { return m_nintendo_card_id; } bool IsAddressInBounds(u32 address) const { return address <= (m_memory_card_size - 1); } + protected: int m_card_index; u16 m_nintendo_card_id; diff --git a/Source/Core/Core/HW/GCPadEmu.cpp b/Source/Core/Core/HW/GCPadEmu.cpp index f8f8c47d54..5a2ee3a018 100644 --- a/Source/Core/Core/HW/GCPadEmu.cpp +++ b/Source/Core/Core/HW/GCPadEmu.cpp @@ -27,7 +27,8 @@ static const u16 button_bitmasks[] = { }; static const u16 trigger_bitmasks[] = { - PAD_TRIGGER_L, PAD_TRIGGER_R, + PAD_TRIGGER_L, + PAD_TRIGGER_R, }; static const u16 dpad_bitmasks[] = {PAD_BUTTON_UP, PAD_BUTTON_DOWN, PAD_BUTTON_LEFT, diff --git a/Source/Core/Core/HW/MMIO.cpp b/Source/Core/Core/HW/MMIO.cpp index e8f3bd88d9..52e6579a2c 100644 --- a/Source/Core/Core/HW/MMIO.cpp +++ b/Source/Core/Core/HW/MMIO.cpp @@ -148,8 +148,9 @@ private: std::function<T(u32)> InvalidReadLambda() const { return [](u32) { - DEBUG_ASSERT_MSG(MEMMAP, 0, "Called the read lambda on a write " - "complex handler."); + DEBUG_ASSERT_MSG(MEMMAP, 0, + "Called the read lambda on a write " + "complex handler."); return 0; }; } @@ -157,8 +158,9 @@ private: std::function<void(u32, T)> InvalidWriteLambda() const { return [](u32, T) { - DEBUG_ASSERT_MSG(MEMMAP, 0, "Called the write lambda on a read " - "complex handler."); + DEBUG_ASSERT_MSG(MEMMAP, 0, + "Called the write lambda on a read " + "complex handler."); }; } diff --git a/Source/Core/Core/HW/MMIO.h b/Source/Core/Core/HW/MMIO.h index d5376dbc56..c49e360534 100644 --- a/Source/Core/Core/HW/MMIO.h +++ b/Source/Core/Core/HW/MMIO.h @@ -62,9 +62,10 @@ inline bool IsMMIOAddress(u32 address) // The block ID can easily be computed by simply checking bit 24 (CC vs. CD). inline u32 UniqueID(u32 address) { - DEBUG_ASSERT_MSG(MEMMAP, ((address & 0xFFFF0000) == 0x0C000000) || - ((address & 0xFFFF0000) == 0x0D000000) || - ((address & 0xFFFF0000) == 0x0D800000), + DEBUG_ASSERT_MSG(MEMMAP, + ((address & 0xFFFF0000) == 0x0C000000) || + ((address & 0xFFFF0000) == 0x0D000000) || + ((address & 0xFFFF0000) == 0x0D800000), "Trying to get the ID of a non-existing MMIO address."); return (((address >> 24) & 1) << 16) | (address & 0xFFFF); diff --git a/Source/Core/Core/HW/VideoInterface.cpp b/Source/Core/Core/HW/VideoInterface.cpp index 46575ed2de..e25e70f628 100644 --- a/Source/Core/Core/HW/VideoInterface.cpp +++ b/Source/Core/Core/HW/VideoInterface.cpp @@ -61,7 +61,8 @@ static UVIBorderBlankRegister m_BorderHBlank; static u32 s_target_refresh_rate = 0; static constexpr std::array<u32, 2> s_clock_freqs{{ - 27000000, 54000000, + 27000000, + 54000000, }}; static u64 s_ticks_last_line_start; // number of ticks when the current full scanline started @@ -323,10 +324,9 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base) })); mmio->Register( base | VI_HORIZONTAL_BEAM_POSITION, MMIO::ComplexRead<u16>([](u32) { - u16 value = - static_cast<u16>(1 + - m_HTiming0.HLW * (CoreTiming::GetTicks() - s_ticks_last_line_start) / - (GetTicksPerHalfLine())); + u16 value = static_cast<u16>(1 + m_HTiming0.HLW * + (CoreTiming::GetTicks() - s_ticks_last_line_start) / + (GetTicksPerHalfLine())); return MathUtil::Clamp(value, static_cast<u16>(1), static_cast<u16>(m_HTiming0.HLW * 2)); }), MMIO::ComplexWrite<u16>([](u32, u16 val) { @@ -644,13 +644,15 @@ static void LogField(FieldType field, u32 xfb_address) static constexpr std::array<const char*, 2> field_type_names{{"Odd", "Even"}}; static const std::array<const UVIVBlankTimingRegister*, 2> vert_timing{{ - &m_VBlankTimingOdd, &m_VBlankTimingEven, + &m_VBlankTimingOdd, + &m_VBlankTimingEven, }}; const auto field_index = static_cast<size_t>(field); - DEBUG_LOG(VIDEOINTERFACE, "(VI->BeginField): Address: %.08X | WPL %u | STD %u | EQ %u | PRB %u | " - "ACV %u | PSB %u | Field %s", + DEBUG_LOG(VIDEOINTERFACE, + "(VI->BeginField): Address: %.08X | WPL %u | STD %u | EQ %u | PRB %u | " + "ACV %u | PSB %u | Field %s", xfb_address, m_PictureConfiguration.WPL, m_PictureConfiguration.STD, m_VerticalTimingRegister.EQU, vert_timing[field_index]->PRB, m_VerticalTimingRegister.ACV, vert_timing[field_index]->PSB, diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp index f45911d7a8..840d9192fc 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp @@ -23,25 +23,54 @@ constexpr std::array<u8, 6> classic_id{{0x00, 0x00, 0xa4, 0x20, 0x01, 0x01}}; // Classic Controller calibration constexpr std::array<u8, 0x10> classic_calibration{{ - 0xff, 0x00, 0x80, 0xff, 0x00, 0x80, 0xff, 0x00, 0x80, 0xff, 0x00, 0x80, 0x00, 0x00, 0x51, 0xa6, + 0xff, + 0x00, + 0x80, + 0xff, + 0x00, + 0x80, + 0xff, + 0x00, + 0x80, + 0xff, + 0x00, + 0x80, + 0x00, + 0x00, + 0x51, + 0xa6, }}; constexpr std::array<u16, 9> classic_button_bitmasks{{ - Classic::BUTTON_A, Classic::BUTTON_B, Classic::BUTTON_X, Classic::BUTTON_Y, + Classic::BUTTON_A, + Classic::BUTTON_B, + Classic::BUTTON_X, + Classic::BUTTON_Y, - Classic::BUTTON_ZL, Classic::BUTTON_ZR, + Classic::BUTTON_ZL, + Classic::BUTTON_ZR, - Classic::BUTTON_MINUS, Classic::BUTTON_PLUS, + Classic::BUTTON_MINUS, + Classic::BUTTON_PLUS, Classic::BUTTON_HOME, }}; constexpr std::array<const char*, 9> classic_button_names{{ - "A", "B", "X", "Y", "ZL", "ZR", "-", "+", "Home", + "A", + "B", + "X", + "Y", + "ZL", + "ZR", + "-", + "+", + "Home", }}; constexpr std::array<u16, 2> classic_trigger_bitmasks{{ - Classic::TRIGGER_L, Classic::TRIGGER_R, + Classic::TRIGGER_L, + Classic::TRIGGER_R, }}; constexpr std::array<const char*, 4> classic_trigger_names{{ @@ -56,7 +85,10 @@ constexpr std::array<const char*, 4> classic_trigger_names{{ }}; constexpr std::array<u16, 4> classic_dpad_bitmasks{{ - Classic::PAD_UP, Classic::PAD_DOWN, Classic::PAD_LEFT, Classic::PAD_RIGHT, + Classic::PAD_UP, + Classic::PAD_DOWN, + Classic::PAD_LEFT, + Classic::PAD_RIGHT, }}; Classic::Classic(ExtensionReg& reg) : Attachment(_trans("Classic"), reg) diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp index 4634a62f54..bae2e750cd 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp @@ -20,17 +20,26 @@ namespace WiimoteEmu constexpr std::array<u8, 6> drums_id{{0x01, 0x00, 0xa4, 0x20, 0x01, 0x03}}; constexpr std::array<u16, 6> drum_pad_bitmasks{{ - Drums::PAD_RED, Drums::PAD_YELLOW, Drums::PAD_BLUE, Drums::PAD_GREEN, Drums::PAD_ORANGE, + Drums::PAD_RED, + Drums::PAD_YELLOW, + Drums::PAD_BLUE, + Drums::PAD_GREEN, + Drums::PAD_ORANGE, Drums::PAD_BASS, }}; constexpr std::array<const char*, 6> drum_pad_names{{ - _trans("Red"), _trans("Yellow"), _trans("Blue"), _trans("Green"), _trans("Orange"), + _trans("Red"), + _trans("Yellow"), + _trans("Blue"), + _trans("Green"), + _trans("Orange"), _trans("Bass"), }}; constexpr std::array<u16, 2> drum_button_bitmasks{{ - Drums::BUTTON_MINUS, Drums::BUTTON_PLUS, + Drums::BUTTON_MINUS, + Drums::BUTTON_PLUS, }}; Drums::Drums(ExtensionReg& reg) : Attachment(_trans("Drums"), reg) diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp index 73218cbed7..125ae12038 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp @@ -36,20 +36,29 @@ static const std::map<const ControlState, const u8> s_slider_bar_control_codes{ constexpr std::array<u8, 6> guitar_id{{0x00, 0x00, 0xa4, 0x20, 0x01, 0x03}}; constexpr std::array<u16, 5> guitar_fret_bitmasks{{ - Guitar::FRET_GREEN, Guitar::FRET_RED, Guitar::FRET_YELLOW, Guitar::FRET_BLUE, + Guitar::FRET_GREEN, + Guitar::FRET_RED, + Guitar::FRET_YELLOW, + Guitar::FRET_BLUE, Guitar::FRET_ORANGE, }}; constexpr std::array<const char*, 5> guitar_fret_names{{ - _trans("Green"), _trans("Red"), _trans("Yellow"), _trans("Blue"), _trans("Orange"), + _trans("Green"), + _trans("Red"), + _trans("Yellow"), + _trans("Blue"), + _trans("Orange"), }}; constexpr std::array<u16, 2> guitar_button_bitmasks{{ - Guitar::BUTTON_MINUS, Guitar::BUTTON_PLUS, + Guitar::BUTTON_MINUS, + Guitar::BUTTON_PLUS, }}; constexpr std::array<u16, 2> guitar_strum_bitmasks{{ - Guitar::BAR_UP, Guitar::BAR_DOWN, + Guitar::BAR_UP, + Guitar::BAR_DOWN, }}; Guitar::Guitar(ExtensionReg& reg) : Attachment(_trans("Guitar"), reg) diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp index aa6180fc50..0197c72708 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp @@ -24,7 +24,8 @@ namespace WiimoteEmu constexpr std::array<u8, 6> nunchuk_id{{0x00, 0x00, 0xa4, 0x20, 0x00, 0x00}}; constexpr std::array<u8, 2> nunchuk_button_bitmasks{{ - Nunchuk::BUTTON_C, Nunchuk::BUTTON_Z, + Nunchuk::BUTTON_C, + Nunchuk::BUTTON_Z, }}; Nunchuk::Nunchuk(ExtensionReg& reg) : Attachment(_trans("Nunchuk"), reg) diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp index a7295ebcdf..2889c5a09a 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp @@ -23,14 +23,26 @@ namespace WiimoteEmu constexpr std::array<u8, 6> turntable_id{{0x03, 0x00, 0xa4, 0x20, 0x01, 0x03}}; constexpr std::array<u16, 9> turntable_button_bitmasks{{ - Turntable::BUTTON_L_GREEN, Turntable::BUTTON_L_RED, Turntable::BUTTON_L_BLUE, - Turntable::BUTTON_R_GREEN, Turntable::BUTTON_R_RED, Turntable::BUTTON_R_BLUE, - Turntable::BUTTON_MINUS, Turntable::BUTTON_PLUS, Turntable::BUTTON_EUPHORIA, + Turntable::BUTTON_L_GREEN, + Turntable::BUTTON_L_RED, + Turntable::BUTTON_L_BLUE, + Turntable::BUTTON_R_GREEN, + Turntable::BUTTON_R_RED, + Turntable::BUTTON_R_BLUE, + Turntable::BUTTON_MINUS, + Turntable::BUTTON_PLUS, + Turntable::BUTTON_EUPHORIA, }}; constexpr std::array<const char*, 9> turntable_button_names{{ - _trans("Green Left"), _trans("Red Left"), _trans("Blue Left"), _trans("Green Right"), - _trans("Red Right"), _trans("Blue Right"), "-", "+", + _trans("Green Left"), + _trans("Red Left"), + _trans("Blue Left"), + _trans("Green Right"), + _trans("Red Right"), + _trans("Blue Right"), + "-", + "+", // i18n: This button name refers to a gameplay element in DJ Hero _trans("Euphoria"), }}; diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp index 5e16640886..ba74e007e2 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp @@ -53,6 +53,7 @@ auto const PI = TAU / 2.0; namespace WiimoteEmu { +// clang-format off static const u8 eeprom_data_0[] = { // IR, maybe more // assuming last 2 bytes are checksum @@ -64,6 +65,7 @@ static const u8 eeprom_data_0[] = { ACCEL_ZERO_G, ACCEL_ZERO_G, ACCEL_ZERO_G, 0, ACCEL_ONE_G, ACCEL_ONE_G, ACCEL_ONE_G, 0, 0, 0xA3, ACCEL_ZERO_G, ACCEL_ZERO_G, ACCEL_ZERO_G, 0, ACCEL_ONE_G, ACCEL_ONE_G, ACCEL_ONE_G, 0, 0, 0xA3, }; +// clang-format on static const u8 motion_plus_id[] = {0x00, 0x00, 0xA6, 0x20, 0x00, 0x05}; diff --git a/Source/Core/Core/HW/WiimoteReal/IOAndroid.h b/Source/Core/Core/HW/WiimoteReal/IOAndroid.h index 31a8863aeb..c916e4eb94 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOAndroid.h +++ b/Source/Core/Core/HW/WiimoteReal/IOAndroid.h @@ -19,6 +19,7 @@ public: WiimoteAndroid(int index); ~WiimoteAndroid() override; std::string GetId() const override { return "Android " + std::to_string(m_mayflash_index); } + protected: bool ConnectInternal() override; void DisconnectInternal() override; diff --git a/Source/Core/Core/HW/WiimoteReal/IOLinux.cpp b/Source/Core/Core/HW/WiimoteReal/IOLinux.cpp index 461f61709d..06aa932211 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOLinux.cpp +++ b/Source/Core/Core/HW/WiimoteReal/IOLinux.cpp @@ -258,8 +258,9 @@ int WiimoteLinux::IORead(u8* buf) if (errno == ENOTCONN) { // This can happen if the Bluetooth dongle is disconnected - ERROR_LOG(WIIMOTE, "Bluetooth appears to be disconnected. " - "Wiimote %i will be disconnected.", + ERROR_LOG(WIIMOTE, + "Bluetooth appears to be disconnected. " + "Wiimote %i will be disconnected.", m_index + 1); } diff --git a/Source/Core/Core/HW/WiimoteReal/IOWin.h b/Source/Core/Core/HW/WiimoteReal/IOWin.h index bb9b6976dc..b0bf9d4883 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOWin.h +++ b/Source/Core/Core/HW/WiimoteReal/IOWin.h @@ -27,6 +27,7 @@ public: WiimoteWindows(const std::basic_string<TCHAR>& path, WinWriteMethod initial_write_method); ~WiimoteWindows() override; std::string GetId() const override { return UTF16ToUTF8(m_devicepath); } + protected: bool ConnectInternal() override; void DisconnectInternal() override; diff --git a/Source/Core/Core/HW/WiimoteReal/IOhidapi.cpp b/Source/Core/Core/HW/WiimoteReal/IOhidapi.cpp index f048a2a9a0..34e7b0c9f8 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOhidapi.cpp +++ b/Source/Core/Core/HW/WiimoteReal/IOhidapi.cpp @@ -15,8 +15,9 @@ static bool IsDeviceUsable(const std::string& device_path) hid_device* handle = hid_open_path(device_path.c_str()); if (handle == nullptr) { - ERROR_LOG(WIIMOTE, "Could not connect to Wii Remote at \"%s\". " - "Do you have permission to access the device?", + ERROR_LOG(WIIMOTE, + "Could not connect to Wii Remote at \"%s\". " + "Do you have permission to access the device?", device_path.c_str()); return false; } @@ -96,8 +97,9 @@ bool WiimoteHidapi::ConnectInternal() m_handle = hid_open_path(m_device_path.c_str()); if (m_handle == nullptr) { - ERROR_LOG(WIIMOTE, "Could not connect to Wii Remote at \"%s\". " - "Do you have permission to access the device?", + ERROR_LOG(WIIMOTE, + "Could not connect to Wii Remote at \"%s\". " + "Do you have permission to access the device?", m_device_path.c_str()); } return m_handle != nullptr; diff --git a/Source/Core/Core/HW/WiimoteReal/IOhidapi.h b/Source/Core/Core/HW/WiimoteReal/IOhidapi.h index 3383afbd6f..e83fcf3777 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOhidapi.h +++ b/Source/Core/Core/HW/WiimoteReal/IOhidapi.h @@ -17,6 +17,7 @@ public: explicit WiimoteHidapi(const std::string& device_path); ~WiimoteHidapi() override; std::string GetId() const override { return m_device_path; } + protected: bool ConnectInternal() override; void DisconnectInternal() override; diff --git a/Source/Core/Core/IOS/ES/TitleManagement.cpp b/Source/Core/Core/IOS/ES/TitleManagement.cpp index f656e58ac7..2496f854f7 100644 --- a/Source/Core/Core/IOS/ES/TitleManagement.cpp +++ b/Source/Core/Core/IOS/ES/TitleManagement.cpp @@ -278,8 +278,9 @@ ReturnCode ES::ImportContentBegin(Context& context, u64 title_id, u32 content_id if (title_id != context.title_import_export.tmd.GetTitleId()) { - ERROR_LOG(IOS_ES, "ImportContentBegin: title id %016" PRIx64 " != " - "TMD title id %016" PRIx64 ", ignoring", + ERROR_LOG(IOS_ES, + "ImportContentBegin: title id %016" PRIx64 " != " + "TMD title id %016" PRIx64 ", ignoring", title_id, context.title_import_export.tmd.GetTitleId()); return ES_EINVAL; } diff --git a/Source/Core/Core/IOS/IOS.cpp b/Source/Core/Core/IOS/IOS.cpp index 862f40c8cc..b57a724311 100644 --- a/Source/Core/Core/IOS/IOS.cpp +++ b/Source/Core/Core/IOS/IOS.cpp @@ -318,6 +318,7 @@ struct ARMBinary final u32 GetHeaderSize() const { return Common::swap32(m_bytes.data()); } u32 GetElfOffset() const { return Common::swap32(m_bytes.data() + 0x4); } u32 GetElfSize() const { return Common::swap32(m_bytes.data() + 0x8); } + private: std::vector<u8> m_bytes; }; diff --git a/Source/Core/Core/IOS/IOSC.cpp b/Source/Core/Core/IOS/IOSC.cpp index ec17caf0de..5df9f49672 100644 --- a/Source/Core/Core/IOS/IOSC.cpp +++ b/Source/Core/Core/IOS/IOSC.cpp @@ -100,10 +100,13 @@ namespace HLE { constexpr u32 DEFAULT_DEVICE_ID = 0x0403AC68; constexpr u32 DEFAULT_KEY_ID = 0x6AAB8C59; + constexpr std::array<u8, 30> DEFAULT_PRIVATE_KEY = {{ 0x00, 0xAB, 0xEE, 0xC1, 0xDD, 0xB4, 0xA6, 0x16, 0x6B, 0x70, 0xFD, 0x7E, 0x56, 0x67, 0x70, 0x57, 0x55, 0x27, 0x38, 0xA3, 0x26, 0xC5, 0x46, 0x16, 0xF7, 0x62, 0xC9, 0xED, 0x73, 0xF2, }}; + +// clang-format off constexpr ECCSignature DEFAULT_SIGNATURE = {{ // R 0x00, 0xD8, 0x81, 0x63, 0xB2, 0x00, 0x6B, 0x0B, 0x54, 0x82, 0x88, 0x63, 0x81, 0x1C, 0x00, 0x71, @@ -112,6 +115,7 @@ constexpr ECCSignature DEFAULT_SIGNATURE = {{ 0x00, 0x71, 0x8D, 0x82, 0x41, 0xEE, 0x45, 0x11, 0xC7, 0x3B, 0xAC, 0x08, 0xB6, 0x83, 0xDC, 0x05, 0xB8, 0xA8, 0x90, 0x1F, 0xA8, 0x2A, 0x0E, 0x4E, 0x76, 0xEF, 0x44, 0x72, 0x99, 0xF8, }}; +// clang-format on const std::map<std::pair<IOSC::ObjectType, IOSC::ObjectSubType>, size_t> s_type_to_size_map = {{ {{IOSC::TYPE_SECRET_KEY, IOSC::SUBTYPE_AES128}, 16}, diff --git a/Source/Core/Core/IOS/Network/ICMPWin.cpp b/Source/Core/Core/IOS/Network/ICMPWin.cpp index d95bf64de3..1c5e2e8be3 100644 --- a/Source/Core/Core/IOS/Network/ICMPWin.cpp +++ b/Source/Core/Core/IOS/Network/ICMPWin.cpp @@ -31,13 +31,13 @@ struct icmp_hdr static u8 workspace[56]; /* -* Description: -* Calculate Internet checksum for data buffer and length (one's -* complement sum of 16-bit words). Used in IP, ICMP, UDP, IGMP. -* -* NOTE: to handle odd number of bytes, last (even) byte in -* buffer have a value of 0 (we assume that it does) -*/ + * Description: + * Calculate Internet checksum for data buffer and length (one's + * complement sum of 16-bit words). Used in IP, ICMP, UDP, IGMP. + * + * NOTE: to handle odd number of bytes, last (even) byte in + * buffer have a value of 0 (we assume that it does) + */ u16 cksum(const u16* buffer, int length) { u32 sum = 0; diff --git a/Source/Core/Core/IOS/Network/IP/Top.cpp b/Source/Core/Core/IOS/Network/IP/Top.cpp index 53eaab6510..a53d6d5baa 100644 --- a/Source/Core/Core/IOS/Network/IP/Top.cpp +++ b/Source/Core/Core/IOS/Network/IP/Top.cpp @@ -251,8 +251,9 @@ IPCCommandResult NetIPTop::HandleSocketRequest(const IOCtlRequest& request) WiiSockMan& sm = WiiSockMan::GetInstance(); const s32 return_value = sm.NewSocket(af, type, prot); - INFO_LOG(IOS_NET, "IOCTL_SO_SOCKET " - "Socket: %08x (%d,%d,%d), BufferIn: (%08x, %i), BufferOut: (%08x, %i)", + INFO_LOG(IOS_NET, + "IOCTL_SO_SOCKET " + "Socket: %08x (%d,%d,%d), BufferIn: (%08x, %i), BufferOut: (%08x, %i)", return_value, af, type, prot, request.buffer_in, request.buffer_in_size, request.buffer_out, request.buffer_out_size); @@ -353,10 +354,11 @@ IPCCommandResult NetIPTop::HandleSetSockOptRequest(const IOCtlRequest& request) optlen = std::min(optlen, (u32)sizeof(optval)); Memory::CopyFromEmu(optval, request.buffer_in + 0x10, optlen); - INFO_LOG(IOS_NET, "IOCTL_SO_SETSOCKOPT(%08x, %08x, %08x, %08x) " - "BufferIn: (%08x, %i), BufferOut: (%08x, %i)" - "%02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx " - "%02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx", + INFO_LOG(IOS_NET, + "IOCTL_SO_SETSOCKOPT(%08x, %08x, %08x, %08x) " + "BufferIn: (%08x, %i), BufferOut: (%08x, %i)" + "%02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx " + "%02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx", fd, level, optname, optlen, request.buffer_in, request.buffer_in_size, request.buffer_out, request.buffer_out_size, optval[0], optval[1], optval[2], optval[3], optval[4], optval[5], optval[6], optval[7], optval[8], optval[9], optval[10], optval[11], @@ -502,16 +504,18 @@ IPCCommandResult NetIPTop::HandleInetAToNRequest(const IOCtlRequest& request) if (remoteHost == nullptr || remoteHost->h_addr_list == nullptr || remoteHost->h_addr_list[0] == nullptr) { - INFO_LOG(IOS_NET, "IOCTL_SO_INETATON = -1 " - "%s, BufferIn: (%08x, %i), BufferOut: (%08x, %i), IP Found: None", + INFO_LOG(IOS_NET, + "IOCTL_SO_INETATON = -1 " + "%s, BufferIn: (%08x, %i), BufferOut: (%08x, %i), IP Found: None", hostname.c_str(), request.buffer_in, request.buffer_in_size, request.buffer_out, request.buffer_out_size); return GetDefaultReply(0); } Memory::Write_U32(Common::swap32(*(u32*)remoteHost->h_addr_list[0]), request.buffer_out); - INFO_LOG(IOS_NET, "IOCTL_SO_INETATON = 0 " - "%s, BufferIn: (%08x, %i), BufferOut: (%08x, %i), IP Found: %08X", + INFO_LOG(IOS_NET, + "IOCTL_SO_INETATON = 0 " + "%s, BufferIn: (%08x, %i), BufferOut: (%08x, %i), IP Found: %08X", hostname.c_str(), request.buffer_in, request.buffer_in_size, request.buffer_out, request.buffer_out_size, Common::swap32(*(u32*)remoteHost->h_addr_list[0])); return GetDefaultReply(1); @@ -577,9 +581,10 @@ IPCCommandResult NetIPTop::HandlePollRequest(const IOCtlRequest& request) ufds[i].events |= map.native; unhandled_events &= ~map.wii; } - DEBUG_LOG(IOS_NET, "IOCTL_SO_POLL(%d) " - "Sock: %08x, Unknown: %08x, Events: %08x, " - "NativeEvents: %08x", + DEBUG_LOG(IOS_NET, + "IOCTL_SO_POLL(%d) " + "Sock: %08x, Unknown: %08x, Events: %08x, " + "NativeEvents: %08x", i, wii_fd, unknown, events, ufds[i].events); // Do not pass return-only events to the native poll @@ -625,8 +630,9 @@ IPCCommandResult NetIPTop::HandleGetHostByNameRequest(const IOCtlRequest& reques std::string hostname = Memory::GetString(request.buffer_in); hostent* remoteHost = gethostbyname(hostname.c_str()); - INFO_LOG(IOS_NET, "IOCTL_SO_GETHOSTBYNAME " - "Address: %s, BufferIn: (%08x, %i), BufferOut: (%08x, %i)", + INFO_LOG(IOS_NET, + "IOCTL_SO_GETHOSTBYNAME " + "Address: %s, BufferIn: (%08x, %i), BufferOut: (%08x, %i)", hostname.c_str(), request.buffer_in, request.buffer_in_size, request.buffer_out, request.buffer_out_size); @@ -718,8 +724,9 @@ IPCCommandResult NetIPTop::HandleGetInterfaceOptRequest(const IOCtlVRequest& req param5 = Memory::Read_U32(request.io_vectors[0].address + 4); } - INFO_LOG(IOS_NET, "IOCTLV_SO_GETINTERFACEOPT(%08X, %08X, %X, %X, %X) " - "BufferIn: (%08x, %i), BufferIn2: (%08x, %i) ", + INFO_LOG(IOS_NET, + "IOCTLV_SO_GETINTERFACEOPT(%08X, %08X, %X, %X, %X) " + "BufferIn: (%08x, %i), BufferIn2: (%08x, %i) ", param, param2, param3, param4, param5, request.in_vectors[0].address, request.in_vectors[0].size, request.in_vectors.size() > 1 ? request.in_vectors[1].address : 0, @@ -989,8 +996,9 @@ IPCCommandResult NetIPTop::HandleICMPPingRequest(const IOCtlVRequest& request) if (ip_info.length != 8 || ip_info.addr_family != AF_INET) { - INFO_LOG(IOS_NET, "IOCTLV_SO_ICMPPING strange IPInfo:\n" - "length %x addr_family %x", + INFO_LOG(IOS_NET, + "IOCTLV_SO_ICMPPING strange IPInfo:\n" + "length %x addr_family %x", ip_info.length, ip_info.addr_family); } diff --git a/Source/Core/Core/IOS/Network/KD/NetKDRequest.cpp b/Source/Core/Core/IOS/Network/KD/NetKDRequest.cpp index 3d4b45a6d2..a36ccf537a 100644 --- a/Source/Core/Core/IOS/Network/KD/NetKDRequest.cpp +++ b/Source/Core/Core/IOS/Network/KD/NetKDRequest.cpp @@ -165,7 +165,10 @@ u8 NetKDRequest::GetAreaCode(const std::string& area) const u8 NetKDRequest::GetHardwareModel(const std::string& model) const { static const std::map<std::string, u8> models = { - {"RVL", MODEL_RVL}, {"RVT", MODEL_RVT}, {"RVV", MODEL_RVV}, {"RVD", MODEL_RVD}, + {"RVL", MODEL_RVL}, + {"RVT", MODEL_RVT}, + {"RVV", MODEL_RVV}, + {"RVD", MODEL_RVD}, }; auto entryPos = models.find(model); diff --git a/Source/Core/Core/IOS/Network/MACUtils.cpp b/Source/Core/Core/IOS/Network/MACUtils.cpp index 5299457387..6e9c8e8a3b 100644 --- a/Source/Core/Core/IOS/Network/MACUtils.cpp +++ b/Source/Core/Core/IOS/Network/MACUtils.cpp @@ -38,8 +38,9 @@ void GetMACAddress(u8* mac) SaveMACAddress(mac); if (!wireless_mac.empty()) { - ERROR_LOG(IOS_NET, "The MAC provided (%s) is invalid. We have " - "generated another one for you.", + ERROR_LOG(IOS_NET, + "The MAC provided (%s) is invalid. We have " + "generated another one for you.", Common::MacAddressToString(mac).c_str()); } } diff --git a/Source/Core/Core/IOS/Network/SSL.cpp b/Source/Core/Core/IOS/Network/SSL.cpp index feb92aa092..7dd8823528 100644 --- a/Source/Core/Core/IOS/Network/SSL.cpp +++ b/Source/Core/Core/IOS/Network/SSL.cpp @@ -238,10 +238,11 @@ IPCCommandResult NetSSL::IOCtlV(const IOCtlVRequest& request) WriteReturnValue(SSL_ERR_FAILED, BufferIn); } - INFO_LOG(IOS_SSL, "IOCTLV_NET_SSL_NEW (%d, %s) " - "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " - "BufferIn3: (%08x, %i), BufferOut: (%08x, %i), " - "BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)", + INFO_LOG(IOS_SSL, + "IOCTLV_NET_SSL_NEW (%d, %s) " + "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " + "BufferIn3: (%08x, %i), BufferOut: (%08x, %i), " + "BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)", verifyOption, hostname.c_str(), BufferIn, BufferInSize, BufferIn2, BufferInSize2, BufferIn3, BufferInSize3, BufferOut, BufferOutSize, BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3); @@ -275,20 +276,22 @@ IPCCommandResult NetSSL::IOCtlV(const IOCtlVRequest& request) { WriteReturnValue(SSL_ERR_ID, BufferIn); } - INFO_LOG(IOS_SSL, "IOCTLV_NET_SSL_SHUTDOWN " - "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " - "BufferIn3: (%08x, %i), BufferOut: (%08x, %i), " - "BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)", + INFO_LOG(IOS_SSL, + "IOCTLV_NET_SSL_SHUTDOWN " + "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " + "BufferIn3: (%08x, %i), BufferOut: (%08x, %i), " + "BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)", BufferIn, BufferInSize, BufferIn2, BufferInSize2, BufferIn3, BufferInSize3, BufferOut, BufferOutSize, BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3); break; } case IOCTLV_NET_SSL_SETROOTCA: { - INFO_LOG(IOS_SSL, "IOCTLV_NET_SSL_SETROOTCA " - "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " - "BufferIn3: (%08x, %i), BufferOut: (%08x, %i), " - "BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)", + INFO_LOG(IOS_SSL, + "IOCTLV_NET_SSL_SETROOTCA " + "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " + "BufferIn3: (%08x, %i), BufferOut: (%08x, %i), " + "BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)", BufferIn, BufferInSize, BufferIn2, BufferInSize2, BufferIn3, BufferInSize3, BufferOut, BufferOutSize, BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3); @@ -325,10 +328,11 @@ IPCCommandResult NetSSL::IOCtlV(const IOCtlVRequest& request) } case IOCTLV_NET_SSL_SETBUILTINCLIENTCERT: { - INFO_LOG(IOS_SSL, "IOCTLV_NET_SSL_SETBUILTINCLIENTCERT " - "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " - "BufferIn3: (%08x, %i), BufferOut: (%08x, %i), " - "BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)", + INFO_LOG(IOS_SSL, + "IOCTLV_NET_SSL_SETBUILTINCLIENTCERT " + "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " + "BufferIn3: (%08x, %i), BufferOut: (%08x, %i), " + "BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)", BufferIn, BufferInSize, BufferIn2, BufferInSize2, BufferIn3, BufferInSize3, BufferOut, BufferOutSize, BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3); @@ -371,10 +375,11 @@ IPCCommandResult NetSSL::IOCtlV(const IOCtlVRequest& request) } case IOCTLV_NET_SSL_REMOVECLIENTCERT: { - INFO_LOG(IOS_SSL, "IOCTLV_NET_SSL_REMOVECLIENTCERT " - "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " - "BufferIn3: (%08x, %i), BufferOut: (%08x, %i), " - "BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)", + INFO_LOG(IOS_SSL, + "IOCTLV_NET_SSL_REMOVECLIENTCERT " + "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " + "BufferIn3: (%08x, %i), BufferOut: (%08x, %i), " + "BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)", BufferIn, BufferInSize, BufferIn2, BufferInSize2, BufferIn3, BufferInSize3, BufferOut, BufferOutSize, BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3); @@ -424,10 +429,11 @@ IPCCommandResult NetSSL::IOCtlV(const IOCtlVRequest& request) { WriteReturnValue(SSL_ERR_ID, BufferIn); } - INFO_LOG(IOS_SSL, "IOCTLV_NET_SSL_SETBUILTINROOTCA " - "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " - "BufferIn3: (%08x, %i), BufferOut: (%08x, %i), " - "BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)", + INFO_LOG(IOS_SSL, + "IOCTLV_NET_SSL_SETBUILTINROOTCA " + "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " + "BufferIn3: (%08x, %i), BufferOut: (%08x, %i), " + "BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)", BufferIn, BufferInSize, BufferIn2, BufferInSize2, BufferIn3, BufferInSize3, BufferOut, BufferOutSize, BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3); break; @@ -450,10 +456,11 @@ IPCCommandResult NetSSL::IOCtlV(const IOCtlVRequest& request) { WriteReturnValue(SSL_ERR_ID, BufferIn); } - INFO_LOG(IOS_SSL, "IOCTLV_NET_SSL_CONNECT " - "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " - "BufferIn3: (%08x, %i), BufferOut: (%08x, %i), " - "BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)", + INFO_LOG(IOS_SSL, + "IOCTLV_NET_SSL_CONNECT " + "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " + "BufferIn3: (%08x, %i), BufferOut: (%08x, %i), " + "BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)", BufferIn, BufferInSize, BufferIn2, BufferInSize2, BufferIn3, BufferInSize3, BufferOut, BufferOutSize, BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3); break; @@ -486,10 +493,11 @@ IPCCommandResult NetSSL::IOCtlV(const IOCtlVRequest& request) { WriteReturnValue(SSL_ERR_ID, BufferIn); } - INFO_LOG(IOS_SSL, "IOCTLV_NET_SSL_WRITE " - "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " - "BufferIn3: (%08x, %i), BufferOut: (%08x, %i), " - "BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)", + INFO_LOG(IOS_SSL, + "IOCTLV_NET_SSL_WRITE " + "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " + "BufferIn3: (%08x, %i), BufferOut: (%08x, %i), " + "BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)", BufferIn, BufferInSize, BufferIn2, BufferInSize2, BufferIn3, BufferInSize3, BufferOut, BufferOutSize, BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3); INFO_LOG(IOS_SSL, "%s", Memory::GetString(BufferOut2).c_str()); @@ -510,10 +518,11 @@ IPCCommandResult NetSSL::IOCtlV(const IOCtlVRequest& request) WriteReturnValue(SSL_ERR_ID, BufferIn); } - INFO_LOG(IOS_SSL, "IOCTLV_NET_SSL_READ(%d)" - "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " - "BufferIn3: (%08x, %i), BufferOut: (%08x, %i), " - "BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)", + INFO_LOG(IOS_SSL, + "IOCTLV_NET_SSL_READ(%d)" + "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " + "BufferIn3: (%08x, %i), BufferOut: (%08x, %i), " + "BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)", ret, BufferIn, BufferInSize, BufferIn2, BufferInSize2, BufferIn3, BufferInSize3, BufferOut, BufferOutSize, BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3); break; @@ -529,20 +538,22 @@ IPCCommandResult NetSSL::IOCtlV(const IOCtlVRequest& request) { WriteReturnValue(SSL_ERR_ID, BufferIn); } - INFO_LOG(IOS_SSL, "IOCTLV_NET_SSL_SETROOTCADEFAULT " - "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " - "BufferIn3: (%08x, %i), BufferOut: (%08x, %i), " - "BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)", + INFO_LOG(IOS_SSL, + "IOCTLV_NET_SSL_SETROOTCADEFAULT " + "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " + "BufferIn3: (%08x, %i), BufferOut: (%08x, %i), " + "BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)", BufferIn, BufferInSize, BufferIn2, BufferInSize2, BufferIn3, BufferInSize3, BufferOut, BufferOutSize, BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3); break; } case IOCTLV_NET_SSL_SETCLIENTCERTDEFAULT: { - INFO_LOG(IOS_SSL, "IOCTLV_NET_SSL_SETCLIENTCERTDEFAULT " - "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " - "BufferIn3: (%08x, %i), BufferOut: (%08x, %i), " - "BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)", + INFO_LOG(IOS_SSL, + "IOCTLV_NET_SSL_SETCLIENTCERTDEFAULT " + "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " + "BufferIn3: (%08x, %i), BufferOut: (%08x, %i), " + "BufferOut2: (%08x, %i), BufferOut3: (%08x, %i)", BufferIn, BufferInSize, BufferIn2, BufferInSize2, BufferIn3, BufferInSize3, BufferOut, BufferOutSize, BufferOut2, BufferOutSize2, BufferOut3, BufferOutSize3); diff --git a/Source/Core/Core/IOS/Network/Socket.cpp b/Source/Core/Core/IOS/Network/Socket.cpp index 1c2ba326ed..0fa45bdb20 100644 --- a/Source/Core/Core/IOS/Network/Socket.cpp +++ b/Source/Core/Core/IOS/Network/Socket.cpp @@ -393,9 +393,10 @@ void WiiSocket::Update(bool read, bool write, bool except) } } - INFO_LOG(IOS_SSL, "IOCTLV_NET_SSL_DOHANDSHAKE = (%d) " - "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " - "BufferOut: (%08x, %i), BufferOut2: (%08x, %i)", + INFO_LOG(IOS_SSL, + "IOCTLV_NET_SSL_DOHANDSHAKE = (%d) " + "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " + "BufferOut: (%08x, %i), BufferOut2: (%08x, %i)", ret, BufferIn, BufferInSize, BufferIn2, BufferInSize2, BufferOut, BufferOutSize, BufferOut2, BufferOutSize2); break; @@ -560,9 +561,10 @@ void WiiSocket::Update(bool read, bool write, bool except) ReturnValue = WiiSockMan::GetNetErrorCode(ret, BufferOutSize2 ? "SO_RECVFROM" : "SO_RECV", true); - INFO_LOG(IOS_NET, "%s(%d, %p) Socket: %08X, Flags: %08X, " - "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " - "BufferOut: (%08x, %i), BufferOut2: (%08x, %i)", + INFO_LOG(IOS_NET, + "%s(%d, %p) Socket: %08X, Flags: %08X, " + "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " + "BufferOut: (%08x, %i), BufferOut2: (%08x, %i)", BufferOutSize2 ? "IOCTLV_SO_RECVFROM " : "IOCTLV_SO_RECV ", ReturnValue, data, wii_fd, flags, BufferIn, BufferInSize, BufferIn2, BufferInSize2, BufferOut, BufferOutSize, BufferOut2, BufferOutSize2); diff --git a/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp b/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp index cb7e3172ec..036457bacb 100644 --- a/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp +++ b/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp @@ -561,7 +561,9 @@ std::array<u32, 4> SDIOSlot0::GetCSDv1() const // Form the csd using the description above return {{ - 0x007f003, 0x5b5f8000 | (c_size >> 2), 0x3ffc7f80 | (c_size << 30) | (c_size_mult << 15), + 0x007f003, + 0x5b5f8000 | (c_size >> 2), + 0x3ffc7f80 | (c_size << 30) | (c_size_mult << 15), 0x07c04001 | (crc << 1), }}; } @@ -616,7 +618,10 @@ std::array<u32, 4> SDIOSlot0::GetCSDv2() const // Form the csd using the description above return {{ - 0x400e005a, 0x5f590000 | (c_size >> 16), 0x00007f80 | (c_size << 16), 0x0a400001 | (crc << 1), + 0x400e005a, + 0x5f590000 | (c_size >> 16), + 0x00007f80 | (c_size << 16), + 0x0a400001 | (crc << 1), }}; } diff --git a/Source/Core/Core/IOS/USB/Bluetooth/BTBase.h b/Source/Core/Core/IOS/USB/Bluetooth/BTBase.h index 6fd3341122..4e83630080 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/BTBase.h +++ b/Source/Core/Core/IOS/USB/Bluetooth/BTBase.h @@ -30,6 +30,7 @@ public: virtual void UpdateSyncButtonState(bool is_held) {} virtual void TriggerSyncButtonPressedEvent() {} virtual void TriggerSyncButtonHeldEvent() {} + protected: static constexpr int ACL_PKT_SIZE = 339; static constexpr int ACL_PKT_NUM = 10; diff --git a/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp b/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp index 31b68d6e51..11b0da139e 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp +++ b/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp @@ -288,8 +288,9 @@ void BluetoothEmu::AddEventToQueue(const SQueuedEvent& _event) m_EventQueue.size()); m_EventQueue.push_back(_event); const SQueuedEvent& event = m_EventQueue.front(); - DEBUG_LOG(IOS_WIIMOTE, "HCI event %x " - "being written from queue (%zu) to %08x...", + DEBUG_LOG(IOS_WIIMOTE, + "HCI event %x " + "being written from queue (%zu) to %08x...", ((hci_event_hdr_t*)event.m_buffer)->event, m_EventQueue.size() - 1, m_HCIEndpoint->ios_request.address); m_HCIEndpoint->FillBuffer(event.m_buffer, event.m_size); @@ -400,8 +401,9 @@ void BluetoothEmu::ACLPool::WriteToEndpoint(USB::V0BulkMessage& endpoint) const u16 size = packet.size; const u16 conn_handle = packet.conn_handle; - DEBUG_LOG(IOS_WIIMOTE, "ACL packet being written from " - "queue to %08x", + DEBUG_LOG(IOS_WIIMOTE, + "ACL packet being written from " + "queue to %08x", endpoint.ios_request.address); hci_acldata_hdr_t* pHeader = (hci_acldata_hdr_t*)Memory::GetPointer(endpoint.data_address); @@ -1204,7 +1206,8 @@ void BluetoothEmu::CommandAcceptCon(const u8* input) const hci_accept_con_cp* accept_connection = reinterpret_cast<const hci_accept_con_cp*>(input); static char roles[][128] = { - {"Master (0x00)"}, {"Slave (0x01)"}, + {"Master (0x00)"}, + {"Slave (0x01)"}, }; INFO_LOG(IOS_WIIMOTE, "Command: HCI_CMD_ACCEPT_CON"); diff --git a/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.h b/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.h index 2a746fb6a2..dfc30d4e77 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.h +++ b/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.h @@ -87,6 +87,7 @@ private: bool IsEmpty() const { return m_queue.empty(); } // For SaveStates void DoState(PointerWrap& p) { p.Do(m_queue); } + private: struct Packet { diff --git a/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp index e086c73755..82a0a888d7 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp +++ b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp @@ -621,16 +621,16 @@ void WiimoteDevice::SendConfigurationRequest(u16 scid, u16 MTU, u16 FlushTimeOut SendCommandToACL(L2CAP_CONFIG_REQ, L2CAP_CONFIG_REQ, Offset, Buffer); } -// -// -// -// -// --- SDP -// -// -// -// -// + // + // + // + // + // --- SDP + // + // + // + // + // #define SDP_UINT8 0x08 #define SDP_UINT16 0x09 diff --git a/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.h b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.h index 8253566b71..89773a6fe5 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.h +++ b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.h @@ -34,6 +34,7 @@ public: void Write16(u32 offset, u16 data) { *(u16*)&m_pBuffer[offset] = Common::swap16(data); } void Write32(u32 offset, u32 data) { *(u32*)&m_pBuffer[offset] = Common::swap32(data); } u8* GetPointer(u32 offset) { return &m_pBuffer[offset]; } + private: u8* m_pBuffer; }; @@ -69,6 +70,7 @@ public: u16 GetLMPSubVersion() const { return lmp_subversion; } u16 GetManufactorID() const { return 0x000F; } // Broadcom Corporation const u8* GetLinkKey() const { return m_LinkKey; } + private: enum ConnectionState { diff --git a/Source/Core/Core/IOS/USB/Bluetooth/hci.h b/Source/Core/Core/IOS/USB/Bluetooth/hci.h index 794b9af0d7..cfe196ade2 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/hci.h +++ b/Source/Core/Core/IOS/USB/Bluetooth/hci.h @@ -2530,11 +2530,11 @@ static __inline int hci_filter_test(uint8_t bit, const struct hci_filter* filter return (filter->mask[off] & (1 << ((bit - 1) & 0x1f))); } -/* - * HCI socket ioctl's - * - * Apart from GBTINFOA, these are all indexed on the unit name - */ + /* + * HCI socket ioctl's + * + * Apart from GBTINFOA, these are all indexed on the unit name + */ #define SIOCGBTINFO _IOWR('b', 5, struct btreq) /* get unit info */ #define SIOCGBTINFOA _IOWR('b', 6, struct btreq) /* get info by address */ diff --git a/Source/Core/Core/IOS/USB/Bluetooth/l2cap.h b/Source/Core/Core/IOS/USB/Bluetooth/l2cap.h index d1a5f1a69b..464ae448bf 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/l2cap.h +++ b/Source/Core/Core/IOS/USB/Bluetooth/l2cap.h @@ -5,70 +5,70 @@ /* $NetBSD: l2cap.h,v 1.9 2009/09/13 18:45:11 pooka Exp $ */ /*- -* Copyright (c) 2005 Iain Hibbert. -* Copyright (c) 2006 Itronix Inc. -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions -* are met: -* 1. Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* 2. Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* 3. The name of Itronix Inc. may not be used to endorse -* or promote products derived from this software without specific -* prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY ITRONIX INC. ``AS IS'' AND -* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ITRONIX INC. BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* ON ANY THEORY OF LIABILITY, WHETHER IN -* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -* POSSIBILITY OF SUCH DAMAGE. -*/ + * Copyright (c) 2005 Iain Hibbert. + * Copyright (c) 2006 Itronix Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of Itronix Inc. may not be used to endorse + * or promote products derived from this software without specific + * prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY ITRONIX INC. ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ITRONIX INC. BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ /*- -* Copyright (c) Maksim Yevmenkin <m_evmenkin@yahoo.com> -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions -* are met: -* 1. Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* 2. Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* -* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -* SUCH DAMAGE. -* -* $Id: l2cap.h,v 1.9 2009/09/13 18:45:11 pooka Exp $ -* $FreeBSD: src/sys/netgraph/bluetooth/include/l2cap.h,v 1.4 2005/08/31 18:13:23 emax Exp $ -*/ + * Copyright (c) Maksim Yevmenkin <m_evmenkin@yahoo.com> + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $Id: l2cap.h,v 1.9 2009/09/13 18:45:11 pooka Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/include/l2cap.h,v 1.4 2005/08/31 18:13:23 emax Exp $ + */ /* -* This file contains everything that application needs to know about -* Link Layer Control and Adaptation Protocol (L2CAP). All information -* was obtained from Bluetooth Specification Books (v1.1 and up) -* -* This file can be included by both kernel and userland applications. -*/ + * This file contains everything that application needs to know about + * Link Layer Control and Adaptation Protocol (L2CAP). All information + * was obtained from Bluetooth Specification Books (v1.1 and up) + * + * This file can be included by both kernel and userland applications. + */ #pragma once @@ -81,10 +81,10 @@ **************************************************************************/ /* -* Channel IDs are assigned per machine. So the total number of channels that -* a machine can have open at the same time is 0xffff - 0x0040 = 0xffbf (65471). -* This number does not depend on number of HCI connections. -*/ + * Channel IDs are assigned per machine. So the total number of channels that + * a machine can have open at the same time is 0xffff - 0x0040 = 0xffbf (65471). + * This number does not depend on number of HCI connections. + */ #define L2CAP_NULL_CID 0x0000 /* DO NOT USE THIS CID */ #define L2CAP_SIGNAL_CID 0x0001 /* signaling channel ID */ @@ -338,9 +338,9 @@ typedef struct uint16_t type; /* requested information type */ uint16_t result; /* 0x00 - success */ /* uint8_t info[] -- info data (depends on type) - * - * L2CAP_CONNLESS_MTU - 2 bytes connectionless MTU - */ + * + * L2CAP_CONNLESS_MTU - 2 bytes connectionless MTU + */ } l2cap_info_rsp_cp; typedef union diff --git a/Source/Core/Core/IOS/USB/LibusbDevice.h b/Source/Core/Core/IOS/USB/LibusbDevice.h index 54b5a19577..ed2cde396d 100644 --- a/Source/Core/Core/IOS/USB/LibusbDevice.h +++ b/Source/Core/Core/IOS/USB/LibusbDevice.h @@ -36,6 +36,7 @@ public: ~LibusbConfigDescriptor(); libusb_config_descriptor* Get() const { return m_descriptor; } bool IsValid() const { return m_descriptor != nullptr; } + private: libusb_config_descriptor* m_descriptor = nullptr; }; diff --git a/Source/Core/Core/IOS/WFS/WFSI.cpp b/Source/Core/Core/IOS/WFS/WFSI.cpp index afb6406c2d..71b40c1c2f 100644 --- a/Source/Core/Core/IOS/WFS/WFSI.cpp +++ b/Source/Core/Core/IOS/WFS/WFSI.cpp @@ -178,7 +178,7 @@ IPCCommandResult WFSI::IOCtl(const IOCtlRequest& request) case IOCTL_WFSI_PREPARE_PROFILE: m_base_extract_path = StringFromFormat("/vol/%s/tmp/", m_device_name.c_str()); - // Fall through intended. + // Fall through intended. case IOCTL_WFSI_PREPARE_CONTENT: { diff --git a/Source/Core/Core/PatchEngine.cpp b/Source/Core/Core/PatchEngine.cpp index 69375f85b1..3f4b98561e 100644 --- a/Source/Core/Core/PatchEngine.cpp +++ b/Source/Core/Core/PatchEngine.cpp @@ -27,7 +27,9 @@ namespace PatchEngine { const char* PatchTypeStrings[] = { - "byte", "word", "dword", + "byte", + "word", + "dword", }; static std::vector<Patch> onFrame; diff --git a/Source/Core/Core/PowerPC/BreakPoints.h b/Source/Core/Core/PowerPC/BreakPoints.h index 7ddf324567..8be0f1e8da 100644 --- a/Source/Core/Core/PowerPC/BreakPoints.h +++ b/Source/Core/Core/PowerPC/BreakPoints.h @@ -93,6 +93,7 @@ public: void Clear() { m_mem_checks.clear(); } bool HasAny() const { return !m_mem_checks.empty(); } + private: TMemChecks m_mem_checks; }; diff --git a/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter.h b/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter.h index cdc493ce48..733072b0f5 100644 --- a/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter.h +++ b/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter.h @@ -31,6 +31,7 @@ public: JitBaseBlockCache* GetBlockCache() override { return &m_block_cache; } const char* GetName() const override { return "Cached Interpreter"; } const CommonAsmRoutinesBase* GetAsmRoutines() override { return nullptr; } + private: struct Instruction; diff --git a/Source/Core/Core/PowerPC/GDBStub.cpp b/Source/Core/Core/PowerPC/GDBStub.cpp index 1b95ee1015..5a941d91a0 100644 --- a/Source/Core/Core/PowerPC/GDBStub.cpp +++ b/Source/Core/Core/PowerPC/GDBStub.cpp @@ -10,7 +10,6 @@ #include <unistd.h> #ifdef _WIN32 #include <iphlpapi.h> -#include <iphlpapi.h> #include <ws2tcpip.h> #else #include <netinet/in.h> diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp index fd900defe1..fff9d5565b 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp @@ -92,8 +92,9 @@ static void Trace(UGeckoInstruction& inst) } std::string ppc_inst = GekkoDisassembler::Disassemble(inst.hex, PC); - DEBUG_LOG(POWERPC, "INTER PC: %08x SRR0: %08x SRR1: %08x CRval: %016lx FPSCR: %08x MSR: %08x LR: " - "%08x %s %08x %s", + DEBUG_LOG(POWERPC, + "INTER PC: %08x SRR0: %08x SRR1: %08x CRval: %016lx FPSCR: %08x MSR: %08x LR: " + "%08x %s %08x %s", PC, SRR0, SRR1, (unsigned long)PowerPC::ppcState.cr_val[0], PowerPC::ppcState.fpscr, PowerPC::ppcState.msr, PowerPC::ppcState.spr[8], regs.c_str(), inst.hex, ppc_inst.c_str()); diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp index cae42c290e..7526c7df66 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp @@ -2,12 +2,12 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "Core/PowerPC/Interpreter/Interpreter.h" #include "Common/Assert.h" #include "Common/CommonTypes.h" #include "Core/ConfigManager.h" #include "Core/CoreTiming.h" #include "Core/HLE/HLE.h" +#include "Core/PowerPC/Interpreter/Interpreter.h" #include "Core/PowerPC/PowerPC.h" void Interpreter::bx(UGeckoInstruction inst) diff --git a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp index 23d03b5568..82086a8d4b 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "Core/PowerPC/Jit64/Jit.h" #include "Core/PowerPC/Gekko.h" +#include "Core/PowerPC/Jit64/Jit.h" static Jit64::Instruction dynaOpTable[64]; static Jit64::Instruction dynaOpTable4[1024]; diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp index 7451042100..358e16cef9 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp @@ -2,12 +2,12 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "Core/PowerPC/Jit64/Jit.h" #include "Common/Assert.h" #include "Common/CommonTypes.h" #include "Common/x64Emitter.h" #include "Core/CoreTiming.h" #include "Core/PowerPC/Gekko.h" +#include "Core/PowerPC/Jit64/Jit.h" #include "Core/PowerPC/Jit64/JitRegCache.h" #include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h" #include "Core/PowerPC/PPCAnalyst.h" diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp index d4e1a31d7c..e89bf3f9d6 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "Core/PowerPC/Jit64/Jit.h" #include "Common/BitSet.h" #include "Common/CommonTypes.h" #include "Common/x64Emitter.h" +#include "Core/PowerPC/Jit64/Jit.h" #include "Core/PowerPC/Jit64/JitRegCache.h" #include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h" diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp index 456a7d644a..45ea288137 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "Core/PowerPC/Jit64/Jit.h" #include "Common/CPUDetect.h" #include "Common/CommonTypes.h" #include "Common/MsgHandler.h" #include "Common/x64Emitter.h" +#include "Core/PowerPC/Jit64/Jit.h" #include "Core/PowerPC/Jit64/JitRegCache.h" using namespace Gen; diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp index 84c1352cfc..9e103808aa 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp @@ -2,13 +2,13 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "Core/PowerPC/Jit64/Jit.h" #include "Common/BitSet.h" #include "Common/CPUDetect.h" #include "Common/CommonTypes.h" #include "Common/x64Emitter.h" #include "Core/CoreTiming.h" #include "Core/HW/ProcessorInterface.h" +#include "Core/PowerPC/Jit64/Jit.h" #include "Core/PowerPC/Jit64/JitRegCache.h" #include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h" #include "Core/PowerPC/PowerPC.h" diff --git a/Source/Core/Core/PowerPC/Jit64Common/EmuCodeBlock.cpp b/Source/Core/Core/PowerPC/Jit64Common/EmuCodeBlock.cpp index a7536a77a6..787793ab46 100644 --- a/Source/Core/Core/PowerPC/Jit64Common/EmuCodeBlock.cpp +++ b/Source/Core/Core/PowerPC/Jit64Common/EmuCodeBlock.cpp @@ -1059,8 +1059,9 @@ void EmuCodeBlock::SetFPRF(Gen::X64Reg xmm) FixupBranch zeroExponent = J_CC(CC_Z); // Nice normalized number: sign ? PPC_FPCLASS_NN : PPC_FPCLASS_PN; - LEA(32, RSCRATCH, MScaled(RSCRATCH, MathUtil::PPC_FPCLASS_NN - MathUtil::PPC_FPCLASS_PN, - MathUtil::PPC_FPCLASS_PN)); + LEA(32, RSCRATCH, + MScaled(RSCRATCH, MathUtil::PPC_FPCLASS_NN - MathUtil::PPC_FPCLASS_PN, + MathUtil::PPC_FPCLASS_PN)); continue1 = J(); SetJumpTarget(maxExponent); @@ -1073,8 +1074,9 @@ void EmuCodeBlock::SetFPRF(Gen::X64Reg xmm) // Max exponent + no mantissa: sign ? PPC_FPCLASS_NINF : PPC_FPCLASS_PINF; SetJumpTarget(notNAN); - LEA(32, RSCRATCH, MScaled(RSCRATCH, MathUtil::PPC_FPCLASS_NINF - MathUtil::PPC_FPCLASS_PINF, - MathUtil::PPC_FPCLASS_PINF)); + LEA(32, RSCRATCH, + MScaled(RSCRATCH, MathUtil::PPC_FPCLASS_NINF - MathUtil::PPC_FPCLASS_PINF, + MathUtil::PPC_FPCLASS_PINF)); continue3 = J(); SetJumpTarget(zeroExponent); @@ -1082,8 +1084,9 @@ void EmuCodeBlock::SetFPRF(Gen::X64Reg xmm) FixupBranch zero = J_CC(CC_Z); // No exponent + mantissa: sign ? PPC_FPCLASS_ND : PPC_FPCLASS_PD; - LEA(32, RSCRATCH, MScaled(RSCRATCH, MathUtil::PPC_FPCLASS_ND - MathUtil::PPC_FPCLASS_PD, - MathUtil::PPC_FPCLASS_PD)); + LEA(32, RSCRATCH, + MScaled(RSCRATCH, MathUtil::PPC_FPCLASS_ND - MathUtil::PPC_FPCLASS_PD, + MathUtil::PPC_FPCLASS_PD)); continue4 = J(); // Zero: sign ? PPC_FPCLASS_NZ : PPC_FPCLASS_PZ; @@ -1103,8 +1106,9 @@ void EmuCodeBlock::SetFPRF(Gen::X64Reg xmm) FixupBranch infinity = J_CC(CC_E); MOVQ_xmm(R(RSCRATCH), xmm); SHR(64, R(RSCRATCH), Imm8(63)); - LEA(32, RSCRATCH, MScaled(RSCRATCH, MathUtil::PPC_FPCLASS_NN - MathUtil::PPC_FPCLASS_PN, - MathUtil::PPC_FPCLASS_PN)); + LEA(32, RSCRATCH, + MScaled(RSCRATCH, MathUtil::PPC_FPCLASS_NN - MathUtil::PPC_FPCLASS_PN, + MathUtil::PPC_FPCLASS_PN)); continue1 = J(); SetJumpTarget(nan); MOVQ_xmm(R(RSCRATCH), xmm); @@ -1114,15 +1118,17 @@ void EmuCodeBlock::SetFPRF(Gen::X64Reg xmm) SetJumpTarget(infinity); MOVQ_xmm(R(RSCRATCH), xmm); SHR(64, R(RSCRATCH), Imm8(63)); - LEA(32, RSCRATCH, MScaled(RSCRATCH, MathUtil::PPC_FPCLASS_NINF - MathUtil::PPC_FPCLASS_PINF, - MathUtil::PPC_FPCLASS_PINF)); + LEA(32, RSCRATCH, + MScaled(RSCRATCH, MathUtil::PPC_FPCLASS_NINF - MathUtil::PPC_FPCLASS_PINF, + MathUtil::PPC_FPCLASS_PINF)); continue3 = J(); SetJumpTarget(zeroExponent); TEST(64, R(RSCRATCH), R(RSCRATCH)); FixupBranch zero = J_CC(CC_Z); SHR(64, R(RSCRATCH), Imm8(63)); - LEA(32, RSCRATCH, MScaled(RSCRATCH, MathUtil::PPC_FPCLASS_ND - MathUtil::PPC_FPCLASS_PD, - MathUtil::PPC_FPCLASS_PD)); + LEA(32, RSCRATCH, + MScaled(RSCRATCH, MathUtil::PPC_FPCLASS_ND - MathUtil::PPC_FPCLASS_PD, + MathUtil::PPC_FPCLASS_PD)); continue4 = J(); SetJumpTarget(zero); SHR(64, R(RSCRATCH), Imm8(63)); diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp index ede381a32b..9f58e8135d 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp @@ -108,7 +108,17 @@ void Arm64GPRCache::Start(PPCAnalyst::BlockRegStats& stats) bool Arm64GPRCache::IsCalleeSaved(ARM64Reg reg) { static constexpr std::array<ARM64Reg, 11> callee_regs{{ - X28, X27, X26, X25, X24, X23, X22, X21, X20, X19, INVALID_REG, + X28, + X27, + X26, + X25, + X24, + X23, + X22, + X21, + X20, + X19, + INVALID_REG, }}; return std::find(callee_regs.begin(), callee_regs.end(), EncodeRegTo64(reg)) != callee_regs.end(); @@ -317,10 +327,37 @@ void Arm64GPRCache::GetAllocationOrder() // Callee saved registers first in hopes that we will keep everything stored there first static constexpr std::array<ARM64Reg, 29> allocation_order{{ // Callee saved - W27, W26, W25, W24, W23, W22, W21, W20, W19, + W27, + W26, + W25, + W24, + W23, + W22, + W21, + W20, + W19, // Caller saved - W18, W17, W16, W15, W14, W13, W12, W11, W10, W9, W8, W7, W6, W5, W4, W3, W2, W1, W0, W30, + W18, + W17, + W16, + W15, + W14, + W13, + W12, + W11, + W10, + W9, + W8, + W7, + W6, + W5, + W4, + W3, + W2, + W1, + W0, + W30, }}; for (ARM64Reg reg : allocation_order) @@ -545,11 +582,40 @@ void Arm64FPRCache::GetAllocationOrder() { static constexpr std::array<ARM64Reg, 32> allocation_order{{ // Callee saved - Q8, Q9, Q10, Q11, Q12, Q13, Q14, Q15, + Q8, + Q9, + Q10, + Q11, + Q12, + Q13, + Q14, + Q15, // Caller saved - Q16, Q17, Q18, Q19, Q20, Q21, Q22, Q23, Q24, Q25, Q26, Q27, Q28, Q29, Q30, Q31, Q7, Q6, Q5, - Q4, Q3, Q2, Q1, Q0, + Q16, + Q17, + Q18, + Q19, + Q20, + Q21, + Q22, + Q23, + Q24, + Q25, + Q26, + Q27, + Q28, + Q29, + Q30, + Q31, + Q7, + Q6, + Q5, + Q4, + Q3, + Q2, + Q1, + Q0, }}; for (ARM64Reg reg : allocation_order) @@ -574,7 +640,15 @@ void Arm64FPRCache::FlushByHost(ARM64Reg host_reg) bool Arm64FPRCache::IsCalleeSaved(ARM64Reg reg) { static constexpr std::array<ARM64Reg, 9> callee_regs{{ - Q8, Q9, Q10, Q11, Q12, Q13, Q14, Q15, INVALID_REG, + Q8, + Q9, + Q10, + Q11, + Q12, + Q13, + Q14, + Q15, + INVALID_REG, }}; return std::find(callee_regs.begin(), callee_regs.end(), reg) != callee_regs.end(); diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.h b/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.h index 2c0b69db1b..3d8c6a9837 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.h +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.h @@ -85,6 +85,7 @@ public: void IncrementLastUsed() { ++m_last_used; } void SetDirty(bool dirty) { m_dirty = dirty; } bool IsDirty() const { return m_dirty; } + private: // For REG_REG RegType m_type; // store type @@ -108,6 +109,7 @@ public: void Unlock() { m_locked = false; } Arm64Gen::ARM64Reg GetReg() const { return m_reg; } bool operator==(const Arm64Gen::ARM64Reg& reg) { return reg == m_reg; } + private: Arm64Gen::ARM64Reg m_reg; bool m_locked; @@ -231,6 +233,7 @@ public: void StoreRegisters(BitSet32 regs) { FlushRegisters(regs, false); } void StoreCRRegisters(BitSet32 regs) { FlushCRRegisters(regs, false); } + protected: // Get the order of the host registers void GetAllocationOrder() override; @@ -284,6 +287,7 @@ public: void FixSinglePrecision(size_t preg); void StoreRegisters(BitSet32 regs) { FlushRegisters(regs, false); } + protected: // Get the order of the host registers void GetAllocationOrder() override; diff --git a/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp b/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp index 8c62230eb7..09342e5543 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp @@ -2,7 +2,6 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "Core/PowerPC/JitArm64/Jit.h" #include "Common/Arm64Emitter.h" #include "Common/CommonTypes.h" #include "Common/JitRegister.h" @@ -10,6 +9,7 @@ #include "Core/CoreTiming.h" #include "Core/HW/CPU.h" #include "Core/HW/Memmap.h" +#include "Core/PowerPC/JitArm64/Jit.h" #include "Core/PowerPC/JitCommon/JitAsmCommon.h" #include "Core/PowerPC/JitCommon/JitCache.h" #include "Core/PowerPC/PowerPC.h" diff --git a/Source/Core/Core/PowerPC/MMU.cpp b/Source/Core/Core/PowerPC/MMU.cpp index 7596b7a6e2..e3d86eed3f 100644 --- a/Source/Core/Core/PowerPC/MMU.cpp +++ b/Source/Core/Core/PowerPC/MMU.cpp @@ -824,35 +824,35 @@ TranslateResult JitCache_TranslateAddress(u32 address) return TranslateResult{true, from_bat, tlb_addr.address}; } -// ********************************************************************************* -// Warning: Test Area -// -// This code is for TESTING and it works in interpreter mode ONLY. Some games (like -// COD iirc) work thanks to this basic TLB emulation. -// It is just a small hack and we have never spend enough time to finalize it. -// Cheers PearPC! -// -// ********************************************************************************* - -/* -* PearPC -* ppc_mmu.cc -* -* Copyright (C) 2003, 2004 Sebastian Biallas (sb@biallas.net) -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ + // ********************************************************************************* + // Warning: Test Area + // + // This code is for TESTING and it works in interpreter mode ONLY. Some games (like + // COD iirc) work thanks to this basic TLB emulation. + // It is just a small hack and we have never spend enough time to finalize it. + // Cheers PearPC! + // + // ********************************************************************************* + + /* + * PearPC + * ppc_mmu.cc + * + * Copyright (C) 2003, 2004 Sebastian Biallas (sb@biallas.net) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #define PPC_EXC_DSISR_PAGE (1 << 30) #define PPC_EXC_DSISR_PROT (1 << 27) diff --git a/Source/Core/Core/PowerPC/PPCAnalyst.cpp b/Source/Core/Core/PowerPC/PPCAnalyst.cpp index a3416e3631..1aedec38c5 100644 --- a/Source/Core/Core/PowerPC/PPCAnalyst.cpp +++ b/Source/Core/Core/PowerPC/PPCAnalyst.cpp @@ -433,8 +433,9 @@ void FindFunctions(u32 startAddr, u32 endAddr, PPCSymbolDB* func_db) else unniceSize /= numUnNice; - INFO_LOG(SYMBOLS, "Functions analyzed. %i leafs, %i nice, %i unnice." - "%i timer, %i rfi. %i are branchless leafs.", + INFO_LOG(SYMBOLS, + "Functions analyzed. %i leafs, %i nice, %i unnice." + "%i timer, %i rfi. %i are branchless leafs.", numLeafs, numNice, numUnNice, numTimer, numRFI, numStraightLeaf); INFO_LOG(SYMBOLS, "Average size: %i (leaf), %i (nice), %i(unnice)", leafSize, niceSize, unniceSize); @@ -798,8 +799,9 @@ u32 PPCAnalyzer::Analyze(u32 address, CodeBlock* block, CodeBuffer* buffer, u32 // bcx with conditional branch conditional_continue = true; } - else if (inst.OPCD == 19 && inst.SUBOP10 == 16 && ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0 || - (inst.BO & BO_DONT_CHECK_CONDITION) == 0)) + else if (inst.OPCD == 19 && inst.SUBOP10 == 16 && + ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0 || + (inst.BO & BO_DONT_CHECK_CONDITION) == 0)) { // bclrx with conditional branch conditional_continue = true; diff --git a/Source/Core/Core/PowerPC/PPCTables.cpp b/Source/Core/Core/PowerPC/PPCTables.cpp index a431d025d5..e8cb5ad2d6 100644 --- a/Source/Core/Core/PowerPC/PPCTables.cpp +++ b/Source/Core/Core/PowerPC/PPCTables.cpp @@ -34,10 +34,22 @@ size_t m_numInstructions; namespace PowerPC { const std::array<u64, 16> m_crTable = {{ - PPCCRToInternal(0x0), PPCCRToInternal(0x1), PPCCRToInternal(0x2), PPCCRToInternal(0x3), - PPCCRToInternal(0x4), PPCCRToInternal(0x5), PPCCRToInternal(0x6), PPCCRToInternal(0x7), - PPCCRToInternal(0x8), PPCCRToInternal(0x9), PPCCRToInternal(0xA), PPCCRToInternal(0xB), - PPCCRToInternal(0xC), PPCCRToInternal(0xD), PPCCRToInternal(0xE), PPCCRToInternal(0xF), + PPCCRToInternal(0x0), + PPCCRToInternal(0x1), + PPCCRToInternal(0x2), + PPCCRToInternal(0x3), + PPCCRToInternal(0x4), + PPCCRToInternal(0x5), + PPCCRToInternal(0x6), + PPCCRToInternal(0x7), + PPCCRToInternal(0x8), + PPCCRToInternal(0x9), + PPCCRToInternal(0xA), + PPCCRToInternal(0xB), + PPCCRToInternal(0xC), + PPCCRToInternal(0xD), + PPCCRToInternal(0xE), + PPCCRToInternal(0xF), }}; } // namespace PowerPC diff --git a/Source/Core/Core/PowerPC/PowerPC.cpp b/Source/Core/Core/PowerPC/PowerPC.cpp index b42f8cf91a..91c6eaaaa5 100644 --- a/Source/Core/Core/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/PowerPC/PowerPC.cpp @@ -184,7 +184,8 @@ static void InitializeCPUCore(int cpu_core) const std::vector<CPUCore>& AvailableCPUCores() { static const std::vector<CPUCore> cpu_cores = { - CORE_INTERPRETER, CORE_CACHEDINTERPRETER, + CORE_INTERPRETER, + CORE_CACHEDINTERPRETER, #ifdef _M_X86_64 CORE_JIT64, #elif defined(_M_ARM_64) diff --git a/Source/Core/Core/WiiUtils.cpp b/Source/Core/Core/WiiUtils.cpp index 88b93295d2..2c509cd5ca 100644 --- a/Source/Core/Core/WiiUtils.cpp +++ b/Source/Core/Core/WiiUtils.cpp @@ -575,8 +575,8 @@ class DiscSystemUpdater final : public SystemUpdater { public: DiscSystemUpdater(UpdateCallback update_callback, const std::string& image_path) - : m_update_callback{std::move(update_callback)}, - m_volume{DiscIO::CreateVolumeFromFilename(image_path)} + : m_update_callback{std::move(update_callback)}, m_volume{DiscIO::CreateVolumeFromFilename( + image_path)} { } UpdateResult DoDiscUpdate(); diff --git a/Source/Core/DiscIO/DirectoryBlob.cpp b/Source/Core/DiscIO/DirectoryBlob.cpp index d8912ec54d..61aac73694 100644 --- a/Source/Core/DiscIO/DirectoryBlob.cpp +++ b/Source/Core/DiscIO/DirectoryBlob.cpp @@ -731,12 +731,13 @@ void DirectoryBlobPartition::WriteDirectory(const File::FSTEntry& parent_entry, std::vector<File::FSTEntry> sorted_entries = parent_entry.children; // Sort for determinism - std::sort(sorted_entries.begin(), sorted_entries.end(), [](const File::FSTEntry& one, - const File::FSTEntry& two) { - const std::string one_upper = ASCIIToUppercase(one.virtualName); - const std::string two_upper = ASCIIToUppercase(two.virtualName); - return one_upper == two_upper ? one.virtualName < two.virtualName : one_upper < two_upper; - }); + std::sort(sorted_entries.begin(), sorted_entries.end(), + [](const File::FSTEntry& one, const File::FSTEntry& two) { + const std::string one_upper = ASCIIToUppercase(one.virtualName); + const std::string two_upper = ASCIIToUppercase(two.virtualName); + return one_upper == two_upper ? one.virtualName < two.virtualName : + one_upper < two_upper; + }); for (const File::FSTEntry& entry : sorted_entries) { diff --git a/Source/Core/DiscIO/DirectoryBlob.h b/Source/Core/DiscIO/DirectoryBlob.h index 70ff61c91b..9da34cc0f0 100644 --- a/Source/Core/DiscIO/DirectoryBlob.h +++ b/Source/Core/DiscIO/DirectoryBlob.h @@ -52,6 +52,7 @@ public: bool operator>(const DiscContent& other) const { return other < *this; } bool operator<=(const DiscContent& other) const { return !(*this < other); } bool operator>=(const DiscContent& other) const { return !(*this > other); } + private: u64 m_offset; u64 m_size = 0; @@ -94,6 +95,7 @@ public: const std::string& GetRootDirectory() const { return m_root_directory; } const std::vector<u8>& GetHeader() const { return m_disc_header; } const DiscContentContainer& GetContents() const { return m_contents; } + private: void SetDiscHeaderAndDiscType(std::optional<bool> is_wii); void SetBI2(); diff --git a/Source/Core/DiscIO/DiscExtractor.cpp b/Source/Core/DiscIO/DiscExtractor.cpp index 7837516f29..7494bd5ab7 100644 --- a/Source/Core/DiscIO/DiscExtractor.cpp +++ b/Source/Core/DiscIO/DiscExtractor.cpp @@ -50,8 +50,9 @@ u64 ReadFile(const Volume& volume, const Partition& partition, const FileInfo* f const u64 read_length = std::min(max_buffer_size, file_info->GetSize() - offset_in_file); - DEBUG_LOG(DISCIO, "Reading %" PRIx64 " bytes at %" PRIx64 " from file %s. Offset: %" PRIx64 - " Size: %" PRIx32, + DEBUG_LOG(DISCIO, + "Reading %" PRIx64 " bytes at %" PRIx64 " from file %s. Offset: %" PRIx64 + " Size: %" PRIx32, read_length, offset_in_file, file_info->GetPath().c_str(), file_info->GetOffset(), file_info->GetSize()); diff --git a/Source/Core/DiscIO/DriveBlob.h b/Source/Core/DiscIO/DriveBlob.h index fd36815600..5580d30179 100644 --- a/Source/Core/DiscIO/DriveBlob.h +++ b/Source/Core/DiscIO/DriveBlob.h @@ -26,6 +26,7 @@ public: BlobType GetBlobType() const override { return BlobType::DRIVE; } u64 GetDataSize() const override { return m_size; } u64 GetRawSize() const override { return m_size; } + private: DriveReader(const std::string& drive); bool GetBlock(u64 block_num, u8* out_ptr) override; diff --git a/Source/Core/DiscIO/Filesystem.h b/Source/Core/DiscIO/Filesystem.h index 8d2adbd0a2..37dc7f9b7e 100644 --- a/Source/Core/DiscIO/Filesystem.h +++ b/Source/Core/DiscIO/Filesystem.h @@ -65,6 +65,7 @@ public: // pointers, but will not invalidate copies of the iterator or file info object. const FileInfo& operator*() const { return *m_file_info.get(); } const FileInfo* operator->() const { return m_file_info.get(); } + private: std::unique_ptr<FileInfo> m_file_info; }; diff --git a/Source/Core/DiscIO/VolumeWii.h b/Source/Core/DiscIO/VolumeWii.h index 84d58a530c..b854ae5917 100644 --- a/Source/Core/DiscIO/VolumeWii.h +++ b/Source/Core/DiscIO/VolumeWii.h @@ -67,6 +67,7 @@ public: protected: u32 GetOffsetShift() const override { return 2; } + private: struct PartitionDetails { diff --git a/Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.cpp b/Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.cpp index 1542ae535a..a99ddfc9b1 100644 --- a/Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.cpp +++ b/Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.cpp @@ -109,7 +109,9 @@ void GeneralWidget::CreateWidgets() auto* shader_compilation_layout = new QGridLayout(); const std::array<const char*, 4> modes = {{ - "Synchronous", "Synchronous (Ubershaders)", "Asynchronous (Ubershaders)", + "Synchronous", + "Synchronous (Ubershaders)", + "Asynchronous (Ubershaders)", "Asynchronous (Skip Drawing)", }}; for (size_t i = 0; i < modes.size(); i++) diff --git a/Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp b/Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp index d03013b736..bbf4426ef9 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp @@ -198,7 +198,8 @@ void IOWindow::OnDetectButtonPressed() releaseMouse(); releaseKeyboard(); removeEventFilter(BlockUserInputFilter::Instance()); - }).detach(); + }) + .detach(); } void IOWindow::OnRangeChanged(int value) diff --git a/Source/Core/DolphinQt2/Debugger/BreakpointWidget.cpp b/Source/Core/DolphinQt2/Debugger/BreakpointWidget.cpp index b67c0b83fe..81db52cc0b 100644 --- a/Source/Core/DolphinQt2/Debugger/BreakpointWidget.cpp +++ b/Source/Core/DolphinQt2/Debugger/BreakpointWidget.cpp @@ -155,9 +155,10 @@ void BreakpointWidget::Update() if (mbp.is_ranged) { - m_table->setItem(i, 3, create_item(QStringLiteral("%1 - %2") - .arg(mbp.start_address, 8, 16, QLatin1Char('0')) - .arg(mbp.end_address, 8, 16, QLatin1Char('0')))); + m_table->setItem(i, 3, + create_item(QStringLiteral("%1 - %2") + .arg(mbp.start_address, 8, 16, QLatin1Char('0')) + .arg(mbp.end_address, 8, 16, QLatin1Char('0')))); } else { diff --git a/Source/Core/DolphinQt2/Debugger/RegisterColumn.cpp b/Source/Core/DolphinQt2/Debugger/RegisterColumn.cpp index 9f7af78ef5..2acacd2602 100644 --- a/Source/Core/DolphinQt2/Debugger/RegisterColumn.cpp +++ b/Source/Core/DolphinQt2/Debugger/RegisterColumn.cpp @@ -98,13 +98,14 @@ void RegisterColumn::Update() switch (m_display) { case RegisterDisplay::Hex: - text = QStringLiteral("%1").arg( - m_value, (m_type == RegisterType::ibat || m_type == RegisterType::dbat || - m_type == RegisterType::fpr || m_type == RegisterType::tb ? - sizeof(u64) : - sizeof(u32)) * - 2, - 16, QLatin1Char('0')); + text = QStringLiteral("%1").arg(m_value, + (m_type == RegisterType::ibat || m_type == RegisterType::dbat || + m_type == RegisterType::fpr || + m_type == RegisterType::tb ? + sizeof(u64) : + sizeof(u32)) * + 2, + 16, QLatin1Char('0')); break; case RegisterDisplay::SInt32: text = QString::number(static_cast<qint32>(m_value)); diff --git a/Source/Core/DolphinQt2/GCMemcardManager.cpp b/Source/Core/DolphinQt2/GCMemcardManager.cpp index a022207aaa..a2a1b0e34c 100644 --- a/Source/Core/DolphinQt2/GCMemcardManager.cpp +++ b/Source/Core/DolphinQt2/GCMemcardManager.cpp @@ -247,11 +247,11 @@ void GCMemcardManager::SetSlotFile(int slot, QString path) void GCMemcardManager::SetSlotFileInteractive(int slot) { - QString path = - QFileDialog::getOpenFileName(this, slot == 0 ? tr("Set memory card file for Slot A") : - tr("Set memory card file for Slot B"), - QString::fromStdString(File::GetUserPath(D_GCUSER_IDX)), - tr("GameCube Memory Cards (*.raw *.gcp)")); + QString path = QFileDialog::getOpenFileName( + this, + slot == 0 ? tr("Set memory card file for Slot A") : tr("Set memory card file for Slot B"), + QString::fromStdString(File::GetUserPath(D_GCUSER_IDX)), + tr("GameCube Memory Cards (*.raw *.gcp)")); if (!path.isEmpty()) m_slot_file_edit[slot]->setText(path); } diff --git a/Source/Core/DolphinQt2/GameList/GameList.cpp b/Source/Core/DolphinQt2/GameList/GameList.cpp index ea8d08c38a..e28012e478 100644 --- a/Source/Core/DolphinQt2/GameList/GameList.cpp +++ b/Source/Core/DolphinQt2/GameList/GameList.cpp @@ -291,8 +291,9 @@ void GameList::CompressISO() } QString dst_path = QFileDialog::getSaveFileName( - this, compressed ? tr("Select where you want to save the decompressed image") : - tr("Select where you want to save the compressed image"), + this, + compressed ? tr("Select where you want to save the decompressed image") : + tr("Select where you want to save the compressed image"), QFileInfo(QString::fromStdString(GetSelectedGame()->GetFilePath())) .dir() .absoluteFilePath(QString::fromStdString(file->GetGameID())) diff --git a/Source/Core/DolphinQt2/Settings/GameCubePane.cpp b/Source/Core/DolphinQt2/Settings/GameCubePane.cpp index 0fbb68f802..78f9450df2 100644 --- a/Source/Core/DolphinQt2/Settings/GameCubePane.cpp +++ b/Source/Core/DolphinQt2/Settings/GameCubePane.cpp @@ -180,9 +180,10 @@ void GameCubePane::OnConfigPressed(int slot) if (!mc.IsValid()) { - QMessageBox::critical(this, tr("Error"), tr("Cannot use that file as a memory card.\n%1\n" - "is not a valid GameCube memory card file") - .arg(filename)); + QMessageBox::critical(this, tr("Error"), + tr("Cannot use that file as a memory card.\n%1\n" + "is not a valid GameCube memory card file") + .arg(filename)); return; } diff --git a/Source/Core/DolphinWX/Cheats/ARCodeAddEdit.h b/Source/Core/DolphinWX/Cheats/ARCodeAddEdit.h index 670da1ae5f..512b4f6b3f 100644 --- a/Source/Core/DolphinWX/Cheats/ARCodeAddEdit.h +++ b/Source/Core/DolphinWX/Cheats/ARCodeAddEdit.h @@ -19,6 +19,7 @@ public: long style = wxDEFAULT_DIALOG_STYLE); const ActionReplay::ARCode& GetCode() const { return m_code; } + private: void CreateGUI(); void SaveCheatData(wxCommandEvent& event); diff --git a/Source/Core/DolphinWX/Cheats/GeckoCodeDiag.h b/Source/Core/DolphinWX/Cheats/GeckoCodeDiag.h index 724dc76939..375023cb0d 100644 --- a/Source/Core/DolphinWX/Cheats/GeckoCodeDiag.h +++ b/Source/Core/DolphinWX/Cheats/GeckoCodeDiag.h @@ -30,6 +30,7 @@ public: void LoadCodes(const IniFile& globalIni, const IniFile& localIni, const std::string& gameid = "", bool checkRunning = false); const std::vector<GeckoCode>& GetCodes() const { return m_gcodes; } + protected: void UpdateInfoBox(wxCommandEvent&); void ToggleCode(wxCommandEvent& evt); diff --git a/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp b/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp index 0114507d66..024b6f8067 100644 --- a/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp @@ -46,15 +46,16 @@ void AdvancedConfigPane::InitializeGUI() m_custom_rtc_time_picker = new wxTimePickerCtrl(this, wxID_ANY); wxStaticText* const clock_override_description = - new wxStaticText(this, wxID_ANY, _("Adjusts the emulated CPU's clock rate.\n\n" - "Higher values may make variable-framerate games run " - "at a higher framerate, at the expense of performance. " - "Lower values may activate a game's internal " - "frameskip, potentially improving performance.\n\n" - "WARNING: Changing this from the default (100%) " - "can and will break games and cause glitches. " - "Do so at your own risk. Please do not report " - "bugs that occur with a non-default clock.")); + new wxStaticText(this, wxID_ANY, + _("Adjusts the emulated CPU's clock rate.\n\n" + "Higher values may make variable-framerate games run " + "at a higher framerate, at the expense of performance. " + "Lower values may activate a game's internal " + "frameskip, potentially improving performance.\n\n" + "WARNING: Changing this from the default (100%) " + "can and will break games and cause glitches. " + "Do so at your own risk. Please do not report " + "bugs that occur with a non-default clock.")); wxStaticText* const custom_rtc_description = new wxStaticText( this, wxID_ANY, diff --git a/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp b/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp index 43d1fa11ac..a7d1dfe096 100644 --- a/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp @@ -82,7 +82,8 @@ void GameCubeConfigPane::InitializeGUI() // Device settings // EXI Devices wxStaticText* GCEXIDeviceText[3] = { - new wxStaticText(this, wxID_ANY, _("Slot A")), new wxStaticText(this, wxID_ANY, _("Slot B")), + new wxStaticText(this, wxID_ANY, _("Slot A")), + new wxStaticText(this, wxID_ANY, _("Slot B")), new wxStaticText(this, wxID_ANY, "SP1"), }; diff --git a/Source/Core/DolphinWX/ControllerConfigDiag.cpp b/Source/Core/DolphinWX/ControllerConfigDiag.cpp index 75bb93ba7a..dbc91c0b8d 100644 --- a/Source/Core/DolphinWX/ControllerConfigDiag.cpp +++ b/Source/Core/DolphinWX/ControllerConfigDiag.cpp @@ -354,9 +354,9 @@ wxSizer* ControllerConfigDiag::CreateEmulatedBTConfigSizer() wxDLG_UNIT(this, wxSize(60, -1))); m_refresh_wm_button->Bind(wxEVT_BUTTON, &ControllerConfigDiag::OnWiimoteRefreshButton, this); - m_unsupported_bt_text = - new wxStaticText(this, wxID_ANY, _("A supported Bluetooth device could not be found,\n" - "so you must connect Wii Remotes manually.")); + m_unsupported_bt_text = new wxStaticText(this, wxID_ANY, + _("A supported Bluetooth device could not be found,\n" + "so you must connect Wii Remotes manually.")); m_unsupported_bt_text->Show(!WiimoteReal::g_wiimote_scanner.IsReady()); // Balance Board @@ -481,8 +481,9 @@ void ControllerConfigDiag::OnGameCubeConfigButton(wxCommandEvent& event) else if (device_type == SerialInterface::SIDEVICE_WIIU_ADAPTER) { GCAdapterConfigDiag config_diag( - this, wxString::Format(_("Wii U GameCube Controller Adapter Configuration Port %i"), - port_num + 1), + this, + wxString::Format(_("Wii U GameCube Controller Adapter Configuration Port %i"), + port_num + 1), port_num); config_diag.ShowModal(); } diff --git a/Source/Core/DolphinWX/Debugger/CodeView.h b/Source/Core/DolphinWX/Debugger/CodeView.h index 52e07e0cf8..b94a822455 100644 --- a/Source/Core/DolphinWX/Debugger/CodeView.h +++ b/Source/Core/DolphinWX/Debugger/CodeView.h @@ -38,6 +38,7 @@ public: } void SetPlain() { m_plain = true; } + private: void OnPaint(wxPaintEvent& event); void OnScrollWheel(wxMouseEvent& event); diff --git a/Source/Core/DolphinWX/Debugger/RegisterView.cpp b/Source/Core/DolphinWX/Debugger/RegisterView.cpp index 6e08be88e2..12faa79837 100755..100644 --- a/Source/Core/DolphinWX/Debugger/RegisterView.cpp +++ b/Source/Core/DolphinWX/Debugger/RegisterView.cpp @@ -319,19 +319,19 @@ wxString CRegTable::GetValue(int row, int col) PowerPC::ppcState.spr[SPR_DBAT0L + row * 2]); if (row < 8) - return wxString::Format("%016llx", (u64)PowerPC::ppcState.spr[SPR_IBAT0U + (row - 4) * 2] - << 32 | - PowerPC::ppcState.spr[SPR_IBAT0L + (row - 4) * 2]); + return wxString::Format("%016llx", + (u64)PowerPC::ppcState.spr[SPR_IBAT0U + (row - 4) * 2] << 32 | + PowerPC::ppcState.spr[SPR_IBAT0L + (row - 4) * 2]); if (row < 12) - return wxString::Format("%016llx", (u64)PowerPC::ppcState.spr[SPR_DBAT4U + (row - 12) * 2] - << 32 | - PowerPC::ppcState.spr[SPR_DBAT4L + (row - 12) * 2]); + return wxString::Format("%016llx", + (u64)PowerPC::ppcState.spr[SPR_DBAT4U + (row - 12) * 2] << 32 | + PowerPC::ppcState.spr[SPR_DBAT4L + (row - 12) * 2]); if (row < 16) - return wxString::Format("%016llx", (u64)PowerPC::ppcState.spr[SPR_IBAT4U + (row - 16) * 2] - << 32 | - PowerPC::ppcState.spr[SPR_IBAT4L + (row - 16) * 2]); + return wxString::Format("%016llx", + (u64)PowerPC::ppcState.spr[SPR_IBAT4U + (row - 16) * 2] << 32 | + PowerPC::ppcState.spr[SPR_IBAT4L + (row - 16) * 2]); if (row == 16) return wxString::Format("%016" PRIx64, static_cast<u64>(PowerPC::ppcState.spr[SPR_TU]) diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index c2214fe77f..eaebe056d4 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -204,7 +204,7 @@ WXLRESULT CRenderFrame::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPa // Let Core finish initializing before accepting any WM_CLOSE messages if (!Core::IsRunning()) break; - // Use default action otherwise + // Use default action otherwise default: // By default let wxWidgets do what it normally does with this event @@ -670,14 +670,15 @@ void CFrame::OnResize(wxSizeEvent& event) // Make sure the logger pane is a sane size if (!m_code_window && m_log_window && m_mgr->GetPane("Pane 1").IsShown() && - !m_mgr->GetPane("Pane 1").IsFloating() && (m_log_window->x > GetClientRect().GetWidth() || - m_log_window->y > GetClientRect().GetHeight())) + !m_mgr->GetPane("Pane 1").IsFloating() && + (m_log_window->x > GetClientRect().GetWidth() || + m_log_window->y > GetClientRect().GetHeight())) { ShowResizePane(); } } -// Host messages + // Host messages #ifdef _WIN32 WXLRESULT CFrame::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) @@ -735,7 +736,7 @@ void CFrame::OnHostMessage(wxCommandEvent& event) case IDM_UPDATE_DISASM_DIALOG: // For breakpoints causing pausing if (!m_code_window || Core::GetState() != Core::State::Paused) return; - // fallthrough + // fallthrough case IDM_UPDATE_GUI: UpdateGUI(); diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index d0c55c7a49..9959b6e5af 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -856,10 +856,11 @@ void CFrame::DoStop() } wxMessageDialog m_StopDlg( - this, !m_tried_graceful_shutdown ? _("Do you want to stop the current emulation?") : - _("A shutdown is already in progress. Unsaved data " - "may be lost if you stop the current emulation " - "before it completes. Force stop?"), + this, + !m_tried_graceful_shutdown ? _("Do you want to stop the current emulation?") : + _("A shutdown is already in progress. Unsaved data " + "may be lost if you stop the current emulation " + "before it completes. Force stop?"), _("Please confirm..."), wxYES_NO | wxSTAY_ON_TOP | wxICON_EXCLAMATION, wxDefaultPosition); HotkeyManagerEmu::Enable(false); diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index 8d363aaad9..6c893bccf3 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -1126,8 +1126,9 @@ void GameListCtrl::CompressSelection(bool _compress) wxProgressDialog progressDialog( _compress ? _("Compressing ISO") : _("Decompressing ISO"), _("Working..."), 1000, // Arbitrary number that's larger than the dialog's width in pixels - this, wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | - wxPD_REMAINING_TIME | wxPD_SMOOTH); + this, + wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | + wxPD_REMAINING_TIME | wxPD_SMOOTH); CompressionProgress progress(0, items_to_compress.size(), "", &progressDialog); diff --git a/Source/Core/DolphinWX/ISOProperties/ISOProperties.cpp b/Source/Core/DolphinWX/ISOProperties/ISOProperties.cpp index 622246f5c4..9de36914ad 100644 --- a/Source/Core/DolphinWX/ISOProperties/ISOProperties.cpp +++ b/Source/Core/DolphinWX/ISOProperties/ISOProperties.cpp @@ -256,9 +256,10 @@ void CISOProperties::CreateGUIControls() _("Info")); // GameConfig editing - Overrides and emulation state - wxStaticText* const OverrideText = new wxStaticText( - m_GameConfig, wxID_ANY, _("These settings override core Dolphin settings.\nUndetermined " - "means the game uses Dolphin's setting.")); + wxStaticText* const OverrideText = + new wxStaticText(m_GameConfig, wxID_ANY, + _("These settings override core Dolphin settings.\nUndetermined " + "means the game uses Dolphin's setting.")); // Core m_cpu_thread = diff --git a/Source/Core/DolphinWX/LogWindow.cpp b/Source/Core/DolphinWX/LogWindow.cpp index 8b880936bf..98c53f9418 100644 --- a/Source/Core/DolphinWX/LogWindow.cpp +++ b/Source/Core/DolphinWX/LogWindow.cpp @@ -91,8 +91,9 @@ void CLogWindow::CreateGUIControls() m_WrapLine->SetValue(wrap_lines); // Log viewer - m_Log = CreateTextCtrl(this, wxID_ANY, wxTE_RICH | wxTE_MULTILINE | wxTE_READONLY | - (wrap_lines ? wxTE_WORDWRAP : wxTE_DONTWRAP)); + m_Log = CreateTextCtrl(this, wxID_ANY, + wxTE_RICH | wxTE_MULTILINE | wxTE_READONLY | + (wrap_lines ? wxTE_WORDWRAP : wxTE_DONTWRAP)); // submit row m_cmdline = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, diff --git a/Source/Core/DolphinWX/MainMenuBar.h b/Source/Core/DolphinWX/MainMenuBar.h index ab786c637f..a573eb2773 100644 --- a/Source/Core/DolphinWX/MainMenuBar.h +++ b/Source/Core/DolphinWX/MainMenuBar.h @@ -77,6 +77,7 @@ public: const std::vector<std::string>& PerspectiveNames() const { return m_perspective_names; } int ActivePerspective() const { return m_active_perspective; } wxEvent* Clone() const override { return new PopulatePerspectivesEvent(*this); } + private: std::vector<std::string> m_perspective_names; int m_active_perspective{}; diff --git a/Source/Core/DolphinWX/NetPlay/MD5Dialog.h b/Source/Core/DolphinWX/NetPlay/MD5Dialog.h index f97bd62c95..6adf9bcba7 100644 --- a/Source/Core/DolphinWX/NetPlay/MD5Dialog.h +++ b/Source/Core/DolphinWX/NetPlay/MD5Dialog.h @@ -7,7 +7,6 @@ #include <map> #include <string> #include <vector> -#include <vector> #include <wx/dialog.h> class NetPlayServer; diff --git a/Source/Core/DolphinWX/PostProcessingConfigDiag.h b/Source/Core/DolphinWX/PostProcessingConfigDiag.h index ec366e8635..7b49bffbe5 100644 --- a/Source/Core/DolphinWX/PostProcessingConfigDiag.h +++ b/Source/Core/DolphinWX/PostProcessingConfigDiag.h @@ -35,6 +35,7 @@ private: public: UserEventData(const std::string& data) : m_data(data) {} const std::string& GetData() { return m_data; } + private: const std::string m_data; }; diff --git a/Source/Core/DolphinWX/TASInputDlg.cpp b/Source/Core/DolphinWX/TASInputDlg.cpp index f778236a81..dde2b309ff 100644 --- a/Source/Core/DolphinWX/TASInputDlg.cpp +++ b/Source/Core/DolphinWX/TASInputDlg.cpp @@ -44,24 +44,49 @@ struct TASWiimoteReport }; constexpr std::array<int, 12> s_gc_pad_buttons_bitmask{{ - PAD_BUTTON_DOWN, PAD_BUTTON_UP, PAD_BUTTON_LEFT, PAD_BUTTON_RIGHT, PAD_BUTTON_A, PAD_BUTTON_B, - PAD_BUTTON_X, PAD_BUTTON_Y, PAD_TRIGGER_Z, PAD_TRIGGER_L, PAD_TRIGGER_R, PAD_BUTTON_START, + PAD_BUTTON_DOWN, + PAD_BUTTON_UP, + PAD_BUTTON_LEFT, + PAD_BUTTON_RIGHT, + PAD_BUTTON_A, + PAD_BUTTON_B, + PAD_BUTTON_X, + PAD_BUTTON_Y, + PAD_TRIGGER_Z, + PAD_TRIGGER_L, + PAD_TRIGGER_R, + PAD_BUTTON_START, }}; constexpr std::array<int, 11> s_wii_buttons_bitmask{{ - WiimoteEmu::Wiimote::PAD_DOWN, WiimoteEmu::Wiimote::PAD_UP, WiimoteEmu::Wiimote::PAD_LEFT, - WiimoteEmu::Wiimote::PAD_RIGHT, WiimoteEmu::Wiimote::BUTTON_A, WiimoteEmu::Wiimote::BUTTON_B, - WiimoteEmu::Wiimote::BUTTON_ONE, WiimoteEmu::Wiimote::BUTTON_TWO, - WiimoteEmu::Wiimote::BUTTON_PLUS, WiimoteEmu::Wiimote::BUTTON_MINUS, + WiimoteEmu::Wiimote::PAD_DOWN, + WiimoteEmu::Wiimote::PAD_UP, + WiimoteEmu::Wiimote::PAD_LEFT, + WiimoteEmu::Wiimote::PAD_RIGHT, + WiimoteEmu::Wiimote::BUTTON_A, + WiimoteEmu::Wiimote::BUTTON_B, + WiimoteEmu::Wiimote::BUTTON_ONE, + WiimoteEmu::Wiimote::BUTTON_TWO, + WiimoteEmu::Wiimote::BUTTON_PLUS, + WiimoteEmu::Wiimote::BUTTON_MINUS, WiimoteEmu::Wiimote::BUTTON_HOME, }}; constexpr std::array<int, 15> s_cc_buttons_bitmask{{ - WiimoteEmu::Classic::PAD_DOWN, WiimoteEmu::Classic::PAD_UP, WiimoteEmu::Classic::PAD_LEFT, - WiimoteEmu::Classic::PAD_RIGHT, WiimoteEmu::Classic::BUTTON_A, WiimoteEmu::Classic::BUTTON_B, - WiimoteEmu::Classic::BUTTON_X, WiimoteEmu::Classic::BUTTON_Y, WiimoteEmu::Classic::BUTTON_PLUS, - WiimoteEmu::Classic::BUTTON_MINUS, WiimoteEmu::Classic::TRIGGER_L, - WiimoteEmu::Classic::TRIGGER_R, WiimoteEmu::Classic::BUTTON_ZR, WiimoteEmu::Classic::BUTTON_ZL, + WiimoteEmu::Classic::PAD_DOWN, + WiimoteEmu::Classic::PAD_UP, + WiimoteEmu::Classic::PAD_LEFT, + WiimoteEmu::Classic::PAD_RIGHT, + WiimoteEmu::Classic::BUTTON_A, + WiimoteEmu::Classic::BUTTON_B, + WiimoteEmu::Classic::BUTTON_X, + WiimoteEmu::Classic::BUTTON_Y, + WiimoteEmu::Classic::BUTTON_PLUS, + WiimoteEmu::Classic::BUTTON_MINUS, + WiimoteEmu::Classic::TRIGGER_L, + WiimoteEmu::Classic::TRIGGER_R, + WiimoteEmu::Classic::BUTTON_ZR, + WiimoteEmu::Classic::BUTTON_ZL, WiimoteEmu::Classic::BUTTON_HOME, }}; diff --git a/Source/Core/DolphinWX/VideoConfigDiag.cpp b/Source/Core/DolphinWX/VideoConfigDiag.cpp index ec6a434b8b..ab9c983bb1 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/VideoConfigDiag.cpp @@ -328,8 +328,9 @@ static wxString shader_compile_before_start_desc = "queue may reduce frame rates. Otherwise, if unsure, leave this unchecked."); VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string& title) - : wxDialog(parent, wxID_ANY, wxString::Format(_("Dolphin %s Graphics Configuration"), - wxGetTranslation(StrToWxStr(title)))), + : wxDialog(parent, wxID_ANY, + wxString::Format(_("Dolphin %s Graphics Configuration"), + wxGetTranslation(StrToWxStr(title)))), vconfig(g_Config) { // We don't need to load the config if the core is running, since it would have been done diff --git a/Source/Core/InputCommon/ControlReference/ControlReference.cpp b/Source/Core/InputCommon/ControlReference/ControlReference.cpp index c7d652f15b..e0d9c8b678 100644 --- a/Source/Core/InputCommon/ControlReference/ControlReference.cpp +++ b/Source/Core/InputCommon/ControlReference/ControlReference.cpp @@ -131,8 +131,8 @@ ciface::Core::Device::Control* InputReference::Detect(const unsigned int ms, // get starting state of all inputs, // so we can ignore those that were activated at time of Detect start - std::vector<ciface::Core::Device::Input *>::const_iterator i = device->Inputs().begin(), - e = device->Inputs().end(); + std::vector<ciface::Core::Device::Input*>::const_iterator i = device->Inputs().begin(), + e = device->Inputs().end(); for (std::vector<bool>::iterator state = states.begin(); i != e; ++i) *state++ = ((*i)->GetState() > (1 - INPUT_DETECT_THRESHOLD)); diff --git a/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp b/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp index 85eb86d598..e7ab53d488 100644 --- a/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp +++ b/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp @@ -405,6 +405,7 @@ class Parser public: explicit Parser(std::vector<Token> tokens_) : tokens(tokens_) { m_it = tokens.begin(); } ParseResult Parse() { return Toplevel(); } + private: std::vector<Token> tokens; std::vector<Token>::iterator m_it; diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/Device.h index dc3bdbe84f..2012941a83 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.h +++ b/Source/Core/InputCommon/ControllerInterface/Device.h @@ -98,6 +98,7 @@ protected: } std::string GetName() const override { return m_low.GetName() + *m_high.GetName().rbegin(); } + private: Input& m_low; Input& m_high; diff --git a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h index 3cb79fee39..a986f120c1 100644 --- a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h +++ b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h @@ -33,6 +33,7 @@ public: void UpdateInput() override; std::string GetName() const override { return m_name; } std::string GetSource() const override { return "Pipe"; } + private: class PipeInput : public Input { @@ -41,6 +42,7 @@ private: std::string GetName() const override { return m_name; } ControlState GetState() const override { return m_state; } void SetState(ControlState state) { m_state = state; } + private: const std::string m_name; ControlState m_state; diff --git a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.h b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.h index 513c5a67f2..c1a3da2ada 100644 --- a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.h +++ b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.h @@ -74,6 +74,7 @@ public: std::string GetName() const override { return m_name; } std::string GetSource() const override { return "evdev"; } bool IsInteresting() const { return m_initialized && m_interesting; } + private: const std::string m_devfile; int m_fd; diff --git a/Source/Core/InputCommon/GCAdapter.cpp b/Source/Core/InputCommon/GCAdapter.cpp index 7a897affdc..743fedefdd 100644 --- a/Source/Core/InputCommon/GCAdapter.cpp +++ b/Source/Core/InputCommon/GCAdapter.cpp @@ -137,8 +137,9 @@ static void ScanThreadFunc() if (s_libusb_hotplug_enabled) { if (libusb_hotplug_register_callback( - s_libusb_context, (libusb_hotplug_event)(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | - LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT), + s_libusb_context, + (libusb_hotplug_event)(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | + LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT), LIBUSB_HOTPLUG_ENUMERATE, 0x057e, 0x0337, LIBUSB_HOTPLUG_MATCH_ANY, HotplugCallback, nullptr, &s_hotplug_handle) != LIBUSB_SUCCESS) s_libusb_hotplug_enabled = false; @@ -267,8 +268,9 @@ static bool CheckDeviceAccess(libusb_device* device) { if (dRet) { - ERROR_LOG(SERIALINTERFACE, "Dolphin does not have access to this device: Bus %03d Device " - "%03d: ID ????:???? (couldn't get id).", + ERROR_LOG(SERIALINTERFACE, + "Dolphin does not have access to this device: Bus %03d Device " + "%03d: ID ????:???? (couldn't get id).", bus, port); } else diff --git a/Source/Core/InputCommon/InputConfig.h b/Source/Core/InputCommon/InputConfig.h index fcbd8a59f9..a993a412b1 100644 --- a/Source/Core/InputCommon/InputConfig.h +++ b/Source/Core/InputCommon/InputConfig.h @@ -38,6 +38,7 @@ public: std::string GetGUIName() const { return m_gui_name; } std::string GetProfileName() const { return m_profile_name; } + private: std::vector<std::unique_ptr<ControllerEmu::EmulatedController>> m_controllers; const std::string m_ini_name; diff --git a/Source/Core/VideoBackends/D3D/D3DBase.h b/Source/Core/VideoBackends/D3D/D3DBase.h index c61fab81d9..f17ebd54eb 100644 --- a/Source/Core/VideoBackends/D3D/D3DBase.h +++ b/Source/Core/VideoBackends/D3D/D3DBase.h @@ -35,8 +35,7 @@ namespace DX11 #define CHECK(cond, Message, ...) \ if (!(cond)) \ { \ - PanicAlert("%s failed in %s at line %d: " Message, __func__, __FILE__, __LINE__, \ - __VA_ARGS__); \ + PanicAlert("%s failed in %s at line %d: " Message, __func__, __FILE__, __LINE__, __VA_ARGS__); \ } class D3DTexture2D; diff --git a/Source/Core/VideoBackends/D3D/D3DUtil.cpp b/Source/Core/VideoBackends/D3D/D3DUtil.cpp index 317b6c4b2f..7ce23a32fe 100644 --- a/Source/Core/VideoBackends/D3D/D3DUtil.cpp +++ b/Source/Core/VideoBackends/D3D/D3DUtil.cpp @@ -89,6 +89,7 @@ public: void EndAppendData() { context->Unmap(buf, 0); } void AddWrapObserver(bool* observer) { observers.push_back(observer); } inline ID3D11Buffer*& GetBuffer() { return buf; } + private: ID3D11Buffer* buf = nullptr; unsigned int offset = 0; @@ -645,7 +646,10 @@ void drawShadedTexQuad(ID3D11ShaderResourceView* texture, const D3D11_RECT* rSou void drawColorQuad(u32 Color, float z, float x1, float y1, float x2, float y2) { ColVertex coords[4] = { - {x1, y1, z, Color}, {x2, y1, z, Color}, {x1, y2, z, Color}, {x2, y2, z, Color}, + {x1, y1, z, Color}, + {x2, y1, z, Color}, + {x1, y2, z, Color}, + {x2, y2, z, Color}, }; if (cq_observer || draw_quad_data.x1 != x1 || draw_quad_data.y1 != y1 || diff --git a/Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp b/Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp index 4ba64eec21..421a1019bd 100644 --- a/Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp +++ b/Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp @@ -23,19 +23,47 @@ VertexManager::CreateNativeVertexFormat(const PortableVertexDeclaration& vtx_dec static const DXGI_FORMAT d3d_format_lookup[5 * 4 * 2] = { // float formats - DXGI_FORMAT_R8_UNORM, DXGI_FORMAT_R8_SNORM, DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_R16_SNORM, - DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R8G8_UNORM, DXGI_FORMAT_R8G8_SNORM, DXGI_FORMAT_R16G16_UNORM, - DXGI_FORMAT_R16G16_SNORM, DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, - DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_R32G32B32_FLOAT, - DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_SNORM, DXGI_FORMAT_R16G16B16A16_UNORM, - DXGI_FORMAT_R16G16B16A16_SNORM, DXGI_FORMAT_R32G32B32A32_FLOAT, + DXGI_FORMAT_R8_UNORM, + DXGI_FORMAT_R8_SNORM, + DXGI_FORMAT_R16_UNORM, + DXGI_FORMAT_R16_SNORM, + DXGI_FORMAT_R32_FLOAT, + DXGI_FORMAT_R8G8_UNORM, + DXGI_FORMAT_R8G8_SNORM, + DXGI_FORMAT_R16G16_UNORM, + DXGI_FORMAT_R16G16_SNORM, + DXGI_FORMAT_R32G32_FLOAT, + DXGI_FORMAT_UNKNOWN, + DXGI_FORMAT_UNKNOWN, + DXGI_FORMAT_UNKNOWN, + DXGI_FORMAT_UNKNOWN, + DXGI_FORMAT_R32G32B32_FLOAT, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_SNORM, + DXGI_FORMAT_R16G16B16A16_UNORM, + DXGI_FORMAT_R16G16B16A16_SNORM, + DXGI_FORMAT_R32G32B32A32_FLOAT, // integer formats - DXGI_FORMAT_R8_UINT, DXGI_FORMAT_R8_SINT, DXGI_FORMAT_R16_UINT, DXGI_FORMAT_R16_SINT, - DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_R8G8_UINT, DXGI_FORMAT_R8G8_SINT, DXGI_FORMAT_R16G16_UINT, - DXGI_FORMAT_R16G16_SINT, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, - DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_R8G8B8A8_UINT, - DXGI_FORMAT_R8G8B8A8_SINT, DXGI_FORMAT_R16G16B16A16_UINT, DXGI_FORMAT_R16G16B16A16_SINT, + DXGI_FORMAT_R8_UINT, + DXGI_FORMAT_R8_SINT, + DXGI_FORMAT_R16_UINT, + DXGI_FORMAT_R16_SINT, + DXGI_FORMAT_UNKNOWN, + DXGI_FORMAT_R8G8_UINT, + DXGI_FORMAT_R8G8_SINT, + DXGI_FORMAT_R16G16_UINT, + DXGI_FORMAT_R16G16_SINT, + DXGI_FORMAT_UNKNOWN, + DXGI_FORMAT_UNKNOWN, + DXGI_FORMAT_UNKNOWN, + DXGI_FORMAT_UNKNOWN, + DXGI_FORMAT_UNKNOWN, + DXGI_FORMAT_UNKNOWN, + DXGI_FORMAT_R8G8B8A8_UINT, + DXGI_FORMAT_R8G8B8A8_SINT, + DXGI_FORMAT_R16G16B16A16_UINT, + DXGI_FORMAT_R16G16B16A16_SINT, DXGI_FORMAT_UNKNOWN, }; diff --git a/Source/Core/VideoBackends/D3D/VertexManager.h b/Source/Core/VideoBackends/D3D/VertexManager.h index c4b45931d2..922f854c6b 100644 --- a/Source/Core/VideoBackends/D3D/VertexManager.h +++ b/Source/Core/VideoBackends/D3D/VertexManager.h @@ -48,6 +48,7 @@ public: protected: void ResetBuffer(u32 stride) override; u16* GetIndexBuffer() { return &LocalIBuffer[0]; } + private: void PrepareDrawBuffers(u32 stride); void Draw(u32 stride); diff --git a/Source/Core/VideoBackends/OGL/FramebufferManager.cpp b/Source/Core/VideoBackends/OGL/FramebufferManager.cpp index b82d6d89cf..51d48e95df 100644 --- a/Source/Core/VideoBackends/OGL/FramebufferManager.cpp +++ b/Source/Core/VideoBackends/OGL/FramebufferManager.cpp @@ -263,11 +263,13 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms "vec4 sampleEFB(ivec3 pos) {\n" " vec4 color = vec4(0.0, 0.0, 0.0, 0.0);\n" " for(int i=0; i<" + - samples.str() + "; i++)\n" - " color += texelFetch(samp9, pos, i);\n" - " return color / " + - samples.str() + ";\n" - "}\n"; + samples.str() + + "; i++)\n" + " color += texelFetch(samp9, pos, i);\n" + " return color / " + + samples.str() + + ";\n" + "}\n"; } else { @@ -275,11 +277,13 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms "vec4 sampleEFB(ivec3 pos) {\n" " vec4 color = vec4(0.0, 0.0, 0.0, 0.0);\n" " for(int i=0; i<" + - samples.str() + "; i++)\n" - " color += texelFetch(samp9, pos.xy, i);\n" - " return color / " + - samples.str() + ";\n" - "}\n"; + samples.str() + + "; i++)\n" + " color += texelFetch(samp9, pos.xy, i);\n" + " return color / " + + samples.str() + + ";\n" + "}\n"; } } @@ -316,21 +320,23 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms layers << m_EFBLayers; std::string gs = "layout(triangles) in;\n" "layout(triangle_strip, max_vertices = " + - vertices.str() + ") out;\n" - "flat out int layer;\n" - "void main()\n" - "{\n" - " for (int j = 0; j < " + - layers.str() + "; ++j) {\n" - " for (int i = 0; i < 3; ++i) {\n" - " layer = j;\n" - " gl_Layer = j;\n" - " gl_Position = gl_in[i].gl_Position;\n" - " EmitVertex();\n" - " }\n" - " EndPrimitive();\n" - " }\n" - "}\n"; + vertices.str() + + ") out;\n" + "flat out int layer;\n" + "void main()\n" + "{\n" + " for (int j = 0; j < " + + layers.str() + + "; ++j) {\n" + " for (int i = 0; i < 3; ++i) {\n" + " layer = j;\n" + " gl_Layer = j;\n" + " gl_Position = gl_in[i].gl_Position;\n" + " EmitVertex();\n" + " }\n" + " EndPrimitive();\n" + " }\n" + "}\n"; ProgramShaderCache::CompileShader(m_pixel_format_shaders[0], vs, ps_rgb8_to_rgba6, (m_EFBLayers > 1) ? gs : ""); diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index e7557deed6..a67f303c10 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -1302,24 +1302,24 @@ void Renderer::ApplyBlendingState(const BlendingState state, bool force) } else { - const GLenum src_factors[8] = { - GL_ZERO, - GL_ONE, - GL_DST_COLOR, - GL_ONE_MINUS_DST_COLOR, - useDualSource ? GL_SRC1_ALPHA : (GLenum)GL_SRC_ALPHA, - useDualSource ? GL_ONE_MINUS_SRC1_ALPHA : (GLenum)GL_ONE_MINUS_SRC_ALPHA, - GL_DST_ALPHA, - GL_ONE_MINUS_DST_ALPHA}; - const GLenum dst_factors[8] = { - GL_ZERO, - GL_ONE, - GL_SRC_COLOR, - GL_ONE_MINUS_SRC_COLOR, - useDualSource ? GL_SRC1_ALPHA : (GLenum)GL_SRC_ALPHA, - useDualSource ? GL_ONE_MINUS_SRC1_ALPHA : (GLenum)GL_ONE_MINUS_SRC_ALPHA, - GL_DST_ALPHA, - GL_ONE_MINUS_DST_ALPHA}; + const GLenum src_factors[8] = {GL_ZERO, + GL_ONE, + GL_DST_COLOR, + GL_ONE_MINUS_DST_COLOR, + useDualSource ? GL_SRC1_ALPHA : (GLenum)GL_SRC_ALPHA, + useDualSource ? GL_ONE_MINUS_SRC1_ALPHA : + (GLenum)GL_ONE_MINUS_SRC_ALPHA, + GL_DST_ALPHA, + GL_ONE_MINUS_DST_ALPHA}; + const GLenum dst_factors[8] = {GL_ZERO, + GL_ONE, + GL_SRC_COLOR, + GL_ONE_MINUS_SRC_COLOR, + useDualSource ? GL_SRC1_ALPHA : (GLenum)GL_SRC_ALPHA, + useDualSource ? GL_ONE_MINUS_SRC1_ALPHA : + (GLenum)GL_ONE_MINUS_SRC_ALPHA, + GL_DST_ALPHA, + GL_ONE_MINUS_DST_ALPHA}; if (state.blendenable) { diff --git a/Source/Core/VideoBackends/OGL/StreamBuffer.cpp b/Source/Core/VideoBackends/OGL/StreamBuffer.cpp index eb7fc0a619..1307350086 100644 --- a/Source/Core/VideoBackends/OGL/StreamBuffer.cpp +++ b/Source/Core/VideoBackends/OGL/StreamBuffer.cpp @@ -226,11 +226,13 @@ public: // COHERENT_BIT is set so we don't have to use a MemoryBarrier on write // CLIENT_STORAGE_BIT is set since we access the buffer more frequently on the client side then // server side - glBufferStorage(m_buffertype, m_size, nullptr, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | - (coherent ? GL_MAP_COHERENT_BIT : 0)); - m_pointer = (u8*)glMapBufferRange( - m_buffertype, 0, m_size, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | - (coherent ? GL_MAP_COHERENT_BIT : GL_MAP_FLUSH_EXPLICIT_BIT)); + glBufferStorage(m_buffertype, m_size, nullptr, + GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | + (coherent ? GL_MAP_COHERENT_BIT : 0)); + m_pointer = + (u8*)glMapBufferRange(m_buffertype, 0, m_size, + GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | + (coherent ? GL_MAP_COHERENT_BIT : GL_MAP_FLUSH_EXPLICIT_BIT)); } ~BufferStorage() diff --git a/Source/Core/VideoBackends/Software/Tev.cpp b/Source/Core/VideoBackends/Software/Tev.cpp index a9f2c61338..fb6107ea98 100644 --- a/Source/Core/VideoBackends/Software/Tev.cpp +++ b/Source/Core/VideoBackends/Software/Tev.cpp @@ -776,9 +776,9 @@ void Tev::Draw() // Based on that, choose the index such that points which are far away from the z-axis use the // 10th "k" value and such that central points use the first value. float floatindex = 9.f - std::abs(offset) * 9.f; - floatindex = (floatindex < 0.f) ? 0.f : (floatindex > 9.f) ? - 9.f : - floatindex; // TODO: This shouldn't be necessary! + floatindex = (floatindex < 0.f) ? + 0.f : + (floatindex > 9.f) ? 9.f : floatindex; // TODO: This shouldn't be necessary! // Get the two closest integer indices, look up the corresponding samples const int indexlower = (int)floor(floatindex); diff --git a/Source/Core/VideoBackends/Software/TextureEncoder.cpp b/Source/Core/VideoBackends/Software/TextureEncoder.cpp index c6f9f1b504..751b148e18 100644 --- a/Source/Core/VideoBackends/Software/TextureEncoder.cpp +++ b/Source/Core/VideoBackends/Software/TextureEncoder.cpp @@ -1216,7 +1216,7 @@ static void EncodeZ24(u8* dst, const u8* src, EFBCopyFormat format) ENCODE_LOOP_SPANS break; - // FIXME: handle RA8? + // FIXME: handle RA8? case EFBCopyFormat::RGBA8: SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize); @@ -1326,7 +1326,7 @@ static void EncodeZ24halfscale(u8* dst, const u8* src, EFBCopyFormat format) ENCODE_LOOP_SPANS break; - // FIXME: handle RA8? + // FIXME: handle RA8? case EFBCopyFormat::RGBA8: SetBlockDimensions(2, 2, &sBlkCount, &tBlkCount, &sBlkSize, &tBlkSize); diff --git a/Source/Core/VideoBackends/Vulkan/FramebufferManager.cpp b/Source/Core/VideoBackends/Vulkan/FramebufferManager.cpp index 1df851cb7c..1713b0c514 100644 --- a/Source/Core/VideoBackends/Vulkan/FramebufferManager.cpp +++ b/Source/Core/VideoBackends/Vulkan/FramebufferManager.cpp @@ -228,7 +228,8 @@ bool FramebufferManager::CreateEFBFramebuffer() } VkImageView framebuffer_attachments[] = { - m_efb_color_texture->GetView(), m_efb_depth_texture->GetView(), + m_efb_color_texture->GetView(), + m_efb_depth_texture->GetView(), }; VkFramebufferCreateInfo framebuffer_info = {VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO, diff --git a/Source/Core/VideoBackends/Vulkan/PerfQuery.cpp b/Source/Core/VideoBackends/Vulkan/PerfQuery.cpp index ef47cb9ba2..25334e3eb4 100644 --- a/Source/Core/VideoBackends/Vulkan/PerfQuery.cpp +++ b/Source/Core/VideoBackends/Vulkan/PerfQuery.cpp @@ -52,8 +52,9 @@ bool PerfQuery::Initialize() } g_command_buffer_mgr->AddFencePointCallback( - this, std::bind(&PerfQuery::OnCommandBufferQueued, this, std::placeholders::_1, - std::placeholders::_2), + this, + std::bind(&PerfQuery::OnCommandBufferQueued, this, std::placeholders::_1, + std::placeholders::_2), std::bind(&PerfQuery::OnCommandBufferExecuted, this, std::placeholders::_1)); return true; diff --git a/Source/Core/VideoBackends/Vulkan/ShaderCache.h b/Source/Core/VideoBackends/Vulkan/ShaderCache.h index 1082d0039e..28480569e0 100644 --- a/Source/Core/VideoBackends/Vulkan/ShaderCache.h +++ b/Source/Core/VideoBackends/Vulkan/ShaderCache.h @@ -116,6 +116,7 @@ public: VkShaderModule GetPassthroughVertexShader() const { return m_passthrough_vertex_shader; } VkShaderModule GetScreenQuadGeometryShader() const { return m_screen_quad_geometry_shader; } VkShaderModule GetPassthroughGeometryShader() const { return m_passthrough_geometry_shader; } + private: bool CreatePipelineCache(); bool LoadPipelineCache(); diff --git a/Source/Core/VideoBackends/Vulkan/ShaderCompiler.cpp b/Source/Core/VideoBackends/Vulkan/ShaderCompiler.cpp index c97c56f75d..0633456ceb 100644 --- a/Source/Core/VideoBackends/Vulkan/ShaderCompiler.cpp +++ b/Source/Core/VideoBackends/Vulkan/ShaderCompiler.cpp @@ -365,7 +365,8 @@ const TBuiltInResource* GetCompilerResourceLimits() /* .MaxCullDistances = */ 8, /* .MaxCombinedClipAndCullDistances = */ 8, /* .MaxSamples = */ 4, - /* .limits = */ { + /* .limits = */ + { /* .nonInductiveForLoops = */ 1, /* .whileLoops = */ 1, /* .doWhileLoops = */ 1, diff --git a/Source/Core/VideoBackends/Vulkan/StreamBuffer.cpp b/Source/Core/VideoBackends/Vulkan/StreamBuffer.cpp index b659eef0da..cb8e660af2 100644 --- a/Source/Core/VideoBackends/Vulkan/StreamBuffer.cpp +++ b/Source/Core/VideoBackends/Vulkan/StreamBuffer.cpp @@ -22,8 +22,9 @@ StreamBuffer::StreamBuffer(VkBufferUsageFlags usage, size_t max_size) { // Add a callback that fires on fence point creation and signal g_command_buffer_mgr->AddFencePointCallback( - this, std::bind(&StreamBuffer::OnCommandBufferQueued, this, std::placeholders::_1, - std::placeholders::_2), + this, + std::bind(&StreamBuffer::OnCommandBufferQueued, this, std::placeholders::_1, + std::placeholders::_2), std::bind(&StreamBuffer::OnCommandBufferExecuted, this, std::placeholders::_1)); } diff --git a/Source/Core/VideoBackends/Vulkan/TextureConverter.cpp b/Source/Core/VideoBackends/Vulkan/TextureConverter.cpp index eb9cde54ba..6c584fcc95 100644 --- a/Source/Core/VideoBackends/Vulkan/TextureConverter.cpp +++ b/Source/Core/VideoBackends/Vulkan/TextureConverter.cpp @@ -244,8 +244,9 @@ void TextureConverter::EncodeTextureToMemory(VkImageView src_texture, u8* dest_p // complex down filtering to average all pixels and produce the correct result. bool linear_filter = (scale_by_half && !params.depth) || g_renderer->GetEFBScale() != 1 || params.y_scale > 1.0f; - draw.SetPSSampler(0, src_texture, linear_filter ? g_object_cache->GetLinearSampler() : - g_object_cache->GetPointSampler()); + draw.SetPSSampler(0, src_texture, + linear_filter ? g_object_cache->GetLinearSampler() : + g_object_cache->GetPointSampler()); u32 render_width = bytes_per_row / sizeof(u32); u32 render_height = num_blocks_y; diff --git a/Source/Core/VideoBackends/Vulkan/Util.cpp b/Source/Core/VideoBackends/Vulkan/Util.cpp index 07c0311da1..9e9060c5a3 100644 --- a/Source/Core/VideoBackends/Vulkan/Util.cpp +++ b/Source/Core/VideoBackends/Vulkan/Util.cpp @@ -585,12 +585,18 @@ void UtilityShaderDraw::BindDescriptors() if (set == VK_NULL_HANDLE) PanicAlert("Failed to allocate descriptor set for utility draw"); - set_writes[num_set_writes++] = { - VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, nullptr, set, UBO_DESCRIPTOR_SET_BINDING_VS, 0, 1, - VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, nullptr, - (m_vs_uniform_buffer.buffer != VK_NULL_HANDLE) ? &m_vs_uniform_buffer : - &dummy_uniform_buffer, - nullptr}; + set_writes[num_set_writes++] = {VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, + nullptr, + set, + UBO_DESCRIPTOR_SET_BINDING_VS, + 0, + 1, + VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, + nullptr, + (m_vs_uniform_buffer.buffer != VK_NULL_HANDLE) ? + &m_vs_uniform_buffer : + &dummy_uniform_buffer, + nullptr}; if (g_vulkan_context->SupportsGeometryShaders()) { @@ -606,12 +612,18 @@ void UtilityShaderDraw::BindDescriptors() nullptr}; } - set_writes[num_set_writes++] = { - VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, nullptr, set, UBO_DESCRIPTOR_SET_BINDING_PS, 0, 1, - VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, nullptr, - (m_ps_uniform_buffer.buffer != VK_NULL_HANDLE) ? &m_ps_uniform_buffer : - &dummy_uniform_buffer, - nullptr}; + set_writes[num_set_writes++] = {VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, + nullptr, + set, + UBO_DESCRIPTOR_SET_BINDING_PS, + 0, + 1, + VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, + nullptr, + (m_ps_uniform_buffer.buffer != VK_NULL_HANDLE) ? + &m_ps_uniform_buffer : + &dummy_uniform_buffer, + nullptr}; bind_descriptor_sets[DESCRIPTOR_SET_BIND_POINT_UNIFORM_BUFFERS] = set; } diff --git a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp index a62238e8a2..cee60012a8 100644 --- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp @@ -131,12 +131,14 @@ void VKTexture::CopyRectangleFromTexture(const AbstractTexture* src, { Texture2D* src_texture = static_cast<const VKTexture*>(src)->GetRawTexIdentifier(); - ASSERT_MSG(VIDEO, static_cast<u32>(src_rect.GetWidth()) <= src_texture->GetWidth() && - static_cast<u32>(src_rect.GetHeight()) <= src_texture->GetHeight(), + ASSERT_MSG(VIDEO, + static_cast<u32>(src_rect.GetWidth()) <= src_texture->GetWidth() && + static_cast<u32>(src_rect.GetHeight()) <= src_texture->GetHeight(), "Source rect is too large for CopyRectangleFromTexture"); - ASSERT_MSG(VIDEO, static_cast<u32>(dst_rect.GetWidth()) <= m_config.width && - static_cast<u32>(dst_rect.GetHeight()) <= m_config.height, + ASSERT_MSG(VIDEO, + static_cast<u32>(dst_rect.GetWidth()) <= m_config.width && + static_cast<u32>(dst_rect.GetHeight()) <= m_config.height, "Dest rect is too large for CopyRectangleFromTexture"); VkImageCopy image_copy = { diff --git a/Source/Core/VideoBackends/Vulkan/VulkanContext.cpp b/Source/Core/VideoBackends/Vulkan/VulkanContext.cpp index 77702f436b..9a96aa9e2e 100644 --- a/Source/Core/VideoBackends/Vulkan/VulkanContext.cpp +++ b/Source/Core/VideoBackends/Vulkan/VulkanContext.cpp @@ -552,7 +552,8 @@ bool VulkanContext::CreateDevice(VkSurfaceKHR surface, bool enable_validation_la present_queue_info.pQueuePriorities = queue_priorities; std::array<VkDeviceQueueCreateInfo, 2> queue_infos = {{ - graphics_queue_info, present_queue_info, + graphics_queue_info, + present_queue_info, }}; device_info.queueCreateInfoCount = 1; diff --git a/Source/Core/VideoCommon/AsyncRequests.h b/Source/Core/VideoCommon/AsyncRequests.h index 4c22d388e3..acd665b3b1 100644 --- a/Source/Core/VideoCommon/AsyncRequests.h +++ b/Source/Core/VideoCommon/AsyncRequests.h @@ -79,6 +79,7 @@ public: void SetPassthrough(bool enable); static AsyncRequests* GetInstance() { return &s_singleton; } + private: void PullEventsInternal(); void HandleEvent(const Event& e); diff --git a/Source/Core/VideoCommon/BPStructs.cpp b/Source/Core/VideoCommon/BPStructs.cpp index 0078633b08..4647c3de4e 100644 --- a/Source/Core/VideoCommon/BPStructs.cpp +++ b/Source/Core/VideoCommon/BPStructs.cpp @@ -253,8 +253,9 @@ static void BPWritten(const BPCmd& bp) u32 height = static_cast<u32>(num_xfb_lines); - DEBUG_LOG(VIDEO, "RenderToXFB: destAddr: %08x | srcRect {%d %d %d %d} | fbWidth: %u | " - "fbStride: %u | fbHeight: %u | yScale: %f", + DEBUG_LOG(VIDEO, + "RenderToXFB: destAddr: %08x | srcRect {%d %d %d %d} | fbWidth: %u | " + "fbStride: %u | fbHeight: %u | yScale: %f", destAddr, srcRect.left, srcRect.top, srcRect.right, srcRect.bottom, bpmem.copyTexSrcWH.x + 1, destStride, height, yScale); @@ -1002,27 +1003,28 @@ void GetBPRegInfo(const u8* data, std::string* name, std::string* desc) SetRegName(BPMEM_TRIGGER_EFB_COPY); UPE_Copy copy; copy.Hex = cmddata; - *desc = StringFromFormat("Clamping: %s\n" - "Converting from RGB to YUV: %s\n" - "Target pixel format: 0x%X\n" - "Gamma correction: %s\n" - "Mipmap filter: %s\n" - "Vertical scaling: %s\n" - "Clear: %s\n" - "Frame to field: 0x%01X\n" - "Copy to XFB: %s\n" - "Intensity format: %s\n" - "Automatic color conversion: %s", - (copy.clamp0 && copy.clamp1) ? "Top and Bottom" : (copy.clamp0) ? - "Top only" : - (copy.clamp1) ? "Bottom only" : "None", - no_yes[copy.yuv], static_cast<int>(copy.tp_realFormat()), - (copy.gamma == 0) ? "1.0" : (copy.gamma == 1) ? - "1.7" : - (copy.gamma == 2) ? "2.2" : "Invalid value 0x3?", - no_yes[copy.half_scale], no_yes[copy.scale_invert], no_yes[copy.clear], - (u32)copy.frame_to_field, no_yes[copy.copy_to_xfb], - no_yes[copy.intensity_fmt], no_yes[copy.auto_conv]); + *desc = StringFromFormat( + "Clamping: %s\n" + "Converting from RGB to YUV: %s\n" + "Target pixel format: 0x%X\n" + "Gamma correction: %s\n" + "Mipmap filter: %s\n" + "Vertical scaling: %s\n" + "Clear: %s\n" + "Frame to field: 0x%01X\n" + "Copy to XFB: %s\n" + "Intensity format: %s\n" + "Automatic color conversion: %s", + (copy.clamp0 && copy.clamp1) ? + "Top and Bottom" : + (copy.clamp0) ? "Top only" : (copy.clamp1) ? "Bottom only" : "None", + no_yes[copy.yuv], static_cast<int>(copy.tp_realFormat()), + (copy.gamma == 0) ? + "1.0" : + (copy.gamma == 1) ? "1.7" : (copy.gamma == 2) ? "2.2" : "Invalid value 0x3?", + no_yes[copy.half_scale], no_yes[copy.scale_invert], no_yes[copy.clear], + (u32)copy.frame_to_field, no_yes[copy.copy_to_xfb], no_yes[copy.intensity_fmt], + no_yes[copy.auto_conv]); } break; diff --git a/Source/Core/VideoCommon/FPSCounter.h b/Source/Core/VideoCommon/FPSCounter.h index 112256e414..a539c690ab 100644 --- a/Source/Core/VideoCommon/FPSCounter.h +++ b/Source/Core/VideoCommon/FPSCounter.h @@ -18,6 +18,7 @@ public: void Update(); float GetFPS() const { return m_fps; } + private: u64 m_last_time = 0; u64 m_time_since_update = 0; diff --git a/Source/Core/VideoCommon/FramebufferManagerBase.h b/Source/Core/VideoCommon/FramebufferManagerBase.h index a008d49e92..c77b741e41 100644 --- a/Source/Core/VideoCommon/FramebufferManagerBase.h +++ b/Source/Core/VideoCommon/FramebufferManagerBase.h @@ -19,6 +19,7 @@ public: virtual ~FramebufferManagerBase(); static unsigned int GetEFBLayers() { return m_EFBLayers; } + protected: static unsigned int m_EFBLayers; }; diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp index 26afccbaa9..6a45f812fa 100644 --- a/Source/Core/VideoCommon/HiresTextures.cpp +++ b/Source/Core/VideoCommon/HiresTextures.cpp @@ -379,16 +379,18 @@ std::unique_ptr<HiresTexture> HiresTexture::Load(const std::string& base_filenam const Level& first_mip = ret->m_levels[0]; if (first_mip.width * height != first_mip.height * width) { - ERROR_LOG(VIDEO, "Invalid custom texture size %ux%u for texture %s. The aspect differs " - "from the native size %ux%u.", + ERROR_LOG(VIDEO, + "Invalid custom texture size %ux%u for texture %s. The aspect differs " + "from the native size %ux%u.", first_mip.width, first_mip.height, first_mip_file.path.c_str(), width, height); } // Same deal if the custom texture isn't a multiple of the native size. if (width != 0 && height != 0 && (first_mip.width % width || first_mip.height % height)) { - ERROR_LOG(VIDEO, "Invalid custom texture size %ux%u for texture %s. Please use an integer " - "upscaling factor based on the native size %ux%u.", + ERROR_LOG(VIDEO, + "Invalid custom texture size %ux%u for texture %s. Please use an integer " + "upscaling factor based on the native size %ux%u.", first_mip.width, first_mip.height, first_mip_file.path.c_str(), width, height); } diff --git a/Source/Core/VideoCommon/NativeVertexFormat.h b/Source/Core/VideoCommon/NativeVertexFormat.h index ac75f68652..e7b575a587 100644 --- a/Source/Core/VideoCommon/NativeVertexFormat.h +++ b/Source/Core/VideoCommon/NativeVertexFormat.h @@ -112,6 +112,7 @@ public: u32 GetVertexStride() const { return vtx_decl.stride; } const PortableVertexDeclaration& GetVertexDeclaration() const { return vtx_decl; } + protected: // Let subclasses construct. NativeVertexFormat() {} diff --git a/Source/Core/VideoCommon/PerfQueryBase.h b/Source/Core/VideoCommon/PerfQueryBase.h index ea74c2d57a..449b86cc1b 100644 --- a/Source/Core/VideoCommon/PerfQueryBase.h +++ b/Source/Core/VideoCommon/PerfQueryBase.h @@ -50,6 +50,7 @@ public: // True if there are no further pending query results // NOTE: Called from CPU thread virtual bool IsFlushed() const { return true; } + protected: // TODO: sloppy volatile u32 m_query_count; diff --git a/Source/Core/VideoCommon/PixelShaderGen.cpp b/Source/Core/VideoCommon/PixelShaderGen.cpp index 61c39a54fe..aae881a0f1 100644 --- a/Source/Core/VideoCommon/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/PixelShaderGen.cpp @@ -1194,7 +1194,10 @@ static void WriteTevRegular(ShaderCode& out, const char* components, int bias, i const char* tevLerpBias[] = // indexed by 2*op+(shift==3) { - "", " + 128", "", " + 127", + "", + " + 128", + "", + " + 127", }; const char* tevBiasTable[] = { diff --git a/Source/Core/VideoCommon/PostProcessing.h b/Source/Core/VideoCommon/PostProcessing.h index 4a51e66842..f453fff587 100644 --- a/Source/Core/VideoCommon/PostProcessing.h +++ b/Source/Core/VideoCommon/PostProcessing.h @@ -87,6 +87,7 @@ public: static std::vector<std::string> GetAnaglyphShaderList(APIType api_type); PostProcessingShaderConfiguration* GetConfig() { return &m_config; } + protected: // Timer for determining our time value Common::Timer m_timer; diff --git a/Source/Core/VideoCommon/ShaderCache.cpp b/Source/Core/VideoCommon/ShaderCache.cpp index cd7ec4ced9..6ab6f17fa5 100644 --- a/Source/Core/VideoCommon/ShaderCache.cpp +++ b/Source/Core/VideoCommon/ShaderCache.cpp @@ -680,6 +680,7 @@ void ShaderCache::QueueVertexShaderCompile(const VertexShaderUid& uid, u32 prior } void Retrieve() override { shader_cache->InsertVertexShader(uid, std::move(shader)); } + private: ShaderCache* shader_cache; std::unique_ptr<AbstractShader> shader; @@ -708,6 +709,7 @@ void ShaderCache::QueueVertexUberShaderCompile(const UberShader::VertexShaderUid } void Retrieve() override { shader_cache->InsertVertexUberShader(uid, std::move(shader)); } + private: ShaderCache* shader_cache; std::unique_ptr<AbstractShader> shader; @@ -736,6 +738,7 @@ void ShaderCache::QueuePixelShaderCompile(const PixelShaderUid& uid, u32 priorit } void Retrieve() override { shader_cache->InsertPixelShader(uid, std::move(shader)); } + private: ShaderCache* shader_cache; std::unique_ptr<AbstractShader> shader; @@ -764,6 +767,7 @@ void ShaderCache::QueuePixelUberShaderCompile(const UberShader::PixelShaderUid& } void Retrieve() override { shader_cache->InsertPixelUberShader(uid, std::move(shader)); } + private: ShaderCache* shader_cache; std::unique_ptr<AbstractShader> shader; diff --git a/Source/Core/VideoCommon/ShaderGenCommon.h b/Source/Core/VideoCommon/ShaderGenCommon.h index af9b97cf2f..ad5604127c 100644 --- a/Source/Core/VideoCommon/ShaderGenCommon.h +++ b/Source/Core/VideoCommon/ShaderGenCommon.h @@ -98,6 +98,7 @@ public: const uid_data* GetUidData() const { return &data; } const u8* GetUidDataRaw() const { return &values[0]; } size_t GetUidDataSize() const { return sizeof(values); } + private: union { diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp index 278d2486b9..9ac75d31f0 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/TextureCacheBase.cpp @@ -573,8 +573,10 @@ private: auto x = j * 2; auto y = i * 2; const std::array<PixelRGBAf, 4> samples{{ - Sample(src, src_shape, x, y), Sample(src, src_shape, x + 1, y), - Sample(src, src_shape, x, y + 1), Sample(src, src_shape, x + 1, y + 1), + Sample(src, src_shape, x, y), + Sample(src, src_shape, x + 1, y), + Sample(src, src_shape, x, y + 1), + Sample(src, src_shape, x + 1, y + 1), }}; auto* dst_pixel = dst + (j + i * dst_shape.row_length) * 4; diff --git a/Source/Core/VideoCommon/TextureDecoder_Common.cpp b/Source/Core/VideoCommon/TextureDecoder_Common.cpp index 9dd9f5850c..2e84e3d282 100644 --- a/Source/Core/VideoCommon/TextureDecoder_Common.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_Common.cpp @@ -259,17 +259,73 @@ void TexDecoder_SetTexFmtOverlayOptions(bool enable, bool center) static const char* texfmt[] = { // pixel - "I4", "I8", "IA4", "IA8", "RGB565", "RGB5A3", "RGBA8", "0x07", "C4", "C8", "C14X2", "0x0B", - "0x0C", "0x0D", "CMPR", "0x0F", + "I4", + "I8", + "IA4", + "IA8", + "RGB565", + "RGB5A3", + "RGBA8", + "0x07", + "C4", + "C8", + "C14X2", + "0x0B", + "0x0C", + "0x0D", + "CMPR", + "0x0F", // Z-buffer - "0x10", "Z8", "0x12", "Z16", "0x14", "0x15", "Z24X8", "0x17", "0x18", "0x19", "0x1A", "0x1B", - "0x1C", "0x1D", "0x1E", "0x1F", + "0x10", + "Z8", + "0x12", + "Z16", + "0x14", + "0x15", + "Z24X8", + "0x17", + "0x18", + "0x19", + "0x1A", + "0x1B", + "0x1C", + "0x1D", + "0x1E", + "0x1F", // pixel + copy - "CR4", "0x21", "CRA4", "CRA8", "0x24", "0x25", "CYUVA8", "CA8", "CR8", "CG8", "CB8", "CRG8", - "CGB8", "0x2D", "0x2E", "XFB", + "CR4", + "0x21", + "CRA4", + "CRA8", + "0x24", + "0x25", + "CYUVA8", + "CA8", + "CR8", + "CG8", + "CB8", + "CRG8", + "CGB8", + "0x2D", + "0x2E", + "XFB", // Z + copy - "CZ4", "0x31", "0x32", "0x33", "0x34", "0x35", "0x36", "0x37", "0x38", "CZ8M", "CZ8L", "0x3B", - "CZ16L", "0x3D", "0x3E", "0x3F", + "CZ4", + "0x31", + "0x32", + "0x33", + "0x34", + "0x35", + "0x36", + "0x37", + "0x38", + "CZ8M", + "CZ8L", + "0x3B", + "CZ16L", + "0x3D", + "0x3E", + "0x3F", }; static void TexDecoder_DrawOverlay(u8* dst, int width, int height, TextureFormat texformat) diff --git a/Source/Core/VideoCommon/UberShaderPixel.cpp b/Source/Core/VideoCommon/UberShaderPixel.cpp index 76aeab8dd7..4b680fee2e 100644 --- a/Source/Core/VideoCommon/UberShaderPixel.cpp +++ b/Source/Core/VideoCommon/UberShaderPixel.cpp @@ -924,9 +924,8 @@ ShaderCode GenPixelShader(APIType ApiType, const ShaderHostConfig& host_config, " int3 color_D = selectColorInput(s, ss, %scolors_0, %scolors_1, color_d); // 10 " "bits + sign\n" "\n", // TODO: do we need to sign extend? - color_input_prefix, color_input_prefix, color_input_prefix, color_input_prefix, color_input_prefix, - color_input_prefix, color_input_prefix, color_input_prefix); + color_input_prefix, color_input_prefix, color_input_prefix, color_input_prefix); out.Write( " int3 color;\n" " if(color_bias != 3u) { // Normal mode\n" @@ -998,9 +997,8 @@ ShaderCode GenPixelShader(APIType ApiType, const ShaderHostConfig& host_config, " int alpha_D = selectAlphaInput(s, ss, %scolors_0, %scolors_1, alpha_d); // 10 bits + " "sign\n" "\n", // TODO: do we need to sign extend? - color_input_prefix, color_input_prefix, color_input_prefix, color_input_prefix, color_input_prefix, - color_input_prefix, color_input_prefix, color_input_prefix); + color_input_prefix, color_input_prefix, color_input_prefix, color_input_prefix); out.Write("\n" " int alpha;\n" " if(alpha_bias != 3u) { // Normal mode\n" diff --git a/Source/Core/VideoCommon/VertexLoaderARM64.cpp b/Source/Core/VideoCommon/VertexLoaderARM64.cpp index a1c8783581..22e695a066 100644 --- a/Source/Core/VideoCommon/VertexLoaderARM64.cpp +++ b/Source/Core/VideoCommon/VertexLoaderARM64.cpp @@ -461,9 +461,9 @@ void VertexLoaderARM64::GenerateVertexLoader() int elem_size = 1 << (m_VtxAttr.NormalFormat / 2); int load_bytes = elem_size * 3; - int load_size = load_bytes == 1 ? 1 : load_bytes <= 2 ? 2 : load_bytes <= 4 ? - 4 : - load_bytes <= 8 ? 8 : 16; + int load_size = load_bytes == 1 ? + 1 : + load_bytes <= 2 ? 2 : load_bytes <= 4 ? 4 : load_bytes <= 8 ? 8 : 16; offset = GetAddressImm(ARRAY_NORMAL, m_VtxDesc.Normal, EncodeRegTo64(scratch1_reg), load_size << 3); @@ -525,9 +525,9 @@ void VertexLoaderARM64::GenerateVertexLoader() int elem_size = 1 << (m_VtxAttr.texCoord[i].Format / 2); int load_bytes = elem_size * (elements + 2); - int load_size = load_bytes == 1 ? 1 : load_bytes <= 2 ? 2 : load_bytes <= 4 ? - 4 : - load_bytes <= 8 ? 8 : 16; + int load_size = load_bytes == 1 ? + 1 : + load_bytes <= 2 ? 2 : load_bytes <= 4 ? 4 : load_bytes <= 8 ? 8 : 16; load_size <<= 3; s32 offset = @@ -611,6 +611,6 @@ void VertexLoaderARM64::GenerateVertexLoader() int VertexLoaderARM64::RunVertices(DataReader src, DataReader dst, int count) { m_numLoadedVertices += count; - return ((int (*)(u8 * src, u8 * dst, int count))region)(src.GetPointer(), dst.GetPointer(), - count); + return ((int (*)(u8 * src, u8 * dst, int count)) region)(src.GetPointer(), dst.GetPointer(), + count); } diff --git a/Source/Core/VideoCommon/VertexLoaderBase.cpp b/Source/Core/VideoCommon/VertexLoaderBase.cpp index 21a149c169..141078f676 100644 --- a/Source/Core/VideoCommon/VertexLoaderBase.cpp +++ b/Source/Core/VideoCommon/VertexLoaderBase.cpp @@ -81,13 +81,30 @@ std::string VertexLoaderBase::ToString() const dest += ": "; static constexpr std::array<const char*, 4> pos_mode{{ - "Inv", "Dir", "I8", "I16", + "Inv", + "Dir", + "I8", + "I16", }}; static constexpr std::array<const char*, 8> pos_formats{{ - "u8", "s8", "u16", "s16", "flt", "Inv", "Inv", "Inv", + "u8", + "s8", + "u16", + "s16", + "flt", + "Inv", + "Inv", + "Inv", }}; static constexpr std::array<const char*, 8> color_format{{ - "565", "888", "888x", "4444", "6666", "8888", "Inv", "Inv", + "565", + "888", + "888x", + "4444", + "6666", + "8888", + "Inv", + "Inv", }}; dest += StringFromFormat("%ib skin: %i P: %i %s-%s ", m_VertexSize, (u32)m_VtxDesc.PosMatIdx, @@ -174,8 +191,9 @@ public: if (memcmp(buffer_a.data(), buffer_b.data(), std::min(count_a, count_b) * m_native_vtx_decl.stride)) - ERROR_LOG(VIDEO, "The two vertex loaders have loaded different data " - "(guru meditation 0x%016" PRIx64 ", 0x%08x, 0x%08x, 0x%08x).", + ERROR_LOG(VIDEO, + "The two vertex loaders have loaded different data " + "(guru meditation 0x%016" PRIx64 ", 0x%08x, 0x%08x, 0x%08x).", m_VtxDesc.Hex, m_vat.g0.Hex, m_vat.g1.Hex, m_vat.g2.Hex); memcpy(dst.GetPointer(), buffer_a.data(), count_a * m_native_vtx_decl.stride); @@ -184,6 +202,7 @@ public: } std::string GetName() const override { return "CompareLoader"; } bool IsInitialized() override { return m_initialized; } + private: bool m_initialized; @@ -199,7 +218,7 @@ std::unique_ptr<VertexLoaderBase> VertexLoaderBase::CreateVertexLoader(const TVt { std::unique_ptr<VertexLoaderBase> loader; -//#define COMPARE_VERTEXLOADERS + //#define COMPARE_VERTEXLOADERS #if defined(COMPARE_VERTEXLOADERS) && defined(_M_X86_64) // first try: Any new VertexLoader vs the old one diff --git a/Source/Core/VideoCommon/VertexLoaderBase.h b/Source/Core/VideoCommon/VertexLoaderBase.h index 509ccb4310..5e1ffc4fd2 100644 --- a/Source/Core/VideoCommon/VertexLoaderBase.h +++ b/Source/Core/VideoCommon/VertexLoaderBase.h @@ -33,6 +33,7 @@ public: bool operator==(const VertexLoaderUID& rh) const { return vid == rh.vid; } size_t GetHash() const { return hash; } + private: size_t CalculateHash() const { diff --git a/Source/Core/VideoCommon/VertexLoader_Position.cpp b/Source/Core/VideoCommon/VertexLoader_Position.cpp index 86f1e76e36..a21061ac55 100644 --- a/Source/Core/VideoCommon/VertexLoader_Position.cpp +++ b/Source/Core/VideoCommon/VertexLoader_Position.cpp @@ -78,70 +78,90 @@ void Pos_ReadIndex(VertexLoader* loader) static TPipelineFunction tableReadPosition[4][8][2] = { { { - nullptr, nullptr, + nullptr, + nullptr, }, { - nullptr, nullptr, + nullptr, + nullptr, }, { - nullptr, nullptr, + nullptr, + nullptr, }, { - nullptr, nullptr, + nullptr, + nullptr, }, { - nullptr, nullptr, + nullptr, + nullptr, }, }, { { - Pos_ReadDirect<u8, 2>, Pos_ReadDirect<u8, 3>, + Pos_ReadDirect<u8, 2>, + Pos_ReadDirect<u8, 3>, }, { - Pos_ReadDirect<s8, 2>, Pos_ReadDirect<s8, 3>, + Pos_ReadDirect<s8, 2>, + Pos_ReadDirect<s8, 3>, }, { - Pos_ReadDirect<u16, 2>, Pos_ReadDirect<u16, 3>, + Pos_ReadDirect<u16, 2>, + Pos_ReadDirect<u16, 3>, }, { - Pos_ReadDirect<s16, 2>, Pos_ReadDirect<s16, 3>, + Pos_ReadDirect<s16, 2>, + Pos_ReadDirect<s16, 3>, }, { - Pos_ReadDirect<float, 2>, Pos_ReadDirect<float, 3>, + Pos_ReadDirect<float, 2>, + Pos_ReadDirect<float, 3>, }, }, { { - Pos_ReadIndex<u8, u8, 2>, Pos_ReadIndex<u8, u8, 3>, + Pos_ReadIndex<u8, u8, 2>, + Pos_ReadIndex<u8, u8, 3>, }, { - Pos_ReadIndex<u8, s8, 2>, Pos_ReadIndex<u8, s8, 3>, + Pos_ReadIndex<u8, s8, 2>, + Pos_ReadIndex<u8, s8, 3>, }, { - Pos_ReadIndex<u8, u16, 2>, Pos_ReadIndex<u8, u16, 3>, + Pos_ReadIndex<u8, u16, 2>, + Pos_ReadIndex<u8, u16, 3>, }, { - Pos_ReadIndex<u8, s16, 2>, Pos_ReadIndex<u8, s16, 3>, + Pos_ReadIndex<u8, s16, 2>, + Pos_ReadIndex<u8, s16, 3>, }, { - Pos_ReadIndex<u8, float, 2>, Pos_ReadIndex<u8, float, 3>, + Pos_ReadIndex<u8, float, 2>, + Pos_ReadIndex<u8, float, 3>, }, }, { { - Pos_ReadIndex<u16, u8, 2>, Pos_ReadIndex<u16, u8, 3>, + Pos_ReadIndex<u16, u8, 2>, + Pos_ReadIndex<u16, u8, 3>, }, { - Pos_ReadIndex<u16, s8, 2>, Pos_ReadIndex<u16, s8, 3>, + Pos_ReadIndex<u16, s8, 2>, + Pos_ReadIndex<u16, s8, 3>, }, { - Pos_ReadIndex<u16, u16, 2>, Pos_ReadIndex<u16, u16, 3>, + Pos_ReadIndex<u16, u16, 2>, + Pos_ReadIndex<u16, u16, 3>, }, { - Pos_ReadIndex<u16, s16, 2>, Pos_ReadIndex<u16, s16, 3>, + Pos_ReadIndex<u16, s16, 2>, + Pos_ReadIndex<u16, s16, 3>, }, { - Pos_ReadIndex<u16, float, 2>, Pos_ReadIndex<u16, float, 3>, + Pos_ReadIndex<u16, float, 2>, + Pos_ReadIndex<u16, float, 3>, }, }, }; @@ -149,70 +169,90 @@ static TPipelineFunction tableReadPosition[4][8][2] = { static int tableReadPositionVertexSize[4][8][2] = { { { - 0, 0, + 0, + 0, }, { - 0, 0, + 0, + 0, }, { - 0, 0, + 0, + 0, }, { - 0, 0, + 0, + 0, }, { - 0, 0, + 0, + 0, }, }, { { - 2, 3, + 2, + 3, }, { - 2, 3, + 2, + 3, }, { - 4, 6, + 4, + 6, }, { - 4, 6, + 4, + 6, }, { - 8, 12, + 8, + 12, }, }, { { - 1, 1, + 1, + 1, }, { - 1, 1, + 1, + 1, }, { - 1, 1, + 1, + 1, }, { - 1, 1, + 1, + 1, }, { - 1, 1, + 1, + 1, }, }, { { - 2, 2, + 2, + 2, }, { - 2, 2, + 2, + 2, }, { - 2, 2, + 2, + 2, }, { - 2, 2, + 2, + 2, }, { - 2, 2, + 2, + 2, }, }, }; diff --git a/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp b/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp index 99d3a797ec..a64e1f1cde 100644 --- a/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp +++ b/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp @@ -89,70 +89,90 @@ void TexCoord_ReadIndex(VertexLoader* loader) static TPipelineFunction tableReadTexCoord[4][8][2] = { { { - nullptr, nullptr, + nullptr, + nullptr, }, { - nullptr, nullptr, + nullptr, + nullptr, }, { - nullptr, nullptr, + nullptr, + nullptr, }, { - nullptr, nullptr, + nullptr, + nullptr, }, { - nullptr, nullptr, + nullptr, + nullptr, }, }, { { - TexCoord_ReadDirect<u8, 1>, TexCoord_ReadDirect<u8, 2>, + TexCoord_ReadDirect<u8, 1>, + TexCoord_ReadDirect<u8, 2>, }, { - TexCoord_ReadDirect<s8, 1>, TexCoord_ReadDirect<s8, 2>, + TexCoord_ReadDirect<s8, 1>, + TexCoord_ReadDirect<s8, 2>, }, { - TexCoord_ReadDirect<u16, 1>, TexCoord_ReadDirect<u16, 2>, + TexCoord_ReadDirect<u16, 1>, + TexCoord_ReadDirect<u16, 2>, }, { - TexCoord_ReadDirect<s16, 1>, TexCoord_ReadDirect<s16, 2>, + TexCoord_ReadDirect<s16, 1>, + TexCoord_ReadDirect<s16, 2>, }, { - TexCoord_ReadDirect<float, 1>, TexCoord_ReadDirect<float, 2>, + TexCoord_ReadDirect<float, 1>, + TexCoord_ReadDirect<float, 2>, }, }, { { - TexCoord_ReadIndex<u8, u8, 1>, TexCoord_ReadIndex<u8, u8, 2>, + TexCoord_ReadIndex<u8, u8, 1>, + TexCoord_ReadIndex<u8, u8, 2>, }, { - TexCoord_ReadIndex<u8, s8, 1>, TexCoord_ReadIndex<u8, s8, 2>, + TexCoord_ReadIndex<u8, s8, 1>, + TexCoord_ReadIndex<u8, s8, 2>, }, { - TexCoord_ReadIndex<u8, u16, 1>, TexCoord_ReadIndex<u8, u16, 2>, + TexCoord_ReadIndex<u8, u16, 1>, + TexCoord_ReadIndex<u8, u16, 2>, }, { - TexCoord_ReadIndex<u8, s16, 1>, TexCoord_ReadIndex<u8, s16, 2>, + TexCoord_ReadIndex<u8, s16, 1>, + TexCoord_ReadIndex<u8, s16, 2>, }, { - TexCoord_ReadIndex<u8, float, 1>, TexCoord_ReadIndex<u8, float, 2>, + TexCoord_ReadIndex<u8, float, 1>, + TexCoord_ReadIndex<u8, float, 2>, }, }, { { - TexCoord_ReadIndex<u16, u8, 1>, TexCoord_ReadIndex<u16, u8, 2>, + TexCoord_ReadIndex<u16, u8, 1>, + TexCoord_ReadIndex<u16, u8, 2>, }, { - TexCoord_ReadIndex<u16, s8, 1>, TexCoord_ReadIndex<u16, s8, 2>, + TexCoord_ReadIndex<u16, s8, 1>, + TexCoord_ReadIndex<u16, s8, 2>, }, { - TexCoord_ReadIndex<u16, u16, 1>, TexCoord_ReadIndex<u16, u16, 2>, + TexCoord_ReadIndex<u16, u16, 1>, + TexCoord_ReadIndex<u16, u16, 2>, }, { - TexCoord_ReadIndex<u16, s16, 1>, TexCoord_ReadIndex<u16, s16, 2>, + TexCoord_ReadIndex<u16, s16, 1>, + TexCoord_ReadIndex<u16, s16, 2>, }, { - TexCoord_ReadIndex<u16, float, 1>, TexCoord_ReadIndex<u16, float, 2>, + TexCoord_ReadIndex<u16, float, 1>, + TexCoord_ReadIndex<u16, float, 2>, }, }, }; @@ -160,70 +180,90 @@ static TPipelineFunction tableReadTexCoord[4][8][2] = { static int tableReadTexCoordVertexSize[4][8][2] = { { { - 0, 0, + 0, + 0, }, { - 0, 0, + 0, + 0, }, { - 0, 0, + 0, + 0, }, { - 0, 0, + 0, + 0, }, { - 0, 0, + 0, + 0, }, }, { { - 1, 2, + 1, + 2, }, { - 1, 2, + 1, + 2, }, { - 2, 4, + 2, + 4, }, { - 2, 4, + 2, + 4, }, { - 4, 8, + 4, + 8, }, }, { { - 1, 1, + 1, + 1, }, { - 1, 1, + 1, + 1, }, { - 1, 1, + 1, + 1, }, { - 1, 1, + 1, + 1, }, { - 1, 1, + 1, + 1, }, }, { { - 2, 2, + 2, + 2, }, { - 2, 2, + 2, + 2, }, { - 2, 2, + 2, + 2, }, { - 2, 2, + 2, + 2, }, { - 2, 2, + 2, + 2, }, }, }; |