mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-02-13 15:23:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge all occurances of __func__ and __FUNCTION__ to SDL_FUNCTION

Browse Source 
(cherry picked from commit 8f8880a8eb)
This commit is contained in:
Max Seidenstücker
2026-02-06 16:20:00 +01:00
committed by Sam Lantinga
parent 48e5fc7b69
commit 576c2d2f2c
15 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/SDL3/SDL_stdinc.h
View File

@@ -257,7 +257,7 @@ void *alloca(size_t);
* For example:
*
* ```c
* #define LOG_ERROR(X) OutputDebugString(SDL_STRINGIFY_ARG(__FUNCTION__) ": " X "\n")`
* #define LOG_ERROR(X) OutputDebugString(SDL_STRINGIFY_ARG(SDL_FUNCTION) ": " X "\n")`
* ```
*
* \param arg the text to turn into a string literal.

16
src/audio/aaudio/SDL_aaudio.c
View File

@@ -265,7 +265,7 @@ static int AAUDIO_RecordDevice(SDL_AudioDevice *device, void *buffer, int buflen
static void AAUDIO_CloseDevice(SDL_AudioDevice *device)
{
struct SDL_PrivateAudioData *hidden = device->hidden;
LOGI(__func__);
LOGI(SDL_FUNCTION);
if (hidden) {
if (hidden->stream) {
@@ -353,7 +353,7 @@ static bool BuildAAudioStream(SDL_AudioDevice *device)
if (res != AAUDIO_OK) {
LOGI("SDL Failed AAudioStreamBuilder_openStream %d", res);
ctx.AAudioStreamBuilder_delete(builder);
return SDL_SetError("%s : %s", __func__, ctx.AAudio_convertResultToText(res));
return SDL_SetError("%s : %s", SDL_FUNCTION, ctx.AAudio_convertResultToText(res));
}
ctx.AAudioStreamBuilder_delete(builder);
@@ -403,7 +403,7 @@ static bool BuildAAudioStream(SDL_AudioDevice *device)
res = ctx.AAudioStream_requestStart(hidden->stream);
if (res != AAUDIO_OK) {
LOGI("SDL Failed AAudioStream_requestStart %d recording:%d", res, recording);
return SDL_SetError("%s : %s", __func__, ctx.AAudio_convertResultToText(res));
return SDL_SetError("%s : %s", SDL_FUNCTION, ctx.AAudio_convertResultToText(res));
}
LOGI("SDL AAudioStream_requestStart OK");
@@ -423,7 +423,7 @@ static bool AAUDIO_OpenDevice(SDL_AudioDevice *device)
SDL_assert(device->handle); // AAUDIO_UNSPECIFIED is zero, so legit devices should all be non-zero.
#endif
LOGI(__func__);
LOGI(SDL_FUNCTION);
if (device->recording) {
// !!! FIXME: make this non-blocking!
@@ -467,7 +467,7 @@ static bool PauseOneDevice(SDL_AudioDevice *device, void *userdata)
if (res != AAUDIO_OK) {
LOGI("SDL Failed AAudioStream_requestPause %d", res);
SDL_SetError("%s : %s", __func__, ctx.AAudio_convertResultToText(res));
SDL_SetError("%s : %s", SDL_FUNCTION, ctx.AAudio_convertResultToText(res));
}
}
}
@@ -491,7 +491,7 @@ static bool ResumeOneDevice(SDL_AudioDevice *device, void *userdata)
aaudio_result_t res = ctx.AAudioStream_requestStart(hidden->stream);
if (res != AAUDIO_OK) {
LOGI("SDL Failed AAudioStream_requestStart %d", res);
SDL_SetError("%s : %s", __func__, ctx.AAudio_convertResultToText(res));
SDL_SetError("%s : %s", SDL_FUNCTION, ctx.AAudio_convertResultToText(res));
}
}
}
@@ -509,7 +509,7 @@ static void AAUDIO_Deinitialize(void)
{
Android_StopAudioHotplug();
LOGI(__func__);
LOGI(SDL_FUNCTION);
if (ctx.handle) {
SDL_UnloadObject(ctx.handle);
}
@@ -520,7 +520,7 @@ static void AAUDIO_Deinitialize(void)
static bool AAUDIO_Init(SDL_AudioDriverImpl *impl)
{
LOGI(__func__);
LOGI(SDL_FUNCTION);
/* AAudio was introduced in Android 8.0, but has reference counting crash issues in that release,
* so don't use it until 8.1.

2
src/audio/ngage/SDL_ngageaudio.cpp
View File

@@ -278,7 +278,7 @@ void CAudio::MaoscPlayComplete(TInt aError)
}
// We shouldn't get here.
SDL_Log("%s: %d", __FUNCTION__, aError);
SDL_Log("%s: %d", SDL_FUNCTION, aError);
}
static TBool gAudioRunning;

12
src/core/android/SDL_android.c
View File

@@ -1841,7 +1841,7 @@ static bool Android_JNI_ExceptionOccurred(bool silent)
static void Internal_Android_Create_AssetManager(void)
{
struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(SDL_FUNCTION);
JNIEnv *env = Android_JNI_GetEnv();
jmethodID mid;
jobject context;
@@ -2062,7 +2062,7 @@ bool Android_JNI_HasClipboardText(void)
*/
int Android_JNI_GetPowerInfo(int *plugged, int *charged, int *battery, int *seconds, int *percent)
{
struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(SDL_FUNCTION);
JNIEnv *env = Android_JNI_GetEnv();
jmethodID mid;
jobject context;
@@ -2425,7 +2425,7 @@ const char *SDL_GetAndroidInternalStoragePath(void)
static char *s_AndroidInternalFilesPath = NULL;
if (!s_AndroidInternalFilesPath) {
struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(SDL_FUNCTION);
jmethodID mid;
jobject context;
jobject fileObject;
@@ -2476,7 +2476,7 @@ const char *SDL_GetAndroidInternalStoragePath(void)
Uint32 SDL_GetAndroidExternalStorageState(void)
{
struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(SDL_FUNCTION);
jmethodID mid;
jclass cls;
jstring stateString;
@@ -2519,7 +2519,7 @@ const char *SDL_GetAndroidExternalStoragePath(void)
static char *s_AndroidExternalFilesPath = NULL;
if (!s_AndroidExternalFilesPath) {
struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(SDL_FUNCTION);
jmethodID mid;
jobject context;
jobject fileObject;
@@ -2565,7 +2565,7 @@ const char *SDL_GetAndroidCachePath(void)
static char *s_AndroidCachePath = NULL;
if (!s_AndroidCachePath) {
struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(SDL_FUNCTION);
jmethodID mid;
jobject context;
jobject fileObject;

18
src/render/direct3d11/SDL_render_d3d11.c
View File

@@ -40,9 +40,9 @@
#include "SDL_shaders_d3d11.h"
#if defined(_MSC_VER) && !defined(__clang__)
#define SDL_COMPOSE_ERROR(str) __FUNCTION__ ", " str
#define SDL_COMPOSE_ERROR(str) SDL_FUNCTION ", " str
#else
#define SDL_COMPOSE_ERROR(str) SDL_STRINGIFY_ARG(__FUNCTION__) ", " str
#define SDL_COMPOSE_ERROR(str) SDL_STRINGIFY_ARG(SDL_FUNCTION) ", " str
#endif
#define SAFE_RELEASE(X) \
@@ -932,7 +932,7 @@ static HRESULT D3D11_CreateSwapChain(SDL_Renderer *renderer, int w, int h)
IDXGIFactory_MakeWindowAssociation(data->dxgiFactory, hwnd, DXGI_MWA_NO_WINDOW_CHANGES);
#else
SDL_SetError(__FUNCTION__ ", Unable to find something to attach a swap chain to");
SDL_SetError(SDL_FUNCTION ", Unable to find something to attach a swap chain to");
goto done;
#endif // defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_WINGDK) / else
}
@@ -1020,7 +1020,7 @@ static HRESULT D3D11_CreateWindowSizeDependentResources(SDL_Renderer *renderer)
*/
SDL_GetWindowSizeInPixels(renderer->window, &w, &h);
data->rotation = D3D11_GetCurrentRotation();
// SDL_Log("%s: windowSize={%d,%d}, orientation=%d", __FUNCTION__, w, h, (int)data->rotation);
// SDL_Log("%s: windowSize={%d,%d}, orientation=%d", SDL_FUNCTION, w, h, (int)data->rotation);
if (D3D11_IsDisplayRotated90Degrees(data->rotation)) {
int tmp = w;
w = h;
@@ -1244,7 +1244,7 @@ static bool D3D11_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture, SD
if (textureFormat == DXGI_FORMAT_UNKNOWN) {
return SDL_SetError("%s, An unsupported SDL pixel format (0x%x) was specified",
__FUNCTION__, texture->format);
SDL_FUNCTION, texture->format);
}
textureData = (D3D11_TextureData *)SDL_calloc(1, sizeof(*textureData));
@@ -2071,7 +2071,7 @@ static bool D3D11_UpdateViewport(SDL_Renderer *renderer)
* SDL_CreateRenderer is calling it, and will call it again later
* with a non-empty viewport.
*/
// SDL_Log("%s, no viewport was set!", __FUNCTION__);
// SDL_Log("%s, no viewport was set!", SDL_FUNCTION);
return false;
}
@@ -2138,7 +2138,7 @@ static bool D3D11_UpdateViewport(SDL_Renderer *renderer)
d3dviewport.Height = orientationAlignedViewport.h;
d3dviewport.MinDepth = 0.0f;
d3dviewport.MaxDepth = 1.0f;
// SDL_Log("%s: D3D viewport = {%f,%f,%f,%f}", __FUNCTION__, d3dviewport.TopLeftX, d3dviewport.TopLeftY, d3dviewport.Width, d3dviewport.Height);
// SDL_Log("%s: D3D viewport = {%f,%f,%f,%f}", SDL_FUNCTION, d3dviewport.TopLeftX, d3dviewport.TopLeftY, d3dviewport.Width, d3dviewport.Height);
ID3D11DeviceContext_RSSetViewports(data->d3dContext, 1, &d3dviewport);
data->viewportDirty = false;
@@ -2774,13 +2774,13 @@ static SDL_Surface *D3D11_RenderReadPixels(SDL_Renderer *renderer, const SDL_Rec
renderTargetView = D3D11_GetCurrentRenderTargetView(renderer);
if (!renderTargetView) {
SDL_SetError("%s, ID3D11DeviceContext::OMGetRenderTargets failed", __FUNCTION__);
SDL_SetError("%s, ID3D11DeviceContext::OMGetRenderTargets failed", SDL_FUNCTION);
goto done;
}
ID3D11View_GetResource(renderTargetView, (ID3D11Resource **)&backBuffer);
if (!backBuffer) {
SDL_SetError("%s, ID3D11View::GetResource failed", __FUNCTION__);
SDL_SetError("%s, ID3D11View::GetResource failed", SDL_FUNCTION);
goto done;
}

2
src/render/direct3d11/SDL_shaders_d3d11.c
View File

@@ -28,7 +28,7 @@
#include "SDL_shaders_d3d11.h"
#define SDL_COMPOSE_ERROR(str) SDL_STRINGIFY_ARG(__FUNCTION__) ", " str
#define SDL_COMPOSE_ERROR(str) SDL_STRINGIFY_ARG(SDL_FUNCTION) ", " str
#if SDL_WINAPI_FAMILY_PHONE
#error Need to build shaders with level_9_3

10
src/render/direct3d12/SDL_render_d3d12.c
View File

@@ -40,9 +40,9 @@
#include "SDL_shaders_d3d12.h"
#if defined(_MSC_VER) && !defined(__clang__)
#define SDL_COMPOSE_ERROR(str) __FUNCTION__ ", " str
#define SDL_COMPOSE_ERROR(str) SDL_FUNCTION ", " str
#else
#define SDL_COMPOSE_ERROR(str) SDL_STRINGIFY_ARG(__FUNCTION__) ", " str
#define SDL_COMPOSE_ERROR(str) SDL_STRINGIFY_ARG(SDL_FUNCTION) ", " str
#endif
// Set up for C function definitions, even when using C++
@@ -1642,7 +1642,7 @@ static bool D3D12_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture, SD
}
if (textureFormat == DXGI_FORMAT_UNKNOWN) {
return SDL_SetError("%s, An unsupported SDL pixel format (0x%x) was specified", __FUNCTION__, texture->format);
return SDL_SetError("%s, An unsupported SDL pixel format (0x%x) was specified", SDL_FUNCTION, texture->format);
}
textureData = (D3D12_TextureData *)SDL_calloc(1, sizeof(*textureData));
@@ -2514,7 +2514,7 @@ static bool D3D12_UpdateViewport(SDL_Renderer *renderer)
* SDL_CreateRenderer is calling it, and will call it again later
* with a non-empty viewport.
*/
// SDL_Log("%s, no viewport was set!", __FUNCTION__);
// SDL_Log("%s, no viewport was set!", SDL_FUNCTION);
return false;
}
@@ -2579,7 +2579,7 @@ static bool D3D12_UpdateViewport(SDL_Renderer *renderer)
d3dviewport.Height = orientationAlignedViewport.h;
d3dviewport.MinDepth = 0.0f;
d3dviewport.MaxDepth = 1.0f;
// SDL_Log("%s: D3D viewport = {%f,%f,%f,%f}", __FUNCTION__, d3dviewport.TopLeftX, d3dviewport.TopLeftY, d3dviewport.Width, d3dviewport.Height);
// SDL_Log("%s: D3D viewport = {%f,%f,%f,%f}", SDL_FUNCTION, d3dviewport.TopLeftX, d3dviewport.TopLeftY, d3dviewport.Width, d3dviewport.Height);
ID3D12GraphicsCommandList_RSSetViewports(data->commandList, 1, &d3dviewport);
data->viewportDirty = false;

4
src/render/direct3d12/SDL_render_d3d12_xbox.cpp
View File

@@ -26,9 +26,9 @@
#include <XGameRuntime.h>
#if defined(_MSC_VER) && !defined(__clang__)
#define SDL_COMPOSE_ERROR(str) __FUNCTION__ ", " str
#define SDL_COMPOSE_ERROR(str) SDL_FUNCTION ", " str
#else
#define SDL_COMPOSE_ERROR(str) SDL_STRINGIFY_ARG(__FUNCTION__) ", " str
#define SDL_COMPOSE_ERROR(str) SDL_STRINGIFY_ARG(SDL_FUNCTION) ", " str
#endif
static const GUID SDL_IID_ID3D12Device1 = { 0x77acce80, 0x638e, 0x4e65, { 0x88, 0x95, 0xc1, 0xf2, 0x33, 0x86, 0x86, 0x3e } };

2
src/render/direct3d12/SDL_shaders_d3d12.c
View File

@@ -27,7 +27,7 @@
#include "SDL_shaders_d3d12.h"
#define SDL_COMPOSE_ERROR(str) SDL_STRINGIFY_ARG(__FUNCTION__) ", " str
#define SDL_COMPOSE_ERROR(str) SDL_STRINGIFY_ARG(SDL_FUNCTION) ", " str
// The shaders here were compiled with compile_shaders.bat

2
src/render/direct3d12/SDL_shaders_d3d12_xboxone.cpp
View File

@@ -29,7 +29,7 @@
#include "SDL_shaders_d3d12.h"
#define SDL_COMPOSE_ERROR(str) SDL_STRINGIFY_ARG(__FUNCTION__) ", " str
#define SDL_COMPOSE_ERROR(str) SDL_STRINGIFY_ARG(SDL_FUNCTION) ", " str
// Shader blob headers are generated with a pre-build step using compile_shaders_xbox.bat

2
src/render/direct3d12/SDL_shaders_d3d12_xboxseries.cpp
View File

@@ -29,7 +29,7 @@
#include "SDL_shaders_d3d12.h"
#define SDL_COMPOSE_ERROR(str) SDL_STRINGIFY_ARG(__FUNCTION__) ", " str
#define SDL_COMPOSE_ERROR(str) SDL_STRINGIFY_ARG(SDL_FUNCTION) ", " str
// Shader blob headers are generated with a pre-build step using compile_shaders_xbox.bat

4
src/render/vulkan/SDL_render_vulkan.c
View File

@@ -2631,7 +2631,7 @@ static bool VULKAN_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture, S
}
if (textureFormat == VK_FORMAT_UNDEFINED) {
return SDL_SetError("%s, An unsupported SDL pixel format (0x%x) was specified", __FUNCTION__, texture->format);
return SDL_SetError("%s, An unsupported SDL pixel format (0x%x) was specified", SDL_FUNCTION, texture->format);
}
textureData = (VULKAN_TextureData *)SDL_calloc(1, sizeof(*textureData));
@@ -3352,7 +3352,7 @@ static bool VULKAN_UpdateViewport(SDL_Renderer *renderer)
* SDL_CreateRenderer is calling it, and will call it again later
* with a non-empty viewport.
*/
// SDL_Log("%s, no viewport was set!", __FUNCTION__);
// SDL_Log("%s, no viewport was set!", SDL_FUNCTION);
return false;
}

2
src/video/cocoa/SDL_cocoamouse.m
View File

@@ -32,7 +32,7 @@
#endif
#ifdef DEBUG_COCOAMOUSE
#define DLog(fmt, ...) printf("%s: " fmt "\n", __func__, ##__VA_ARGS__)
#define DLog(fmt, ...) printf("%s: " fmt "\n", SDL_FUNCTION, ##__VA_ARGS__)
#else
#define DLog(...) \
do { \

2
src/video/cocoa/SDL_cocoawindow.m
View File

@@ -41,7 +41,7 @@
#endif
#ifdef DEBUG_COCOAWINDOW
#define DLog(fmt, ...) printf("%s: " fmt "\n", __func__, ##__VA_ARGS__)
#define DLog(fmt, ...) printf("%s: " fmt "\n", SDL_FUNCTION, ##__VA_ARGS__)
#else
#define DLog(...) \
do { \

2
src/video/n3ds/SDL_n3dsframebuffer.c
View File

@@ -75,7 +75,7 @@ bool SDL_N3DS_UpdateWindowFramebuffer(SDL_VideoDevice *_this, SDL_Window *window
surface = (SDL_Surface *)SDL_GetPointerProperty(SDL_GetWindowProperties(window), N3DS_SURFACE, NULL);
if (!surface) {
return SDL_SetError("%s: Unable to get the window surface.", __func__);
return SDL_SetError("%s: Unable to get the window surface.", SDL_FUNCTION);
}
// Get the N3DS internal framebuffer and its size