diff options
| author | Kristian Høgsberg Kristensen <[email protected]> | 2016-02-24 12:50:27 -0800 |
|---|---|---|
| committer | Kristian Høgsberg Kristensen <[email protected]> | 2016-02-24 13:04:54 -0800 |
| commit | 59f57289959702e528b68bdd0d06488089517a00 (patch) | |
| tree | a266656ac6129f5ad14b9d0d0c69c7077466c3f3 /src/gallium/state_trackers/nine/device9video.h | |
| parent | 25c2470b24ce8411f6747eb887137b2511b6d529 (diff) | |
| parent | c95d5c5f6fbfe4a96276e67ed279562b33432fb5 (diff) | |
Merge remote-tracking branch 'origin/master' into vulkan
Diffstat (limited to 'src/gallium/state_trackers/nine/device9video.h')
| -rw-r--r-- | src/gallium/state_trackers/nine/device9video.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/state_trackers/nine/device9video.h b/src/gallium/state_trackers/nine/device9video.h index fc2faeb624a..d77fd5ec57a 100644 --- a/src/gallium/state_trackers/nine/device9video.h +++ b/src/gallium/state_trackers/nine/device9video.h @@ -35,19 +35,19 @@ NineDevice9Video( void *data ) return (struct NineDevice9Video *)data; } -HRESULT WINAPI +HRESULT NINE_WINAPI NineDevice9Video_GetContentProtectionCaps( struct NineDevice9Video *This, const GUID *pCryptoType, const GUID *pDecodeProfile, D3DCONTENTPROTECTIONCAPS *pCaps ); -HRESULT WINAPI +HRESULT NINE_WINAPI NineDevice9Video_CreateAuthenticatedChannel( struct NineDevice9Video *This, D3DAUTHENTICATEDCHANNELTYPE ChannelType, IDirect3DAuthenticatedChannel9 **ppAuthenticatedChannel, HANDLE *pChannelHandle ); -HRESULT WINAPI +HRESULT NINE_WINAPI NineDevice9Video_CreateCryptoSession( struct NineDevice9Video *This, const GUID *pCryptoType, const GUID *pDecodeProfile, |