diff options
| author | aap <aap@papnet.eu> | 2021-02-18 13:08:22 +0100 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2021-02-18 13:08:22 +0100 |
| commit | 253021866c266d8cf8d18241d3c3f330bff9ed06 (patch) | |
| tree | 3f46d73faeab388a4e93553ce4ac0aecf14e2a25 | |
| parent | fix last commit (diff) | |
| download | re3-253021866c266d8cf8d18241d3c3f330bff9ed06.tar re3-253021866c266d8cf8d18241d3c3f330bff9ed06.tar.gz re3-253021866c266d8cf8d18241d3c3f330bff9ed06.tar.bz2 re3-253021866c266d8cf8d18241d3c3f330bff9ed06.tar.lz re3-253021866c266d8cf8d18241d3c3f330bff9ed06.tar.xz re3-253021866c266d8cf8d18241d3c3f330bff9ed06.tar.zst re3-253021866c266d8cf8d18241d3c3f330bff9ed06.zip | |
| -rw-r--r-- | src/core/main.h | 9 | ||||
| -rw-r--r-- | src/rw/RwHelper.cpp | 24 |
2 files changed, 30 insertions, 3 deletions
diff --git a/src/core/main.h b/src/core/main.h index 60ccc116..311c0302 100644 --- a/src/core/main.h +++ b/src/core/main.h @@ -1,8 +1,11 @@ #pragma once -#if defined(RW_OPENGL) -#define PUSH_RENDERGROUP(str) glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, -1, str) -#define POP_RENDERGROUP() glPopDebugGroup() +#ifndef FINAL +// defined in RwHelpder.cpp +void PushRendergroup(const char *name); +void PopRendergroup(void); +#define PUSH_RENDERGROUP(str) PushRendergroup(str) +#define POP_RENDERGROUP() PopRendergroup() #else #define PUSH_RENDERGROUP(str) #define POP_RENDERGROUP() diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp index 65e342ed..e98b58f6 100644 --- a/src/rw/RwHelper.cpp +++ b/src/rw/RwHelper.cpp @@ -113,6 +113,30 @@ SetCullMode(uint32 mode) RwRenderStateSet(rwRENDERSTATECULLMODE, (void*)rwCULLMODECULLNONE); } +#ifndef FINAL +void +PushRendergroup(const char *name) +{ +#if defined(RW_OPENGL) + glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, -1, name); +#elif defined(RW_D3D9) + static WCHAR tmp[256]; + MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, name, -1, tmp, sizeof(tmp)); + D3DPERF_BeginEvent(0xFFFFFFFF, tmp); +#endif +} + +void +PopRendergroup(void) +{ +#if defined(RW_OPENGL) + glPopDebugGroup(); +#elif defined(RW_D3D9) + D3DPERF_EndEvent(); +#endif +} +#endif + RwFrame* GetFirstFrameCallback(RwFrame *child, void *data) { |