Compile fix for non XF86-DGA systems.
This commit is contained in:
parent
f1f830ce38
commit
f361dea170
|
@ -454,7 +454,7 @@ static HRESULT WINAPI Xlib_IDirectDrawSurface3_SetPalette(
|
||||||
LPDIRECTDRAWSURFACE3 this,LPDIRECTDRAWPALETTE pal
|
LPDIRECTDRAWSURFACE3 this,LPDIRECTDRAWPALETTE pal
|
||||||
) {
|
) {
|
||||||
TRACE(ddraw,"(%p)->SetPalette(%p)\n",this,pal);
|
TRACE(ddraw,"(%p)->SetPalette(%p)\n",this,pal);
|
||||||
|
#ifdef HAVE_LIBXXF86DGA
|
||||||
/* According to spec, we are only supposed to
|
/* According to spec, we are only supposed to
|
||||||
* AddRef if this is not the same palette.
|
* AddRef if this is not the same palette.
|
||||||
*/
|
*/
|
||||||
|
@ -481,13 +481,18 @@ static HRESULT WINAPI Xlib_IDirectDrawSurface3_SetPalette(
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
#else /* defined(HAVE_LIBXXF86DGA) */
|
||||||
|
return E_UNEXPECTED;
|
||||||
|
#endif /* defined(HAVE_LIBXXF86DGA) */
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI DGA_IDirectDrawSurface3_SetPalette(
|
static HRESULT WINAPI DGA_IDirectDrawSurface3_SetPalette(
|
||||||
LPDIRECTDRAWSURFACE3 this,LPDIRECTDRAWPALETTE pal
|
LPDIRECTDRAWSURFACE3 this,LPDIRECTDRAWPALETTE pal
|
||||||
) {
|
) {
|
||||||
TRACE(ddraw,"(%p)->SetPalette(%p)\n",this,pal);
|
TRACE(ddraw,"(%p)->SetPalette(%p)\n",this,pal);
|
||||||
|
#ifdef HAVE_LIBXXF86DGA
|
||||||
/* According to spec, we are only supposed to
|
/* According to spec, we are only supposed to
|
||||||
* AddRef if this is not the same palette.
|
* AddRef if this is not the same palette.
|
||||||
*/
|
*/
|
||||||
|
@ -509,6 +514,11 @@ static HRESULT WINAPI DGA_IDirectDrawSurface3_SetPalette(
|
||||||
TSXF86DGAInstallColormap(display,DefaultScreen(display),this->s.palette->cm);
|
TSXF86DGAInstallColormap(display,DefaultScreen(display),this->s.palette->cm);
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
#else /* defined(HAVE_LIBXXF86DGA) */
|
||||||
|
return E_UNEXPECTED;
|
||||||
|
#endif /* defined(HAVE_LIBXXF86DGA) */
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI IDirectDrawSurface3_Blt(
|
static HRESULT WINAPI IDirectDrawSurface3_Blt(
|
||||||
|
|
Loading…
Reference in New Issue