diff options
Diffstat (limited to 'src/gallium/state_trackers')
| -rw-r--r-- | src/gallium/state_trackers/nine/volume9.c | 6 | ||||
| -rw-r--r-- | src/gallium/state_trackers/nine/volume9.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/state_trackers/nine/volume9.c b/src/gallium/state_trackers/nine/volume9.c index 9933284d804..1fdc6388197 100644 --- a/src/gallium/state_trackers/nine/volume9.c +++ b/src/gallium/state_trackers/nine/volume9.c @@ -385,7 +385,7 @@ NineVolume9_UnlockBox( struct NineVolume9 *This ) /* When this function is called, we have already checked * The copy regions fit the volumes */ -HRESULT +void NineVolume9_CopyMemToDefault( struct NineVolume9 *This, struct NineVolume9 *From, unsigned dstx, unsigned dsty, unsigned dstz, @@ -429,7 +429,7 @@ NineVolume9_CopyMemToDefault( struct NineVolume9 *This, PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE, &dst_box, &transfer); if (!map) - return D3D_OK; + return; /* Note: if formats are the sames, it will revert * to normal memcpy */ @@ -465,7 +465,7 @@ NineVolume9_CopyMemToDefault( struct NineVolume9 *This, NineVolume9_MarkContainerDirty(This); - return D3D_OK; + return; } HRESULT diff --git a/src/gallium/state_trackers/nine/volume9.h b/src/gallium/state_trackers/nine/volume9.h index fe7487eddfb..44853cdac2c 100644 --- a/src/gallium/state_trackers/nine/volume9.h +++ b/src/gallium/state_trackers/nine/volume9.h @@ -87,7 +87,7 @@ void NineVolume9_AddDirtyRegion( struct NineVolume9 *This, const struct pipe_box *box ); -HRESULT +void NineVolume9_CopyMemToDefault( struct NineVolume9 *This, struct NineVolume9 *From, unsigned dstx, unsigned dsty, unsigned dstz, |