ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Merge match_apple and implementation_is_apple.

This commit is contained in:
Stefan Dösinger 2009-04-15 00:38:07 +02:00 committed by Alexandre Julliard
parent 39877a2ad2
commit de4f3dc8e8
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/wined3d/directx.c
View File

@ -3850,7 +3850,7 @@ ULONG WINAPI D3DCB_DefaultDestroyVolume(IWineD3DVolume *pVolume) {
return IUnknown_Release(volumeParent); return IUnknown_Release(volumeParent);
} }
static BOOL implementation_is_apple(const WineD3D_GL_Info *gl_info) static BOOL match_apple(const WineD3D_GL_Info *gl_info)
{ {
/* MacOS has various specialities in the extensions it advertises. Some have to be loaded from /* MacOS has various specialities in the extensions it advertises. Some have to be loaded from
* the opengl 1.2+ core, while other extensions are advertised, but software emulated. So try to * the opengl 1.2+ core, while other extensions are advertised, but software emulated. So try to
@ -4002,7 +4002,7 @@ static const struct driver_version_information driver_version_table[] = {
/* TODO: Add information about legacy ATI hardware, Intel and other cards */ /* TODO: Add information about legacy ATI hardware, Intel and other cards */
}; };
static BOOL match_ati_r300_to_500(WineD3D_GL_Info *gl_info) { static BOOL match_ati_r300_to_500(const WineD3D_GL_Info *gl_info) {
if(gl_info->gl_vendor != VENDOR_ATI) return FALSE; if(gl_info->gl_vendor != VENDOR_ATI) return FALSE;
if(gl_info->gl_card == CARD_ATI_RADEON_9500) return TRUE; if(gl_info->gl_card == CARD_ATI_RADEON_9500) return TRUE;
if(gl_info->gl_card == CARD_ATI_RADEON_X700) return TRUE; if(gl_info->gl_card == CARD_ATI_RADEON_X700) return TRUE;
@ -4010,11 +4010,7 @@ static BOOL match_ati_r300_to_500(WineD3D_GL_Info *gl_info) {
return FALSE; return FALSE;
} }
static BOOL match_apple(WineD3D_GL_Info *gl_info) { static BOOL match_geforce5(const WineD3D_GL_Info *gl_info) {
return implementation_is_apple(gl_info);
}
static BOOL match_geforce5(WineD3D_GL_Info *gl_info) {
if(gl_info->gl_vendor == VENDOR_NVIDIA) { if(gl_info->gl_vendor == VENDOR_NVIDIA) {
if(gl_info->gl_card == CARD_NVIDIA_GEFORCEFX_5800 || gl_info->gl_card == CARD_NVIDIA_GEFORCEFX_5600) { if(gl_info->gl_card == CARD_NVIDIA_GEFORCEFX_5800 || gl_info->gl_card == CARD_NVIDIA_GEFORCEFX_5600) {
return TRUE; return TRUE;
@ -4023,12 +4019,12 @@ static BOOL match_geforce5(WineD3D_GL_Info *gl_info) {
return FALSE; return FALSE;
} }
static BOOL match_apple_intel(WineD3D_GL_Info *gl_info) { static BOOL match_apple_intel(const WineD3D_GL_Info *gl_info) {
return gl_info->gl_vendor == VENDOR_INTEL && implementation_is_apple(gl_info); return gl_info->gl_vendor == VENDOR_INTEL && match_apple(gl_info);
} }
static BOOL match_apple_nonr500ati(WineD3D_GL_Info *gl_info) { static BOOL match_apple_nonr500ati(const WineD3D_GL_Info *gl_info) {
if(!implementation_is_apple(gl_info)) return FALSE; if(!match_apple(gl_info)) return FALSE;
if(gl_info->gl_vendor != VENDOR_ATI) return FALSE; if(gl_info->gl_vendor != VENDOR_ATI) return FALSE;
if(gl_info->gl_card == CARD_ATI_RADEON_X1600) return FALSE; if(gl_info->gl_card == CARD_ATI_RADEON_X1600) return FALSE;
return TRUE; return TRUE;

2
dlls/wined3d/wined3d_gl.h
View File

@ -3965,7 +3965,7 @@ typedef struct _WineD3D_GL_Info {
#undef USE_GL_FUNC #undef USE_GL_FUNC
struct driver_quirk { struct driver_quirk {
BOOL (*match)(WineD3D_GL_Info *gl_info); BOOL (*match)(const WineD3D_GL_Info *gl_info);
void (*apply)(WineD3D_GL_Info *gl_info); void (*apply)(WineD3D_GL_Info *gl_info);
const char *description; const char *description;
}; };