Skip to content

W
wine-winehq
Commit 0540af5b authored by Chris Robinson's avatar Chris Robinson Committed by Alexandre Julliard
Browse files
Options

openal32: Remove the ALCcontext wrapper.

Assume the function pointers retrieved by alGetProcAddress are context independent. This is not likely to change in any implementation we care about any time soon.
parent 23bfdecd
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 163 deletions
dlls/openal32/openal.c
View file @ 0540af5b
......@@ -39,48 +39,42 @@
WINE_DEFAULT_DEBUG_CHANNEL(openal32);
typedef struct wine_ALCcontext {
ALCcontext *ctx;
ALboolean been_current;
ALvoid (AL_APIENTRY*alBufferDataStatic)(const ALuint bid, ALenum format, const ALvoid* data, ALsizei size, ALsizei freq);
ALvoid (AL_APIENTRY*alGenFilters)(ALsizei n, ALuint* filters);
ALvoid (AL_APIENTRY*alDeleteFilters)(ALsizei n, const ALuint* filters);
ALboolean (AL_APIENTRY*alIsFilter)(ALuint fid);
ALvoid (AL_APIENTRY*alFilterf)(ALuint fid, ALenum param, ALfloat value);
ALvoid (AL_APIENTRY*alFilterfv)(ALuint fid, ALenum param, const ALfloat* values);
ALvoid (AL_APIENTRY*alFilteri)(ALuint fid, ALenum param, ALint value);
ALvoid (AL_APIENTRY*alFilteriv)(ALuint fid, ALenum param, const ALint* values);
ALvoid (AL_APIENTRY*alGetFilterf)(ALuint fid, ALenum param, ALfloat* value);
ALvoid (AL_APIENTRY*alGetFilterfv)(ALuint fid, ALenum param, ALfloat* values);
ALvoid (AL_APIENTRY*alGetFilteri)(ALuint fid, ALenum param, ALint* value);
ALvoid (AL_APIENTRY*alGetFilteriv)(ALuint fid, ALenum param, ALint* values);
ALvoid (AL_APIENTRY*alGenEffects)(ALsizei n, ALuint* effects);
ALvoid (AL_APIENTRY*alDeleteEffects)(ALsizei n, const ALuint* effects);
ALboolean (AL_APIENTRY*alIsEffect)(ALuint eid);
ALvoid (AL_APIENTRY*alEffectf)(ALuint eid, ALenum param, ALfloat value);
ALvoid (AL_APIENTRY*alEffectfv)(ALuint eid, ALenum param, const ALfloat* values);
ALvoid (AL_APIENTRY*alEffecti)(ALuint eid, ALenum param, ALint value);
ALvoid (AL_APIENTRY*alEffectiv)(ALuint eid, ALenum param, const ALint* values);
ALvoid (AL_APIENTRY*alGetEffectf)(ALuint eid, ALenum param, ALfloat* value);
ALvoid (AL_APIENTRY*alGetEffectfv)(ALuint eid, ALenum param, ALfloat* values);
ALvoid (AL_APIENTRY*alGetEffecti)(ALuint eid, ALenum param, ALint* value);
ALvoid (AL_APIENTRY*alGetEffectiv)(ALuint eid, ALenum param, ALint* values);
ALvoid (AL_APIENTRY*alGenAuxiliaryEffectSlots)(ALsizei n, ALuint* slots);
ALvoid (AL_APIENTRY*alDeleteAuxiliaryEffectSlots)(ALsizei n, const ALuint* slots);
ALboolean (AL_APIENTRY*alIsAuxiliaryEffectSlot)(ALuint sid);
ALvoid (AL_APIENTRY*alAuxiliaryEffectSlotf)(ALuint sid, ALenum param, ALfloat value);
ALvoid (AL_APIENTRY*alAuxiliaryEffectSlotfv)(ALuint sid, ALenum param, const ALfloat* values);
ALvoid (AL_APIENTRY*alAuxiliaryEffectSloti)(ALuint sid, ALenum param, ALint value);
ALvoid (AL_APIENTRY*alAuxiliaryEffectSlotiv)(ALuint sid, ALenum param, const ALint* values);
ALvoid (AL_APIENTRY*alGetAuxiliaryEffectSlotf)(ALuint sid, ALenum param, ALfloat* value);
ALvoid (AL_APIENTRY*alGetAuxiliaryEffectSlotfv)(ALuint sid, ALenum param, ALfloat* values);
ALvoid (AL_APIENTRY*alGetAuxiliaryEffectSloti)(ALuint sid, ALenum param, ALint* value);
ALvoid (AL_APIENTRY*alGetAuxiliaryEffectSlotiv)(ALuint sid, ALenum param, ALint* values);
struct wine_ALCcontext *next;
} wine_ALCcontext;
static ALboolean loaded_procs;
static ALvoid (AL_APIENTRY*alBufferDataStatic)(const ALuint bid, ALenum format, const ALvoid* data, ALsizei size, ALsizei freq);
static ALvoid (AL_APIENTRY*alGenFilters)(ALsizei n, ALuint* filters);
static ALvoid (AL_APIENTRY*alDeleteFilters)(ALsizei n, const ALuint* filters);
static ALboolean (AL_APIENTRY*alIsFilter)(ALuint fid);
static ALvoid (AL_APIENTRY*alFilterf)(ALuint fid, ALenum param, ALfloat value);
static ALvoid (AL_APIENTRY*alFilterfv)(ALuint fid, ALenum param, const ALfloat* values);
static ALvoid (AL_APIENTRY*alFilteri)(ALuint fid, ALenum param, ALint value);
static ALvoid (AL_APIENTRY*alFilteriv)(ALuint fid, ALenum param, const ALint* values);
static ALvoid (AL_APIENTRY*alGetFilterf)(ALuint fid, ALenum param, ALfloat* value);
static ALvoid (AL_APIENTRY*alGetFilterfv)(ALuint fid, ALenum param, ALfloat* values);
static ALvoid (AL_APIENTRY*alGetFilteri)(ALuint fid, ALenum param, ALint* value);
static ALvoid (AL_APIENTRY*alGetFilteriv)(ALuint fid, ALenum param, ALint* values);
static ALvoid (AL_APIENTRY*alGenEffects)(ALsizei n, ALuint* effects);
static ALvoid (AL_APIENTRY*alDeleteEffects)(ALsizei n, const ALuint* effects);
static ALboolean (AL_APIENTRY*alIsEffect)(ALuint eid);
static ALvoid (AL_APIENTRY*alEffectf)(ALuint eid, ALenum param, ALfloat value);
static ALvoid (AL_APIENTRY*alEffectfv)(ALuint eid, ALenum param, const ALfloat* values);
static ALvoid (AL_APIENTRY*alEffecti)(ALuint eid, ALenum param, ALint value);
static ALvoid (AL_APIENTRY*alEffectiv)(ALuint eid, ALenum param, const ALint* values);
static ALvoid (AL_APIENTRY*alGetEffectf)(ALuint eid, ALenum param, ALfloat* value);
static ALvoid (AL_APIENTRY*alGetEffectfv)(ALuint eid, ALenum param, ALfloat* values);
static ALvoid (AL_APIENTRY*alGetEffecti)(ALuint eid, ALenum param, ALint* value);
static ALvoid (AL_APIENTRY*alGetEffectiv)(ALuint eid, ALenum param, ALint* values);
static ALvoid (AL_APIENTRY*alGenAuxiliaryEffectSlots)(ALsizei n, ALuint* slots);
static ALvoid (AL_APIENTRY*alDeleteAuxiliaryEffectSlots)(ALsizei n, const ALuint* slots);
static ALboolean (AL_APIENTRY*alIsAuxiliaryEffectSlot)(ALuint sid);
static ALvoid (AL_APIENTRY*alAuxiliaryEffectSlotf)(ALuint sid, ALenum param, ALfloat value);
static ALvoid (AL_APIENTRY*alAuxiliaryEffectSlotfv)(ALuint sid, ALenum param, const ALfloat* values);
static ALvoid (AL_APIENTRY*alAuxiliaryEffectSloti)(ALuint sid, ALenum param, ALint value);
static ALvoid (AL_APIENTRY*alAuxiliaryEffectSlotiv)(ALuint sid, ALenum param, const ALint* values);
static ALvoid (AL_APIENTRY*alGetAuxiliaryEffectSlotf)(ALuint sid, ALenum param, ALfloat* value);
static ALvoid (AL_APIENTRY*alGetAuxiliaryEffectSlotfv)(ALuint sid, ALenum param, ALfloat* values);
static ALvoid (AL_APIENTRY*alGetAuxiliaryEffectSloti)(ALuint sid, ALenum param, ALint* value);
static ALvoid (AL_APIENTRY*alGetAuxiliaryEffectSlotiv)(ALuint sid, ALenum param, ALint* values);
struct FuncList {
const char *name;
......@@ -90,9 +84,6 @@ struct FuncList {
static const struct FuncList ALCFuncs[];
static const struct FuncList ALFuncs[];
static wine_ALCcontext *CtxList;
static wine_ALCcontext *CurrentCtx;
CRITICAL_SECTION openal_cs;
static CRITICAL_SECTION_DEBUG openal_cs_debug =
{
......@@ -113,30 +104,12 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(hinst);
break;
case DLL_PROCESS_DETACH:
while(CtxList)
{
wine_ALCcontext *next = CtxList->next;
HeapFree(GetProcessHeap(), 0, CtxList);
CtxList = next;
}
}
return TRUE;
}
/* Validates the given context */
static wine_ALCcontext *ValidateCtx(ALCcontext *ctx)
{
wine_ALCcontext *cur = CtxList;
while(cur != NULL && cur->ctx != ctx)
cur = cur->next;
return cur;
}
/***********************************************************************
* OpenAL thunk routines
*/
......@@ -144,40 +117,12 @@ static wine_ALCcontext *ValidateCtx(ALCcontext *ctx)
/* OpenAL ALC 1.0 functions */
ALCcontext* CDECL wine_alcCreateContext(ALCdevice *device, const ALCint* attrlist)
{
wine_ALCcontext *ctx;
ctx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(wine_ALCcontext));
if(!ctx)
{
ERR("Out of memory!\n");
return NULL;
}
ctx->ctx = alcCreateContext(device, attrlist);
if(!ctx->ctx)
{
HeapFree(GetProcessHeap(), 0, ctx);
WARN("Failed to create new context\n");
return NULL;
}
TRACE("Created new context %p\n", ctx->ctx);
EnterCriticalSection(&openal_cs);
ctx->next = CtxList;
CtxList = ctx;
LeaveCriticalSection(&openal_cs);
return ctx->ctx;
return alcCreateContext(device, attrlist);
}
ALCboolean CDECL wine_alcMakeContextCurrent(ALCcontext *context)
{
wine_ALCcontext *ctx = NULL;
EnterCriticalSection(&openal_cs);
if(context && !(ctx=ValidateCtx(context)))
WARN("Could not find context %p in context list\n", context);
if(alcMakeContextCurrent(context) == ALC_FALSE)
{
WARN("Failed to make context %p current\n", context);
......@@ -185,12 +130,11 @@ ALCboolean CDECL wine_alcMakeContextCurrent(ALCcontext *context)
return ALC_FALSE;
}
CurrentCtx = ctx;
if(CurrentCtx && !CurrentCtx->been_current)
if(context && !loaded_procs)
{
CurrentCtx->been_current = AL_TRUE;
loaded_procs = AL_TRUE;
#define LOADFUNC(x) CurrentCtx->x = alGetProcAddress(#x)
#define LOADFUNC(x) x = alGetProcAddress(#x)
LOADFUNC(alBufferDataStatic);
LOADFUNC(alGenFilters);
LOADFUNC(alDeleteFilters);
......@@ -244,44 +188,12 @@ ALvoid CDECL wine_alcSuspendContext(ALCcontext *context)
ALvoid CDECL wine_alcDestroyContext(ALCcontext *context)
{
wine_ALCcontext **list, *ctx;
EnterCriticalSection(&openal_cs);
list = &CtxList;
while(*list && (*list)->ctx != context)
list = &(*list)->next;
if(!(*list))
{
WARN("Could not find context %p in context list\n", context);
alcDestroyContext(context);
LeaveCriticalSection(&openal_cs);
return;
}
ctx = *list;
*list = (*list)->next;
if(ctx == CurrentCtx)
CurrentCtx = NULL;
LeaveCriticalSection(&openal_cs);
HeapFree(GetProcessHeap(), 0, ctx);
alcDestroyContext(context);
}
ALCcontext* CDECL wine_alcGetCurrentContext(ALCvoid)
{
ALCcontext *ret = NULL;
EnterCriticalSection(&openal_cs);
if(CurrentCtx)
ret = CurrentCtx->ctx;
LeaveCriticalSection(&openal_cs);
return ret;
return alcGetCurrentContext();
}
ALCdevice* CDECL wine_alcGetContextsDevice(ALCcontext *context)
......@@ -624,7 +536,7 @@ ALvoid CDECL wine_alBufferData(ALuint bid, ALenum format, const ALvoid* data, AL
ALvoid CDECL wine_alBufferDataStatic(const ALuint bid, ALenum format, const ALvoid* data, ALsizei size, ALsizei freq)
{
CurrentCtx->alBufferDataStatic(bid, format, data, size, freq);
alBufferDataStatic(bid, format, data, size, freq);
}
ALvoid CDECL wine_alGetBufferf(ALuint bid, ALenum param, ALfloat* value)
......@@ -768,169 +680,169 @@ ALvoid CDECL wine_alSpeedOfSound(ALfloat value)
/* OpenAL EFX extension functions */
ALvoid CDECL wine_alGenFilters(ALsizei n, ALuint* filters)
{
CurrentCtx->alGenFilters(n, filters);
alGenFilters(n, filters);
}
ALvoid CDECL wine_alDeleteFilters(ALsizei n, const ALuint* filters)
{
CurrentCtx->alDeleteFilters(n, filters);
alDeleteFilters(n, filters);
}
ALboolean CDECL wine_alIsFilter(ALuint fid)
{
return CurrentCtx->alIsFilter(fid);
return alIsFilter(fid);
}
ALvoid CDECL wine_alFilterf(ALuint fid, ALenum param, ALfloat value)
{
CurrentCtx->alFilterf(fid, param, value);
alFilterf(fid, param, value);
}
ALvoid CDECL wine_alFilterfv(ALuint fid, ALenum param, const ALfloat* values)
{
CurrentCtx->alFilterfv(fid, param, values);
alFilterfv(fid, param, values);
}
ALvoid CDECL wine_alFilteri(ALuint fid, ALenum param, ALint value)
{
CurrentCtx->alFilteri(fid, param, value);
alFilteri(fid, param, value);
}
ALvoid CDECL wine_alFilteriv(ALuint fid, ALenum param, const ALint* values)
{
CurrentCtx->alFilteriv(fid, param, values);
alFilteriv(fid, param, values);
}
ALvoid CDECL wine_alGetFilterf(ALuint fid, ALenum param, ALfloat* value)
{
CurrentCtx->alGetFilterf(fid, param, value);
alGetFilterf(fid, param, value);
}
ALvoid CDECL wine_alGetFilterfv(ALuint fid, ALenum param, ALfloat* values)
{
CurrentCtx->alGetFilterfv(fid, param, values);
alGetFilterfv(fid, param, values);
}
ALvoid CDECL wine_alGetFilteri(ALuint fid, ALenum param, ALint* value)
{
CurrentCtx->alGetFilteri(fid, param, value);
alGetFilteri(fid, param, value);
}
ALvoid CDECL wine_alGetFilteriv(ALuint fid, ALenum param, ALint* values)
{
CurrentCtx->alGetFilteriv(fid, param, values);
alGetFilteriv(fid, param, values);
}
ALvoid CDECL wine_alGenEffects(ALsizei n, ALuint* effects)
{
CurrentCtx->alGenEffects(n, effects);
alGenEffects(n, effects);
}
ALvoid CDECL wine_alDeleteEffects(ALsizei n, const ALuint* effects)
{
CurrentCtx->alDeleteEffects(n, effects);
alDeleteEffects(n, effects);
}
ALboolean CDECL wine_alIsEffect(ALuint eid)
{
return CurrentCtx->alIsEffect(eid);
return alIsEffect(eid);
}
ALvoid CDECL wine_alEffectf(ALuint eid, ALenum param, ALfloat value)
{
CurrentCtx->alEffectf(eid, param, value);
alEffectf(eid, param, value);
}
ALvoid CDECL wine_alEffectfv(ALuint eid, ALenum param, const ALfloat* values)
{
CurrentCtx->alEffectfv(eid, param, values);
alEffectfv(eid, param, values);
}
ALvoid CDECL wine_alEffecti(ALuint eid, ALenum param, ALint value)
{
CurrentCtx->alEffecti(eid, param, value);
alEffecti(eid, param, value);
}
ALvoid CDECL wine_alEffectiv(ALuint eid, ALenum param, const ALint* values)
{
CurrentCtx->alEffectiv(eid, param, values);
alEffectiv(eid, param, values);
}
ALvoid CDECL wine_alGetEffectf(ALuint eid, ALenum param, ALfloat* value)
{
CurrentCtx->alGetEffectf(eid, param, value);
alGetEffectf(eid, param, value);
}
ALvoid CDECL wine_alGetEffectfv(ALuint eid, ALenum param, ALfloat* values)
{
CurrentCtx->alGetEffectfv(eid, param, values);
alGetEffectfv(eid, param, values);
}
ALvoid CDECL wine_alGetEffecti(ALuint eid, ALenum param, ALint* value)
{
CurrentCtx->alGetEffecti(eid, param, value);
alGetEffecti(eid, param, value);
}
ALvoid CDECL wine_alGetEffectiv(ALuint eid, ALenum param, ALint* values)
{
CurrentCtx->alGetEffectiv(eid, param, values);
alGetEffectiv(eid, param, values);
}
ALvoid CDECL wine_alGenAuxiliaryEffectSlots(ALsizei n, ALuint* slots)
{
CurrentCtx->alGenAuxiliaryEffectSlots(n, slots);
alGenAuxiliaryEffectSlots(n, slots);
}
ALvoid CDECL wine_alDeleteAuxiliaryEffectSlots(ALsizei n, const ALuint* slots)
{
CurrentCtx->alDeleteAuxiliaryEffectSlots(n, slots);
alDeleteAuxiliaryEffectSlots(n, slots);
}
ALboolean CDECL wine_alIsAuxiliaryEffectSlot(ALuint sid)
{
return CurrentCtx->alIsAuxiliaryEffectSlot(sid);
return alIsAuxiliaryEffectSlot(sid);
}
ALvoid CDECL wine_alAuxiliaryEffectSlotf(ALuint sid, ALenum param, ALfloat value)
{
CurrentCtx->alAuxiliaryEffectSlotf(sid, param, value);
alAuxiliaryEffectSlotf(sid, param, value);
}
ALvoid CDECL wine_alAuxiliaryEffectSlotfv(ALuint sid, ALenum param, const ALfloat* values)
{
CurrentCtx->alAuxiliaryEffectSlotfv(sid, param, values);
alAuxiliaryEffectSlotfv(sid, param, values);
}
ALvoid CDECL wine_alAuxiliaryEffectSloti(ALuint sid, ALenum param, ALint value)
{
CurrentCtx->alAuxiliaryEffectSloti(sid, param, value);
alAuxiliaryEffectSloti(sid, param, value);
}
ALvoid CDECL wine_alAuxiliaryEffectSlotiv(ALuint sid, ALenum param, const ALint* values)
{
CurrentCtx->alAuxiliaryEffectSlotiv(sid, param, values);
alAuxiliaryEffectSlotiv(sid, param, values);
}
ALvoid CDECL wine_alGetAuxiliaryEffectSlotf(ALuint sid, ALenum param, ALfloat* value)
{
CurrentCtx->alGetAuxiliaryEffectSlotf(sid, param, value);
alGetAuxiliaryEffectSlotf(sid, param, value);
}
ALvoid CDECL wine_alGetAuxiliaryEffectSlotfv(ALuint sid, ALenum param, ALfloat* values)
{
CurrentCtx->alGetAuxiliaryEffectSlotfv(sid, param, values);
alGetAuxiliaryEffectSlotfv(sid, param, values);
}
ALvoid CDECL wine_alGetAuxiliaryEffectSloti(ALuint sid, ALenum param, ALint* value)
{
CurrentCtx->alGetAuxiliaryEffectSloti(sid, param, value);
alGetAuxiliaryEffectSloti(sid, param, value);
}
ALvoid CDECL wine_alGetAuxiliaryEffectSlotiv(ALuint sid, ALenum param, ALint* values)
{
CurrentCtx->alGetAuxiliaryEffectSlotiv(sid, param, values);
alGetAuxiliaryEffectSlotiv(sid, param, values);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment